ip2location_ruby 8.2.1 → 8.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87b2d8b319cb9e62e4d99875d0f01dc5043d9f3bbc7556488efcb9b7091d656e
-  data.tar.gz: b3166341ec4b79588c683611ca24b5019052258f2fab60a8d74029de52d6f5c0
+  metadata.gz: 88ca0a0eeda11477542ff26e73d650ee4710fe53cefacfae2becdab77a60b296
+  data.tar.gz: b53da2a74fb4cbe4580d0745cee0b9be50b21dc45d63b7baf4fd2d94090380a6
 SHA512:
-  metadata.gz: 888a244c319e9fb212cd0c1343261035e37c03e24bfe27e71940cf6673b8525661ac7e577159585f3abe78a2a566d10499826232cd6e960634b8dce8d64bc4ab
-  data.tar.gz: ef010901688b3d4da4fc161ad0a162f109bf0323f382542b2d7ab4afc4e522185b08d6fd1da93d51fef5f37631c9a74c2e9a56b0156b7651d489f8599eeea144
+  metadata.gz: f20f7d2bb1fd83dacaacc4f78e9f2641a67be6a833be040c9ceaf289471d58658df35f01623bb8429bfaf9830df36e10517a693ab564c4542911c510f5b90292
+  data.tar.gz: b8f9340cd456e71a2e7920290f04aeea7d1d88692d53dee247f537f31b7ab25e5ccf83870667b5df626080c65a60c872ede67c606aab11dcdeef1d2cc7c5c4dd

data/Gemfile

@@ -7,10 +7,7 @@ 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,25 @@
-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:
+    bindata (2.4.10)
+    diff-lcs (1.1.3)
+    json (>= 2.3.0)
+    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)
+  rdoc (~> 3.12)
+  rspec (~> 2.8.0)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2020 IP2Location ( support@ip2location.com )
+Copyright (c) 2021 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,7 +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 or web service.
+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, usage type, IP address type and IAB advertising category from IP address using IP2Location database.  The library reads the geo location information from **IP2Location BIN data** file or web service.
 
 Supported IPv4 and IPv6 address.
 
@@ -19,6 +19,10 @@ Below is the description of the functions available in the **BIN Database** look
 |---|---|
 | open | Open the IP2Location BIN data for lookup. |
 | close | Close and clean up the file pointer. |
+| get_package_version | Get the package version (1 to 25 for DB1 to DB25 respectively). |
+| get_module_version | Get the module version. |
+| get_database_version | Get the database version. |
+| get_last_error_message | Return the last error message. |
 | 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. |
@@ -40,6 +44,8 @@ Below is the description of the functions available in the **BIN Database** look
 | 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. |
+| get_addresstype | Returns the IP address type (A-Anycast, B-Broadcast, M-Multicast & U-Unicast) of IP address or domain name. |
+| category | Returns the IAB content taxonomy category of IP address or domain name. |
 
 
 ## Web Service
@@ -47,8 +53,8 @@ Below is the description of the functions available in the **Web Service** looku
 
 | 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> |
+| Constructor | Expect 3 input parameters:<ol><li>IP2Location API Key.</li><li>Package (WS1 - WS25)</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>address_type</li><li>category</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

data/Rakefile

