Merge pull request #10 from theckman/match_api_changes

Update ASN support to match changes to ipdata.co API

Author: theckman

client.go

@@ -19,7 +19,7 @@ import (
 )
 
 // Version is the package version
-const Version = "0.6.0"
+const Version = "0.6.1"
 
 // fqpn is the Fully Qualified Package Name for use in the client's User-Agent
 const fqpn = "github.com/theckman/go-ipdata"

client_test.go

@@ -229,8 +229,14 @@ func Test_client_Lookup(t *testing.T) {
 			name: "valid_address",
 			i:    "76.14.47.42",
 			o: IP{
-				IP:            "76.14.47.42",
-				ASN:           "AS11404",
+				IP: "76.14.47.42",
+				ASN: ASN{
+					ASN:    "AS11404",
+					Name:   "vanoppen.biz LLC",
+					Domain: "wavebroadband.com",
+					Route:  "76.14.0.0/17",
+					Type:   "isp",
+				},
 				Organization:  "vanoppen.biz LLC",
 				City:          "San Francisco",
 				Region:        "California",
@@ -556,8 +562,14 @@ func Test_decodeIP(t *testing.T) {
 			name: "valid_json",
 			i:    testJSONValid,
 			o: IP{
-				IP:            "76.14.47.42",
-				ASN:           "AS11404",
+				IP: "76.14.47.42",
+				ASN: ASN{
+					ASN:    "AS11404",
+					Name:   "vanoppen.biz LLC",
+					Domain: "wavebroadband.com",
+					Route:  "76.14.0.0/17",
+					Type:   "isp",
+				},
 				Organization:  "vanoppen.biz LLC",
 				City:          "San Francisco",
 				Region:        "California",
@@ -729,20 +741,26 @@ func Test_decodeIP(t *testing.T) {
 }
 
 var testJSONValid = `{
-    "ip": "76.14.47.42",
-    "city": "San Francisco",
-    "region": "California",
-    "country_name": "United States",
-    "country_code": "US",
-    "continent_name": "North America",
-    "continent_code": "NA",
-    "latitude": 37.723,
-    "longitude": -122.4842,
-    "asn": "AS11404",
-    "organisation": "vanoppen.biz LLC",
-    "postal": "94132",
-    "calling_code": "1",
-    "flag": "https://ipdata.co/flags/us.png",
+	"ip": "76.14.47.42",
+	"city": "San Francisco",
+	"region": "California",
+	"country_name": "United States",
+	"country_code": "US",
+	"continent_name": "North America",
+	"continent_code": "NA",
+	"latitude": 37.723,
+	"longitude": -122.4842,
+	"asn": {
+		"asn": "AS11404",
+		"name": "vanoppen.biz LLC",
+		"domain": "wavebroadband.com",
+		"route": "76.14.0.0/17",
+		"type": "isp"
+	},
+	"organisation": "vanoppen.biz LLC",
+	"postal": "94132",
+	"calling_code": "1",
+	"flag": "https://ipdata.co/flags/us.png",
 	"emoji_unicode": "U+1F1FA U+1F1F8",
 	"is_eu": true,
 	"languages": [

types.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Tim Heckman
+// Copyright (c) 2017, 2019 Tim Heckman
 // Use of this source code is governed by the MIT License that can be found in
 // the LICENSE file at the root of this repository.
 
@@ -8,7 +8,7 @@ package ipdata
 // API.
 type IP struct {
 	IP           string `json:"ip"`
-	ASN          string `json:"asn"`
+	ASN          ASN    `json:"asn"`
 	Organization string `json:"organisation"`
 
 	City   string `json:"city"`
@@ -45,6 +45,15 @@ func (ip IP) String() string {
 	return ip.IP
 }
 
+// ASN represents the Autonomous System Number data returned from the API.
+type ASN struct {
+	ASN    string `json:"asn"`
+	Name   string `json:"name"`
+	Domain string `json:"domain"`
+	Route  string `json:"route"`
+	Type   string `json:"type"`
+}
+
 // Language represents the language object within the JSON response from the
 // API. This provides information about the language(s) where that IP resides.
 type Language struct {