ip2location_ruby 8.1.0 → 8.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 613585ff34abe6d207beb9de5a02a2b5291c6fdb9f6b2c392bc450faa92c393b
-  data.tar.gz: cda9e736447f28ca68af0617cb4c12b6983347630aa8b2b9070fcc4aaa17161b
+  metadata.gz: 118e20ce9246a282a4762523c68870f645bde1532e79950e812e935eecc4252e
+  data.tar.gz: 23da14c93843dc1952371b5f250015d59fdf27323fcc0232882f65a036509a86
 SHA512:
-  metadata.gz: 041d86f010371a8640341a61e76d442f2511176f3369cf27f200e042e284ee62c7561feebb646e78cffa4ec84ca5a2626cff3f8b0722dec274f99780b4d8b01a
-  data.tar.gz: 333b9c07798a16ef3af4a60d07329a828087d132a0f81a2ccffc89b9596c0f0e4718a113612c539a1f039ccfd78e681da0deb7661a6ed44b19bfd08ad3f9a352
+  metadata.gz: 5d1da0f2aed10f79b0268e38368abaaa66b8c2e5f24a862fb46fd6c5c58047f6e5a15941561ba527020fcd312aa62f1c8e918fc8273ffa25ba6f4a3e6847a834
+  data.tar.gz: f1481d6b6bfd5143612c6772a4c9be2d2f0216e74293afa80b1fcba422755016a27167c99640880e1fda45577e3cee7b69b3398a7f7fe89b68f7394e418614f9

data/Gemfile

@@ -7,10 +7,8 @@ gem 'bindata'
 # Include everything needed to run rake, tests, features, etc.
 
 group :development do
-  gem 'awesome_print'  
   gem "rspec", "~> 2.8.0"
   gem "rdoc", "~> 3.12"
   gem "bundler", ">= 1.2.0"
   gem "jeweler", "~> 1.8.4"
-  gem "simplecov", ">= 0"
 end

data/Gemfile.lock