@@ -11,20 +11,6 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "ip2location_ruby"
-  gem.homepage = "https://github.com/ip2location/ip2location-ruby"
-  gem.license = "MIT"
-  gem.summary = %Q{the ip2location ruby library}
-  gem.description = %Q{ip2location ruby library}
-  gem.email = "support@ip2location.com"
-  gem.authors = ["Vincent.Z"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|

data/VERSION

@@ -1 +1 @@
-8.2.1
+8.3.1

data/example.rb

@@ -30,11 +30,13 @@ print 'Elevation: '
 print record['elevation']
 print "\n"
 print 'Usage Type: ' + record['usagetype'] + "\n"
+print 'Address Type: ' + record['addresstype'] + "\n"
+print 'Category: ' + record['category'] + "\n"
 
 i2l.close()
 
 # Web Service
-ws = Ip2locationWebService.new('demo', 'WS24', true)
+ws = Ip2locationWebService.new('demo', 'WS25', true)
 record = ws.lookup('8.8.8.8', 'continent,country,region,city,geotargeting,country_groupings,time_zone_info', 'en')
 print record
 print "\n"

data/ip2location_ruby.gemspec

@@ -1,11 +1,6 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = "ip2location_ruby"
-  s.version = "8.2.1"
+  s.version = "8.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -34,10 +29,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 +53,20 @@ 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

@@ -11,16 +11,42 @@ require 'ip2location_ruby/i2l_ip_data'
 require 'ip2location_ruby/ip2location_record'
 
 class Ip2location
-  attr_accessor :record_class4, :record_class6, :v4, :file, :db_index, :count, :base_addr, :ipno, :count, :record, :database, :columns, :ip_version, :ipv4databasecount, :ipv4databaseaddr, :ipv4indexbaseaddr, :ipv6databasecount, :ipv6databaseaddr, :ipv6indexbaseaddr
+  attr_accessor :record_class4, :record_class6, :v4, :file, :db_index, :count, :base_addr, :ipno, :count, :record, :database, :columns, :ip_version, :ipv4databasecount, :ipv4databaseaddr, :ipv4indexbaseaddr, :ipv6databasecount, :ipv6databaseaddr, :ipv6indexbaseaddr, :databaseyear, :databasemonth, :databaseday, :last_err_msg
 
+  VERSION = '8.3.1'
   FIELD_NOT_SUPPORTED = 'NOT SUPPORTED'
   INVALID_IP_ADDRESS = 'INVALID IP ADDRESS'
+  INVALID_BIN_DATABASE = 'Incorrect IP2Location BIN file format. Please make sure that you are using the latest IP2Location BIN file.'
+  IPV6_ADDRESS_IN_IPV4_BIN  = 'IPV6 ADDRESS MISSING IN IPV4 BIN'
 
   def open(url)
-    self.file = File.open(File.expand_path url, 'rb')
+    if url == ''
+        self.last_err_msg = 'Ip2location.new.open() requires a database path name.'
+        abort('Ip2location.new.open() requires a database path name.')
+    end
+
+    begin
+        self.file = File.open(File.expand_path url, 'rb')
+    rescue
+        self.last_err_msg = 'Ip2location.new.open() error in opening ' + url +'.'
+        abort('Ip2location.new.open() error in opening ' + url +'.')
+    else
+    end
     i2l = Ip2locationConfig.read(file)
+    if i2l.productcode == 1
+    else
+        if i2l.databaseyear <= 20 && i2l.productcode == 0
+        else
+            self.file.close
+            self.last_err_msg = INVALID_BIN_DATABASE
+            abort(INVALID_BIN_DATABASE)
+        end
+    end
     self.db_index = i2l.databasetype
     self.columns = i2l.databasecolumn + 0
+    self.databaseyear = 2000 + i2l.databaseyear
+    self.databasemonth = i2l.databasemonth
+    self.databaseday = i2l.databaseday
     self.database = DbConfig.setup_database(self.db_index)
     self.ipv4databasecount = i2l.ipv4databasecount
     self.ipv4databaseaddr = i2l.ipv4databaseaddr
@@ -37,12 +63,31 @@ class Ip2location
     self.file.close
   end
 
+  def get_last_error_message()
+    return self.last_err_msg
+  end
+
+  def get_module_version()
+    return VERSION
+  end
+
+  def get_package_version()
+    return (self.db_index).to_s
+  end
+
+  def get_database_version()
+    return (self.databaseyear).to_s + "." + (self.databasemonth).to_s + "." + (self.databaseday).to_s
+  end
+
   def get_record(ip)
     ipno = IPAddr.new(ip, Socket::AF_UNSPEC)
     self.ip_version, ipnum = validateip(ipno)
     self.v4 = ip_version == 4 ? true : false
     self.count = v4 ? self.ipv4databasecount + 0 : self.ipv6databasecount + 0
     self.base_addr = (v4 ? self.ipv4databaseaddr - 1 : self.ipv6databaseaddr - 1)
+    if ip_version == 6 && self.ipv6databasecount == 0
+        return IPV6_ADDRESS_IN_IPV4_BIN
+    end
     col_length = columns * 4
     if ipv4indexbaseaddr > 0 || ipv6indexbaseaddr > 0
         indexpos = 0
@@ -74,7 +119,30 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            country_short = IPV6_ADDRESS_IN_IPV4_BIN
+            country_long = IPV6_ADDRESS_IN_IPV4_BIN
+            region = IPV6_ADDRESS_IN_IPV4_BIN
+            city = IPV6_ADDRESS_IN_IPV4_BIN
+            latitude = IPV6_ADDRESS_IN_IPV4_BIN
+            longitude = IPV6_ADDRESS_IN_IPV4_BIN
+            isp = IPV6_ADDRESS_IN_IPV4_BIN
+            domain = IPV6_ADDRESS_IN_IPV4_BIN
+            netspeed = IPV6_ADDRESS_IN_IPV4_BIN
+            areacode = IPV6_ADDRESS_IN_IPV4_BIN
+            iddcode = IPV6_ADDRESS_IN_IPV4_BIN
+            timezone = IPV6_ADDRESS_IN_IPV4_BIN
+            zipcode = IPV6_ADDRESS_IN_IPV4_BIN
+            weatherstationname = IPV6_ADDRESS_IN_IPV4_BIN
+            weatherstationcode = IPV6_ADDRESS_IN_IPV4_BIN
+            mcc = IPV6_ADDRESS_IN_IPV4_BIN
+            mnc = IPV6_ADDRESS_IN_IPV4_BIN
+            mobilebrand = IPV6_ADDRESS_IN_IPV4_BIN
+            elevation = IPV6_ADDRESS_IN_IPV4_BIN
+            usagetype = IPV6_ADDRESS_IN_IPV4_BIN
+            addresstype = IPV6_ADDRESS_IN_IPV4_BIN
+            category = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             country_short = (defined?(rec.country_short) && rec.country_short != '') ? rec.country_short : FIELD_NOT_SUPPORTED
             country_long = (defined?(rec.country_long) && rec.country_long != '') ? rec.country_long : FIELD_NOT_SUPPORTED
             region = (defined?(rec.region) && rec.region != '') ? rec.region : FIELD_NOT_SUPPORTED
@@ -95,6 +163,8 @@ class Ip2location
             mobilebrand = (defined?(rec.mobilebrand) && rec.mobilebrand != '') ? rec.mobilebrand : FIELD_NOT_SUPPORTED
             elevation = (defined?(rec.elevation) && rec.elevation != '') ? rec.elevation : FIELD_NOT_SUPPORTED
             usagetype = (defined?(rec.usagetype) && rec.usagetype != '') ? rec.usagetype : FIELD_NOT_SUPPORTED
+            addresstype = (defined?(rec.addresstype) && rec.addresstype != '') ? rec.addresstype : FIELD_NOT_SUPPORTED
+            category = (defined?(rec.category) && rec.category != '') ? rec.category : FIELD_NOT_SUPPORTED
         else
             country_short = INVALID_IP_ADDRESS
             country_long = INVALID_IP_ADDRESS
@@ -116,6 +186,8 @@ class Ip2location
             mobilebrand = INVALID_IP_ADDRESS
             elevation = INVALID_IP_ADDRESS
             usagetype = INVALID_IP_ADDRESS
+            addresstype = INVALID_IP_ADDRESS
+            category = INVALID_IP_ADDRESS
         end
     else
         country_short = INVALID_IP_ADDRESS
@@ -138,6 +210,8 @@ class Ip2location
         mobilebrand = INVALID_IP_ADDRESS
         elevation = INVALID_IP_ADDRESS
         usagetype = INVALID_IP_ADDRESS
+        addresstype = INVALID_IP_ADDRESS
+        category = INVALID_IP_ADDRESS
     end
     results = {}
     results['country_short'] = country_short
@@ -160,6 +234,8 @@ class Ip2location
     results['mobilebrand'] = mobilebrand
     results['elevation'] = elevation
     results['usagetype'] = usagetype
+    results['addresstype'] = addresstype
+    results['category'] = category
     return results
   end
 
@@ -167,7 +243,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            country_short = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             country_short = (defined?(rec.country_short) && rec.country_short != '') ? rec.country_short : FIELD_NOT_SUPPORTED
         else
             country_short = INVALID_IP_ADDRESS
@@ -182,7 +260,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            country_long = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             country_long = (defined?(rec.country_long) && rec.country_long != '') ? rec.country_long : FIELD_NOT_SUPPORTED
         else
             country_long = INVALID_IP_ADDRESS
@@ -197,7 +277,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            region = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             region = (defined?(rec.region) && rec.region != '') ? rec.region : FIELD_NOT_SUPPORTED
         else
             region = INVALID_IP_ADDRESS
@@ -212,7 +294,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            city = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             city = (defined?(rec.city) && rec.city != '') ? rec.city : FIELD_NOT_SUPPORTED
         else
             city = INVALID_IP_ADDRESS
@@ -227,7 +311,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            latitude = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             latitude = (defined?(rec.latitude) && rec.latitude != '') ? rec.latitude : FIELD_NOT_SUPPORTED
         else
             latitude = INVALID_IP_ADDRESS
@@ -242,7 +328,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            longitude = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             longitude = (defined?(rec.longitude) && rec.longitude != '') ? rec.longitude : FIELD_NOT_SUPPORTED
         else
             longitude = INVALID_IP_ADDRESS
@@ -257,7 +345,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            isp = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             isp = (defined?(rec.isp) && rec.isp != '') ? rec.isp : FIELD_NOT_SUPPORTED
         else
             isp = INVALID_IP_ADDRESS
@@ -272,7 +362,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            domain = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             domain = (defined?(rec.domain) && rec.domain != '') ? rec.domain : FIELD_NOT_SUPPORTED
         else
             domain = INVALID_IP_ADDRESS
@@ -287,7 +379,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            zipcode = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             zipcode = (defined?(rec.zipcode) && rec.zipcode != '') ? rec.zipcode : FIELD_NOT_SUPPORTED
         else
             zipcode = INVALID_IP_ADDRESS
@@ -302,7 +396,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            timezone = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             timezone = (defined?(rec.timezone) && rec.timezone != '') ? rec.timezone : FIELD_NOT_SUPPORTED
         else
             timezone = INVALID_IP_ADDRESS
@@ -317,7 +413,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            netspeed = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             netspeed = (defined?(rec.netspeed) && rec.netspeed != '') ? rec.netspeed : FIELD_NOT_SUPPORTED
         else
             netspeed = INVALID_IP_ADDRESS
@@ -332,7 +430,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            iddcode = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             iddcode = (defined?(rec.iddcode) && rec.iddcode != '') ? rec.iddcode : FIELD_NOT_SUPPORTED
         else
             iddcode = INVALID_IP_ADDRESS
@@ -347,7 +447,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            areacode = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             areacode = (defined?(rec.areacode) && rec.areacode != '') ? rec.areacode : FIELD_NOT_SUPPORTED
         else
             areacode = INVALID_IP_ADDRESS
@@ -362,7 +464,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            weatherstationcode = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             weatherstationcode = (defined?(rec.weatherstationcode) && rec.weatherstationcode != '') ? rec.weatherstationcode : FIELD_NOT_SUPPORTED
         else
             weatherstationcode = INVALID_IP_ADDRESS
@@ -377,7 +481,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            weatherstationname = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             weatherstationname = (defined?(rec.weatherstationname) && rec.weatherstationname != '') ? rec.weatherstationname : FIELD_NOT_SUPPORTED
         else
             weatherstationname = INVALID_IP_ADDRESS
@@ -392,7 +498,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            mcc = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             mcc = (defined?(rec.mcc) && rec.mcc != '') ? rec.mcc : FIELD_NOT_SUPPORTED
         else
             mcc = INVALID_IP_ADDRESS
@@ -407,8 +515,10 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
-            mnc = (defined?(mnc) && rec.mnc != '') ? rec.mnc : FIELD_NOT_SUPPORTED
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            mnc = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
+            mnc = (defined?(rec.mnc) && rec.mnc != '') ? rec.mnc : FIELD_NOT_SUPPORTED
         else
             mnc = INVALID_IP_ADDRESS
         end
@@ -422,7 +532,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            mobilebrand = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             mobilebrand = (defined?(rec.mobilebrand) && rec.mobilebrand != '') ? rec.mobilebrand : FIELD_NOT_SUPPORTED
         else
             mobilebrand = INVALID_IP_ADDRESS
@@ -437,7 +549,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            elevation = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             elevation = (defined?(rec.elevation) && rec.elevation != '') ? rec.elevation : FIELD_NOT_SUPPORTED
         else
             elevation = INVALID_IP_ADDRESS
@@ -452,7 +566,9 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if !(rec.nil?)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            usagetype = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
             usagetype = (defined?(rec.usagetype) && rec.usagetype != '') ? rec.usagetype : FIELD_NOT_SUPPORTED
         else
             usagetype = INVALID_IP_ADDRESS
@@ -463,6 +579,40 @@ class Ip2location
     return usagetype
   end
 
+  def get_addresstype(ip)
+    valid = !(IPAddr.new(ip) rescue nil).nil?
+    if valid
+        rec = get_record(ip)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            addresstype = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
+            addresstype = (defined?(rec.addresstype) && rec.addresstype != '') ? rec.addresstype : FIELD_NOT_SUPPORTED
+        else
+            addresstype = INVALID_IP_ADDRESS
+        end
+    else
+        addresstype = INVALID_IP_ADDRESS
+    end
+    return addresstype
+  end
+
+  def get_category(ip)
+    valid = !(IPAddr.new(ip) rescue nil).nil?
+    if valid
+        rec = get_record(ip)
+        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+            category = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
+            category = (defined?(rec.category) && rec.category != '') ? rec.category : FIELD_NOT_SUPPORTED
+        else
+            category = INVALID_IP_ADDRESS
+        end
+    else
+        category = INVALID_IP_ADDRESS
+    end
+    return category
+  end
+
   def bsearch(low, high, ipnum, base_addr, col_length)
     while low <= high do
         mid = (low + high) >> 1

data/lib/ip2location_ruby/database_config.rb

@@ -1,24 +1,26 @@
 class DbConfig 
   COLUMNS = { 
-     :COUNTRY                  => [0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,  2, 2, 2,  2, 2, 2, 2, 2, 2, 2, 2, 2, 2],
-     :REGION                   => [0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3,  3, 3, 3,  3, 3, 3, 3, 3, 3, 3, 3, 3, 3],
-     :CITY                     => [0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 4,  4, 4, 4,  4, 4, 4, 4, 4, 4, 4, 4, 4, 4],
-     :ISP                      => [0, 0, 3, 0, 5, 0, 7, 5, 7, 0, 8, 0,  9, 0, 9,  0, 9, 0, 9, 7, 9, 0, 9, 7, 9],
-     :LATITUDE                 => [0, 0, 0, 0, 0, 5, 5, 0, 5, 5, 5, 5,  5, 5, 5,  5, 5, 5, 5, 5, 5, 5, 5, 5, 5],
-     :LONGITUDE                => [0, 0, 0, 0, 0, 6, 6, 0, 6, 6, 6, 6,  6, 6, 6,  6, 6, 6, 6, 6, 6, 6, 6, 6, 6],
-     :DOMAIN                   => [0, 0, 0, 0, 0, 0, 0, 6, 8, 0, 9, 0, 10, 0, 10, 0, 10, 0, 10, 8, 10, 0, 10, 8, 10],
-     :ZIPCODE                  => [0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7,  7, 0, 7,  7, 7, 0, 7, 0, 7, 7, 7, 0, 7],
-     :TIMEZONE                 => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,  8, 7, 8,  8, 8, 7, 8, 0, 8, 8, 8, 0, 8],
-     :NETSPEED                 => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 8, 11, 0, 11,8, 11, 0, 11, 0, 11, 0, 11],
-     :IDDCODE                  => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0,  9, 12, 0, 12, 0, 12, 9, 12, 0, 12],
-     :AREACODE                 => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0,  10 ,13 ,0, 13, 0, 13, 10, 13, 0, 13],
-     :WEATHERSTATIONCODE       => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0,  0, 0, 9, 14, 0, 14, 0, 14, 0, 14],
-     :WEATHERSTATIONNAME       => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0,  0, 0, 10, 15, 0, 15, 0, 15, 0, 15],
-     :MCC                      => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0,  0, 0, 0, 0, 9, 16, 0, 16, 9, 16],
-     :MNC                      => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0,  0, 0, 0, 0, 10,17, 0, 17, 10, 17],
-     :MOBILEBRAND              => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0,  0, 0, 0, 0, 11,18, 0, 18, 11, 18],
-     :ELEVATION                => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0,  0, 0, 0, 0, 0, 0, 11, 19, 0, 19],
-     :USAGETYPE                => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 12, 20]
+     :COUNTRY                  => [0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2],
+     :REGION                   => [0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3],
+     :CITY                     => [0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4],
+     :LATITUDE                 => [0, 0, 0, 0, 0, 5, 5, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5],
+     :LONGITUDE                => [0, 0, 0, 0, 0, 6, 6, 0, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6],
+     :ZIPCODE                  => [0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 0, 7, 7, 7, 0, 7, 0, 7, 7, 7, 0, 7, 7],
+     :TIMEZONE                 => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 7, 8, 8, 8, 7, 8, 0, 8, 8, 8, 0, 8, 8],
+     :ISP                      => [0, 0, 3, 0, 5, 0, 7, 5, 7, 0, 8, 0, 9, 0, 9, 0, 9, 0, 9, 7, 9, 0, 9, 7, 9, 9],
+     :DOMAIN                   => [0, 0, 0, 0, 0, 0, 0, 6, 8, 0, 9, 0, 10, 0, 10, 0, 10, 0, 10, 8, 10, 0, 10, 8, 10, 10],
+     :NETSPEED                 => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 11, 0, 11,8, 11, 0, 11, 0, 11, 0, 11, 11],
+     :IDDCODE                  => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 12, 0, 12, 0, 12, 9, 12, 0, 12, 12],
+     :AREACODE                 => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10 ,13 ,0, 13, 0, 13, 10, 13, 0, 13, 13],
+     :WEATHERSTATIONCODE       => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 14, 0, 14, 0, 14, 0, 14, 14],
+     :WEATHERSTATIONNAME       => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 15, 0, 15, 0, 15, 0, 15, 15],
+     :MCC                      => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 16, 0, 16, 9, 16, 16],
+     :MNC                      => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10,17, 0, 17, 10, 17, 17],
+     :MOBILEBRAND              => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11,18, 0, 18, 11, 18, 18],
+     :ELEVATION                => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19, 0, 19, 19],
+     :USAGETYPE                => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 20, 20],
+     :ADDRESSTYPE              => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21],
+     :CATEGORY                 => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22]
    }
    
  def self.setup_database(db_index)