@@ -1,74 +1,66 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.3.5)
-    awesome_print (1.2.0)
-    bindata (2.1.0)
-    builder (3.2.2)
-    diff-lcs (1.1.3)
-    docile (1.1.1)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    httpauth (0.2.0)
-    jeweler (1.8.8)
-      builder
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      github_api (= 0.10.1)
-      highline (>= 1.6.15)
-      nokogiri (>= 1.8.2)
-      rake
-      rdoc
-    json (1.8.1)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    multi_json (1.8.2)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (>= 1.8.2)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (>= 1.6.11)
-    rake (10.1.1)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  awesome_print
-  bindata
-  bundler (>= 1.2.0)
-  jeweler (~> 1.8.4)
-  rdoc (~> 3.12)
-  rspec (~> 2.8.0)
-  simplecov
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.3.5)
+    bindata (2.1.0)
+    builder (3.2.2)
+    diff-lcs (1.1.3)
+    docile (1.1.1)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.20)
+    httpauth (0.2.0)
+    jeweler (1.8.8)
+      builder
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.8.2)
+      rake
+      rdoc
+    json (>= 2.3.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    multi_json (1.8.2)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (>= 1.8.2)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (>= 1.6.11)
+    rake (>= 12.3.3)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bindata
+  bundler (>= 1.2.0)
+  jeweler (~> 1.8.4)
+  rdoc (~> 3.12)
+  rspec (~> 2.8.0)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2019 IP2Location ( support@ip2location.com )
+Copyright (c) 2020 IP2Location ( support@ip2location.com )
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -2,8 +2,7 @@
 [![Total Downloads](https://img.shields.io/gem/dt/ip2location_ruby.svg)](https://rubygems.org/gems/ip2location_ruby)
 
 # IP2Location Ruby Library
-This is IP2Location Ruby library that enables the user to find the country, region or state, city, latitude and longitude, US ZIP code, time zone, Internet Service Provider (ISP) or company name, domain name, net speed, area code, weather station code, weather station name, mobile country code (MCC), mobile network code (MNC) and carrier brand, elevation, and usage type by IP address or hostname originates from.  The library reads the geo location information
-from **IP2Location BIN data** file.
+This is IP2Location Ruby library that enables the user to find the country, region or state, city, latitude and longitude, US ZIP code, time zone, Internet Service Provider (ISP) or company name, domain name, net speed, area code, weather station code, weather station name, mobile country code (MCC), mobile network code (MNC) and carrier brand, elevation, and usage type by IP address or hostname originates from.  The library reads the geo location information from **IP2Location BIN data** file or web service.
 
 Supported IPv4 and IPv6 address.
 
@@ -11,48 +10,57 @@ For more details, please visit:
 [https://www.ip2location.com/developers/ruby](https://www.ip2location.com/developers/ruby)
 
 # Usage
+You can check the **example.rb** file to learn more about usage.
 
-```
-require 'ip2location_ruby'
-
-i2l = Ip2location.new.open("./data/IPV6-COUNTRY-REGION-CITY-LATITUDE-LONGITUDE-ZIPCODE-TIMEZONE-ISP-DOMAIN-NETSPEED-AREACODE-WEATHER-MOBILE-ELEVATION-USAGETYPE.BIN")
-record = i2l.get_all('8.8.8.8')
-
-print 'Country Code: ' + record['country_short'] + "\n"
-print 'Country Name: ' + record['country_long'] + "\n"
-print 'Region Name: ' + record['region'] + "\n"
-print 'City Name: ' + record['city'] + "\n"
-print 'Latitude: '
-print record['latitude']
-print "\n"
-print 'Longitude: '
-print record['longitude']
-print "\n"
-print 'ISP: ' + record['isp'] + "\n"
-print 'Domain: ' + record['domain'] + "\n"
-print 'Net Speed: ' + record['netspeed'] + "\n"
-print 'Area Code: ' + record['areacode'] + "\n"
-print 'IDD Code: ' + record['iddcode'] + "\n"
-print 'Time Zone: ' + record['timezone'] + "\n"
-print 'ZIP Code: ' + record['zipcode'] + "\n"
-print 'Weather Station Code: ' + record['weatherstationname'] + "\n"
-print 'Weather Station Name: ' + record['weatherstationcode'] + "\n"
-print 'MCC: ' + record['mcc'] + "\n"
-print 'MNC: ' + record['mnc'] + "\n"
-print 'Mobile Name: ' + record['mobilebrand'] + "\n"
-print 'Elevation: '
-print record['elevation']
-print "\n"
-print 'Usage Type: ' + record['usagetype'] + "\n"
-```
-
-# Sample BIN Databases
-
-* Download free IP2Location LITE databases at [https://lite.ip2location.com](https://lite.ip2location.com)  
-* Download IP2Location sample databases at [https://www.ip2location.com/developers](https://www.ip2location.com/developers)
+## BIN Database
+Below is the description of the functions available in the **BIN Database** lookup.
 
-# IPv4 BIN vs IPv6 BIN
+| Function Name | Description |
+|---|---|
+| open | Open the IP2Location BIN data for lookup. |
+| close | Close and clean up the file pointer. |
+| get_all | Return the geolocation information in array. |
+| get_country_short | Return the ISO3166-1 country code (2-digits) of the IP address. |
+| get_country_long  | Return the ISO3166-1 country name of the IP address. |
+| get_region | Return the ISO3166-2 region name of the IP address. Please visit [ISO3166-2 Subdivision Code](https://www.ip2location.com/free/iso3166-2) for the information of ISO3166-2 supported |
+| get_city | Return the city name of the IP address. |
+| get_latitude | Return the city latitude of the IP address. |
+| get_longitude | Return the city longtitude of the IP address. |
+| get_isp | Return the ISP name of the IP address. |
+| get_domain | Return the domain name of IP address. |
+| get_zipcode | Return the zipcode of the city. |
+| get_timezone | Return the UTC time zone (with DST supported). |
+| get_netspeed | Return the Internet connection type. |
+| get_iddcode | Return the IDD prefix to call the city from another country. |
+| get_areacode | Return the area code of the city. |
+| get_weathercode | Return the nearest weather observation station code. |
+| get_weathername | Return the nearest weather observation station name. |
+| get_mcc | Return the Mobile Country Codes (MCC). |
+| get_mnc | Return the Mobile Network Code (MNC). |
+| get_mobilebrand | Commercial brand associated with the mobile carrier. |
+| get_elevation | Return average height of city above sea level in meters (m). |
+| get_usagetype | Return the ISP's usage type of IP address. |
+
+
+## Web Service
+Below is the description of the functions available in the **Web Service** lookup.
+
+| Function Name | Description |
+|---|---|
+| Constructor | Expect 3 input parameters:<ol><li>IP2Location API Key.</li><li>Package (WS1 - WS24)</li></li><li>Use HTTPS or HTTP</li></ol> |
+| lookup | Return the IP information in array.<ul><li>country_code</li><li>country_name</li><li>region_name</li><li>city_name</li><li>latitude</li><li>longitude</li><li>zip_code</li><li>time_zone</li><li>isp</li><li>domain</li><li>net_speed</li><li>idd_code</li><li>area_code</li><li>weather_station_code</li><li>weather_station_name</li><li>mcc</li><li>mnc</li><li>mobile_brand</li><li>elevation</li><li>usage_type</li><li>continent<ul><li>name</li><li>code</li><li>hemisphere</li><li>translations</li></ul></li><li>country<ul><li>name</li><li>alpha3_code</li><li>numeric_code</li><li>demonym</li><li>flag</li><li>capital</li><li>total_area</li><li>population</li><li>currency<ul><li>code</li><li>name</li><li>symbol</li></ul></li><li>language<ul><li>code</li><li>name</li></ul></li><li>idd_code</li><li>tld</li><li>translations</li></ul></li><li>region<ul><li>name</li><li>code</li><li>translations</li></ul></li><li>city<ul><li>name</li><li>translations</li></ul></li><li>geotargeting<ul><li>metro</li></ul></li><li>country_groupings</li><li>time_zone_info<ul><li>olson</li><li>current_time</li><li>gmt_offset</li><li>is_dst</li><li>sunrise</li><li>sunset</li></ul></li><ul> |
+| get_credit | Return remaining credit of the web service account. |
 
+# Dependencies
+This library requires IP2Location BIN data file to function. You may download the BIN data file at
+* IP2Location LITE BIN Data (Free): https://lite.ip2location.com
+* IP2Location Commercial BIN Data (Comprehensive): https://www.ip2location.com
+
+An outdated BIN database was provided in the library for your testing. You are recommended to visit the above links to download the latest BIN database.
+
+You can also sign up for [IP2Location Web Service](https://www.ip2location.com/web-service/ip2location) to lookup by IP2Location API.
+
+# IPv4 BIN vs IPv6 BIN
 * Use the IPv4 BIN file if you just need to query IPv4 addresses.
 * Use the IPv6 BIN file if you need to query BOTH IPv4 and IPv6 addresses.
 

data/VERSION

@@ -1 +1 @@
-8.1.0
+8.2.3

data/example.rb

@@ -1,5 +1,6 @@
 require 'ip2location_ruby'
 
+# BIN Database
 i2l = Ip2location.new.open("./data/IP2LOCATION-LITE-DB1.IPV6.BIN")
 record = i2l.get_all('8.8.8.8')
 
@@ -28,4 +29,13 @@ print 'Mobile Name: ' + record['mobilebrand'] + "\n"
 print 'Elevation: '
 print record['elevation']
 print "\n"
-print 'Usage Type: ' + record['usagetype'] + "\n"
+print 'Usage Type: ' + record['usagetype'] + "\n"
+
+i2l.close()
+
+# Web Service
+ws = Ip2locationWebService.new('demo', 'WS24', true)
+record = ws.lookup('8.8.8.8', 'continent,country,region,city,geotargeting,country_groupings,time_zone_info', 'en')
+print record
+print "\n"
+print ws.get_credit()

data/ip2location_ruby.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ip2location_ruby"
-  s.version = "8.1.0"
+  s.version = "8.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -34,10 +34,9 @@ Gem::Specification.new do |s|
     "lib/ip2location_ruby/i2l_string_data.rb",
     "lib/ip2location_ruby/ip2location_config.rb",
     "lib/ip2location_ruby/ip2location_record.rb",
-    "spec/assets/DB24.DEMO4.BIN",
-    "spec/assets/DB24.DEMO6.BIN",
-    "spec/assets/IP-COUNTRY-SAMPLE.BIN",
-    "spec/ip2location_ruby_spec.rb",
+    "spec/assets/IP2LOCATION-LITE-DB1.IPV6.BIN",
+    "spec/ip2location_ruby_database_spec.rb",
+    "spec/ip2location_ruby_webservice_spec.rb",
     "spec/spec_helper.rb",
     "rb/data/IP2LOCATION-LITE-DB1.IPV6.BIN"
   ]
@@ -59,29 +58,23 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<bindata>, [">= 0"])
-      s.add_development_dependency(%q<awesome_print>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.2.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<bindata>, [">= 0"])
-      s.add_dependency(%q<awesome_print>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.2.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
     s.add_dependency(%q<bindata>, [">= 0"])
-    s.add_dependency(%q<awesome_print>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.2.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
 

data/lib/ip2location_ruby.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 require 'bindata'
 require 'ipaddr'
+require 'net/http'
+require 'json'
 require 'ip2location_ruby/ip2location_config'
 require 'ip2location_ruby/database_config'
 require 'ip2location_ruby/i2l_float_data'
@@ -31,6 +33,10 @@ class Ip2location
     self
   end
 
+  def close()
+    self.file.close
+  end
+
   def get_record(ip)
     ipno = IPAddr.new(ip, Socket::AF_UNSPEC)
     self.ip_version, ipnum = validateip(ipno)
@@ -402,7 +408,7 @@ class Ip2location
     if valid
         rec = get_record(ip)
         if !(rec.nil?)
-            mnc = (defined?(mnc) && rec.mnc != '') ? rec.mnc : FIELD_NOT_SUPPORTED
+            mnc = (defined?(rec.mnc) && rec.mnc != '') ? rec.mnc : FIELD_NOT_SUPPORTED
         else
             mnc = INVALID_IP_ADDRESS
         end
@@ -531,5 +537,55 @@ class Ip2location
   end
 
   private :get_record, :bsearch, :get_from_to, :read32, :readipv6
+end
+
+class Ip2locationWebService
+  attr_accessor :ws_api_key, :ws_package, :ws_use_ssl
+
+  def initialize(api_key, package, use_ssl)
+    if !api_key.match(/^[0-9A-Z]{10}$/) && api_key != 'demo'
+      raise Exception.new "Please provide a valid IP2Location web service API key."
+    end
+    if !package.match(/^WS[0-9]+$/)
+      package = 'WS1'
+    end
+    if use_ssl == ''
+      use_ssl = true
+    end
+    self.ws_api_key = api_key
+    self.ws_package = package
+    self.ws_use_ssl = use_ssl
+  end
+
+  def lookup(ip, add_ons, language)
+    if self.ws_use_ssl
+      response =  Net::HTTP.get(URI("https://api.ip2location.com/v2/?key=" + self.ws_api_key + "&ip=" + ip + "&package=" + self.ws_package + "&format=json&addon=" + add_ons + "&lang=" + language))
+    else
+      response =  Net::HTTP.get(URI("http://api.ip2location.com/v2/?key=" + self.ws_api_key + "&ip=" + ip + "&package=" + self.ws_package + "&format=json&addon=" + add_ons + "&lang=" + language))
+    end
+    parsed_response = JSON.parse(response)
+    if parsed_response.nil?
+      return false
+    end
+    if !parsed_response["response"].nil?
+      raise Exception.new "Error: " + parsed_response["response"]
+    end
+    return parsed_response
+  end
 
+  def get_credit()
+    if self.ws_use_ssl
+      response =  Net::HTTP.get(URI("https://api.ip2location.com/v2/?key=" + self.ws_api_key + "&check=true"))
+    else
+      response =  Net::HTTP.get(URI("http://api.ip2location.com/v2/?key=" + self.ws_api_key + "&check=true"))
+    end
+    parsed_response = JSON.parse(response)
+    if parsed_response.nil?
+      return 0
+    end
+    if parsed_response["response"].nil?
+      return 0
+    end
+    return parsed_response["response"]
+  end
 end

data/spec/ip2location_ruby_database_spec.rb

@@ -0,0 +1,147 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Ip2location" do
+  it "work correctly with ipv4" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_all('8.8.8.8')
+    expect(record['country_short']).to eq 'US'
+  end
+
+  it "work correctly with get_country_short" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_country_short('8.8.8.8')
+    expect(record).to eq 'US'
+  end
+
+  it "work correctly with get_country_long" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_country_long('8.8.8.8')
+    expect(record).to eq 'United States of America'
+  end
+
+  it "work correctly with get_region" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_region('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_city" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_city('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_latitude" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_latitude('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_longitude" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_longitude('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_isp" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_isp('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_domain" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_domain('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_zipcode" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_zipcode('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_timezone" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_timezone('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_netspeed" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_netspeed('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_iddcode" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_iddcode('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_areacode" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_areacode('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_weatherstationcode" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_weatherstationcode('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_weatherstationname" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_weatherstationname('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_mcc" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_mcc('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_mnc" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_mnc('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_mobilebrand" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_mobilebrand('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_elevation" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_elevation('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_usagetype" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_usagetype('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with ipv6" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_all('2001:4860:4860::8888')
+    expect(record['country_short']).to eq 'US'
+  end
+
+  it "work correctly with ipv6 get_country_long" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_country_long('2001:4860:4860::8888')
+    expect(record).to eq 'United States of America'
+  end
+
+  it "work correctly with ipv6 get_region" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_region('2001:4860:4860::8888')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+end

data/spec/ip2location_ruby_webservice_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Ip2location" do
+  it "work correctly with web service lookup" do
+    ws = Ip2locationWebService.new('demo', 'WS24', true)
+    record = ws.lookup('8.8.8.8', '', 'en')
+    expect(record['country_code']).to eq 'US'
+  end
+
+  it "work correctly with web service get_credit" do
+    ws = Ip2locationWebService.new('demo', 'WS24', true)
+    record = ws.get_credit()
+    expect(record).to_not eq 0
+  end
+end

data/spec/spec_helper.rb

@@ -9,5 +9,4 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
   
-end
-require 'awesome_print'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ip2location_ruby
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.2.3
 platform: ruby
 authors:
 - ip2location
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-05 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.4
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: The official IP2Location Ruby library to geolocate an IP address. You
   can lookup for country, region, city, latitude, longitude, zip code, time zone,
   ISP, domain, area code, usage type, mobile data, weather data and elevation from
@@ -137,10 +109,9 @@ files:
 - lib/ip2location_ruby/ip2location_config.rb
 - lib/ip2location_ruby/ip2location_record.rb
 - rb/data/IP2LOCATION-LITE-DB1.IPV6.BIN
-- spec/assets/DB24.DEMO4.BIN
-- spec/assets/DB24.DEMO6.BIN
-- spec/assets/IP-COUNTRY-SAMPLE.BIN
-- spec/ip2location_ruby_spec.rb
+- spec/assets/IP2LOCATION-LITE-DB1.IPV6.BIN
+- spec/ip2location_ruby_database_spec.rb
+- spec/ip2location_ruby_webservice_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ip2location/ip2location-ruby
 licenses:
@@ -165,7 +136,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: the ip2location ruby library

data/spec/ip2location_ruby_spec.rb

@@ -1,53 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Ip2location" do
-  it "work correctly with ipv4" do
-    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP-COUNTRY-SAMPLE.bin")
-    record = i2l.get_all('13.5.10.6')
-    record.should_not be_nil
-    record.country_short.should == 'US'
-  end
-
-  it "work correctly with ipv4 with new library" do
-    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/DB24.DEMO4.bin")
-    record = i2l.get_all('13.5.10.6')
-    record.should_not be_nil
-    record.country_short.should == 'KR'
-  end
-
-  it "work correctly with ipv6 with new library" do
-    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/DB24.DEMO6.bin")
-    record = i2l.get_all('2a01:04f8:0d16:26c2::')
-    record.should_not be_nil
-    record.country_short.should == 'DE'
-  end
-
-  # it "profile ipv6 in IPV6.BIN" do
-  #   i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IPV6-COUNTRY-REGION-CITY-LATITUDE-LONGITUDE-ZIPCODE-TIMEZONE-ISP-DOMAIN-NETSPEED-AREACODE-WEATHER-MOBILE-ELEVATION-USAGETYPE.BIN")
-  #   File.new(File.dirname(__FILE__) + "/assets/ipv6_ip.txt").readlines.each do |line|
-  #     record = i2l.get_all(line.split(' ').first)
-  #   end
-  # end
-
-  # it "profile ipv4 in IPV6.BIN" do
-  #   i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IPV6-COUNTRY-REGION-CITY-LATITUDE-LONGITUDE-ZIPCODE-TIMEZONE-ISP-DOMAIN-NETSPEED-AREACODE-WEATHER-MOBILE-ELEVATION-USAGETYPE.BIN")
-  #   File.new(File.dirname(__FILE__) + "/assets/ipv4_ip.txt").readlines.each do |line|
-  #     record = i2l.get_all(line.split(' ').first)
-  #   end
-  # end
-
-  # it "profile ipv4 in IPV4.BIN" do
-  #   i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP-COUNTRY-REGION-CITY-LATITUDE-LONGITUDE-ZIPCODE-TIMEZONE-ISP-DOMAIN-NETSPEED-AREACODE-WEATHER-MOBILE-ELEVATION-USAGETYPE.BIN")
-  #   File.new(File.dirname(__FILE__) + "/assets/ipv4_ip.txt").readlines.each do |line|
-  #     record = i2l.get_all(line.split(' ').first)
-  #   end
-  # end
-
-  # this need spec/assets/IP2LOCATION-LITE-DB5.bin file which too big to include in this test.
-
-  # it "should get float value of attitude" do
-  #   i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB5.bin")
-  #   record = i2l.get_all('192.110.164.88')
-  #   record['latitude'].should eq(33.44837951660156)
-  # end
-end