data/lib/ip2location_ruby/ip2location_config.rb

@@ -1,17 +1,20 @@
 class Ip2locationConfig < BinData::Record
   endian :little
-	uint8 :databasetype
-	uint8 :databasecolumn
-	uint8 :databaseday
-	uint8 :databasemonth
-	uint8 :databaseyear
-	# uint32 :databasecount
-	# uint32 :databaseaddr
-	# uint32 :ipversion
+  uint8 :databasetype
+  uint8 :databasecolumn
+  uint8 :databaseyear
+  uint8 :databasemonth
+  uint8 :databaseday
+  # uint32 :databasecount
+  # uint32 :databaseaddr
+  # uint32 :ipversion
   uint32 :ipv4databasecount
   uint32 :ipv4databaseaddr
   uint32 :ipv6databasecount
   uint32 :ipv6databaseaddr
   uint32 :ipv4indexbaseaddr
   uint32 :ipv6indexbaseaddr
+  uint8 :productcode
+  uint8 :licensecode
+  uint32 :databasesize
 end

data/spec/ip2location_ruby_database_spec.rb

@@ -0,0 +1,159 @@
+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 get_addresstype" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_addresstype('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_category" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_category('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', 'WS25', 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', 'WS25', 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.2.1
+  version: 8.3.1
 platform: ruby
 authors:
 - ip2location
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2021-07-14 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
@@ -80,34 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !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 +95,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:

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