ip2location_ruby 8.5.0 → 8.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7f7cc867aa07b3595ae89b5f5fa55fab2b210236b106fa8ad10ccb5b9dd15b1
-  data.tar.gz: 36b720b84b89cfaad323c1d695e1b5408eca69476197cdb7911cdb614856c5e9
+  metadata.gz: 07d9738099db961a6661f7266017f4f5cf8156cb0b0e2063bf1e2a246dfe39f4
+  data.tar.gz: 9f4e8c1f7c60a58687e8d922816e69e6ddbaa4f4bd06dd9b0938a194278f8188
 SHA512:
-  metadata.gz: 7a84781d5ab63cee79729be08a0ebdc1f3866630b8f00e4aea983e654c2cf55fd66370d8006666c76880621231fd91d9ddf3f19c2efdd0d7b7fde9428f630935
-  data.tar.gz: d6e40740c7fa84c5410239e93f54502e197a19dcc8c00b8a1d30bec76660a35bb9dfe78bced75ae7b4b3c15e29ad9f7e339a1b817e4b28cc4aff99caaf58f624
+  metadata.gz: 5417dcb43c59394ad2500f0e79ec109fc75bb70b0afca917c3150cd0ac6da7168e94b4381e01624fa8ee43ef05a9ed5bd148a4539c6d90ab23ed927cd2ff4cd2
+  data.tar.gz: 7a60ef9c3759e47b1c2699378103fbfbf3fde9e8007ecfee424739a9226cd0b9e24852e1e11b4f758f2fb67e9eeefc06845688da98d42043b02aaa4d9c8187c3

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2022 IP2Location ( support@ip2location.com )
+Copyright (c) 2023 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

@@ -83,6 +83,22 @@ Below is the description of the functions available in the **IpTools** class.
 | compress_ipv6 | Compress a IPv6 to shorten the length. |
 | expand_ipv6 | Expand a shorten IPv6 to full length. |
 
+## Country
+Below is the description of the functions available in the **Country** class.
+
+| Function Name | Description |
+|---|---|
+| Constructor | Expect a IP2Location Country Information CSV file. This database is free for download at https://www.ip2location.com/free/country-information |
+| get_country_info | Provide a ISO 3166 country code to get the country information in array. Will return a full list of countries information if country code not provided. Below is the information returned: <ul><li>country_code</li><li>country_alpha3_code</li><li>country_numeric_code</li><li>capital</li><li>country_demonym</li><li>total_area</li><li>population</li><li>idd_code</li><li>currency_code</li><li>currency_name</li><li>currency_symbol</li><li>lang_code</li><li>lang_name</li><li>cctld</li></ul> |
+
+## Region
+Below is the description of the functions available in the **Region** class.
+
+| Function Name | Description |
+|---|---|
+| Constructor | Expect a IP2Location ISO 3166-2 Subdivision Code CSV file. This database is free for download at https://www.ip2location.com/free/iso3166-2 |
+| get_region_code | Provide a ISO 3166 country code and the region name to get ISO 3166-2 subdivision code for the region. |
+
 # 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

data/VERSION

@@ -1 +1 @@
-8.5.0
+8.7.0

data/example.rb

@@ -29,7 +29,9 @@ puts record['elevation']
 puts 'Usage Type: ' + record['usagetype']
 puts 'Address Type: ' + record['addresstype']
 puts 'Category: ' + record['category']
-
+puts 'District: ' + record['district']
+puts 'ASN: ' + record['asn']
+puts 'AS: ' + record['as']
 i2l.close()
 
 # Web Service
@@ -52,3 +54,11 @@ puts iptool.ipv6_to_cidr('2002:0000:0000:1234:abcd:ffff:c0a8:0000', '2002:0000:0
 puts iptool.cidr_to_ipv6('2002::1234:abcd:ffff:c0a8:101/64')
 puts iptool.compress_ipv6('2002:0000:0000:1234:ffff:ffff:ffff:ffff')
 puts iptool.expand_ipv6('2002::1234:ffff:ffff:ffff:ffff')
+
+# Country Class
+country = Ip2locationCountry.new('./data/IP2LOCATION-COUNTRY-INFORMATION-BASIC.CSV')
+puts country.get_country_info('US')
+
+# Region Class
+region = Ip2locationRegion.new('./data/IP2LOCATION-ISO3166-2.CSV')
+puts region.get_region_code('US', 'California')

data/ip2location_ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ip2location_ruby"
-  s.version = "8.5.0"
+  s.version = "8.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -30,11 +30,15 @@ Gem::Specification.new do |s|
     "lib/ip2location_ruby/ip2location_config.rb",
     "lib/ip2location_ruby/ip2location_record.rb",
     "spec/assets/IP2LOCATION-LITE-DB1.IPV6.BIN",
+    "spec/ip2location_ruby_country_spec.rb",
     "spec/ip2location_ruby_database_spec.rb",
     "spec/ip2location_ruby_iptools_spec.rb",
+    "spec/ip2location_ruby_region_spec.rb",
     "spec/ip2location_ruby_webservice_spec.rb",
     "spec/spec_helper.rb",
-    "rb/data/IP2LOCATION-LITE-DB1.IPV6.BIN"
+    "rb/data/IP2LOCATION-LITE-DB1.IPV6.BIN",
+    "rb/data/IP2LOCATION-COUNTRY-INFORMATION-BASIC.CSV",
+    "rb/data/IP2LOCATION-ISO3166-2.CSV"
   ]
   s.homepage = "https://github.com/ip2location/ip2location-ruby"
   s.licenses = ["MIT"]

data/lib/ip2location_ruby/database_config.rb

@@ -1,26 +1,29 @@
 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, 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]
+     :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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 22],
+     :DISTRICT                 => [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, 0, 23],
+     :ASN                      => [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, 0, 24],
+     :AS                       => [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, 0, 25]
    }
    
  def self.setup_database(db_index)

data/lib/ip2location_ruby.rb

@@ -3,6 +3,7 @@ require 'bindata'
 require 'ipaddr'
 require 'net/http'
 require 'json'
+require 'csv'
 require 'ip2location_ruby/ip2location_config'
 require 'ip2location_ruby/database_config'
 require 'ip2location_ruby/i2l_float_data'
@@ -13,7 +14,7 @@ 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, :databaseyear, :databasemonth, :databaseday, :last_err_msg
 
-  VERSION = '8.5.0'
+  VERSION = '8.7.0'
   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.'
@@ -118,7 +119,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -141,6 +142,9 @@ class Ip2location
             usagetype = IPV6_ADDRESS_IN_IPV4_BIN
             addresstype = IPV6_ADDRESS_IN_IPV4_BIN
             category = IPV6_ADDRESS_IN_IPV4_BIN
+            district = IPV6_ADDRESS_IN_IPV4_BIN
+            asn = IPV6_ADDRESS_IN_IPV4_BIN
+            as = 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
@@ -164,6 +168,9 @@ class Ip2location
             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
+            district = (defined?(rec.district) && rec.district != '') ? rec.district : FIELD_NOT_SUPPORTED
+            asn = (defined?(rec.asn) && rec.asn != '') ? rec.asn : FIELD_NOT_SUPPORTED
+            as = (defined?(rec.as) && rec.as != '') ? rec.as : FIELD_NOT_SUPPORTED
         else
             country_short = INVALID_IP_ADDRESS
             country_long = INVALID_IP_ADDRESS
@@ -187,6 +194,9 @@ class Ip2location
             usagetype = INVALID_IP_ADDRESS
             addresstype = INVALID_IP_ADDRESS
             category = INVALID_IP_ADDRESS
+            district = INVALID_IP_ADDRESS
+            asn = INVALID_IP_ADDRESS
+            as = INVALID_IP_ADDRESS
         end
     else
         country_short = INVALID_IP_ADDRESS
@@ -211,6 +221,9 @@ class Ip2location
         usagetype = INVALID_IP_ADDRESS
         addresstype = INVALID_IP_ADDRESS
         category = INVALID_IP_ADDRESS
+        district = INVALID_IP_ADDRESS
+        asn = INVALID_IP_ADDRESS
+        as = INVALID_IP_ADDRESS
     end
     results = {}
     results['country_short'] = country_short
@@ -235,6 +248,9 @@ class Ip2location
     results['usagetype'] = usagetype
     results['addresstype'] = addresstype
     results['category'] = category
+    results['district'] = district
+    results['asn'] = asn
+    results['as'] = as
     return results
   end
 
@@ -242,7 +258,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -259,7 +275,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -276,7 +292,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -293,7 +309,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -310,7 +326,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -327,7 +343,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -344,7 +360,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -361,7 +377,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -378,7 +394,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -395,7 +411,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -412,7 +428,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -429,7 +445,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -446,7 +462,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -463,7 +479,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -480,7 +496,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -497,7 +513,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -514,7 +530,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -531,7 +547,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -548,7 +564,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -565,7 +581,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -582,7 +598,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -599,7 +615,7 @@ class Ip2location
     valid = !(IPAddr.new(ip) rescue nil).nil?
     if valid
         rec = get_record(ip)
-        if  rec == IPV6_ADDRESS_IN_IPV4_BIN
+        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
@@ -612,6 +628,57 @@ class Ip2location
     return category
   end
 
+  def get_district(ip)
+    valid = !(IPAddr.new(ip) rescue nil).nil?
+    if valid
+        rec = get_record(ip)
+        if rec == IPV6_ADDRESS_IN_IPV4_BIN
+          district = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
+          district = (defined?(rec.district) && rec.district != '') ? rec.district : FIELD_NOT_SUPPORTED
+        else
+          district = INVALID_IP_ADDRESS
+        end
+    else
+      district = INVALID_IP_ADDRESS
+    end
+    return district
+  end
+
+  def get_asn(ip)
+    valid = !(IPAddr.new(ip) rescue nil).nil?
+    if valid
+        rec = get_record(ip)
+        if rec == IPV6_ADDRESS_IN_IPV4_BIN
+          asn = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
+          asn = (defined?(rec.asn) && rec.asn != '') ? rec.asn : FIELD_NOT_SUPPORTED
+        else
+          asn = INVALID_IP_ADDRESS
+        end
+    else
+      asn = INVALID_IP_ADDRESS
+    end
+    return asn
+  end
+
+  def get_as(ip)
+    valid = !(IPAddr.new(ip) rescue nil).nil?
+    if valid
+        rec = get_record(ip)
+        if rec == IPV6_ADDRESS_IN_IPV4_BIN
+          as = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
+          as = (defined?(rec.as) && rec.as != '') ? rec.as : FIELD_NOT_SUPPORTED
+        else
+          as = INVALID_IP_ADDRESS
+        end
+    else
+      as = INVALID_IP_ADDRESS
+    end
+    return as
+  end
+
   def bsearch(low, high, ipnum, base_addr, col_length)
     while low <= high do
         mid = (low + high) >> 1
@@ -964,4 +1031,127 @@ class Ip2locationIpTools
       return
     end
   end
+end
+
+class Ip2locationCountry
+  attr_accessor :fields, :records
+
+  def initialize(csv)
+    if csv == ''
+      abort('The CSV file "' + csv + '" is not found.')
+    end
+
+    begin
+      csvfile = File.open(File.expand_path csv, 'rb')
+    rescue
+      abort('Error in opening ' + csv + '. No such CSV file in the /your_ip2location_ruby_library_path/rb/ folder.')
+    else
+    end
+
+    begin
+      CSV.parse(csvfile)
+    rescue
+      abort('Unable to read "' + csv + '".')
+    else
+      line = 1
+      self.records = Hash.new
+      CSV.foreach((csvfile)) do |data|
+        if line == 1
+          if data[0] != 'country_code'
+            abort('Invalid country information CSV file.')
+          end
+          self.fields = data
+        else
+          self.records[data[0]] = data
+        end
+        line = line + 1
+      end
+    end
+  end
+
+  def get_country_info(country_code = nil)
+    if self.records.empty?
+      abort('No record available.')
+    end
+
+    if country_code
+      if (self.records[country_code]).nil?
+        return []
+      end
+      results = Hash.new
+      for i in 0..(self.fields.length()-1)
+        results[self.fields[i]] = self.records[country_code][i]
+      end
+      return results
+    end
+
+    results = []
+    self.records.each do |key, value|
+      data = Hash.new
+      for i in 0..(self.fields.length()-1)
+        data[self.fields[i]] = self.records[key][i]
+      end
+      results = results.append(data)
+    end
+    return results
+  end
+end
+
+class Ip2locationRegion
+  attr_accessor :records
+
+  def initialize(csv)
+    if csv == ''
+      abort('The CSV file "' + csv + '" is not found.')
+    end
+
+    begin
+      csvfile = File.open(File.expand_path csv, 'rb')
+    rescue
+      abort('Error in opening ' + csv + '. No such CSV file in the /your_ip2location_ruby_library_path/rb/ folder.')
+    else
+    end
+
+    begin
+      CSV.parse(csvfile)
+    rescue
+      abort('Unable to read "' + csv + '".')
+    else
+      line = 1
+      self.records = Hash.new
+      CSV.foreach((csvfile)) do |data|
+        if line == 1
+          if data[1] != 'subdivision_name'
+            abort('Invalid region information CSV file.')
+          end
+        else
+          temp_data = Hash.new
+          temp_data['code'] = data[2]
+          temp_data['name'] = data[1]
+          if self.records[data[0]]
+            self.records[data[0]].push temp_data
+          else
+            self.records[data[0]] = [temp_data]
+          end
+        end
+        line = line + 1
+      end
+    end
+  end
+
+  def get_region_code(country_code, region_name)
+    if self.records.empty?
+      abort('No record available.')
+    end
+
+    if (self.records[country_code]).nil?
+      return
+    end
+
+    for i in 0..(self.records[country_code].length()-1)
+      if region_name.upcase == self.records[country_code][i]["name"].upcase
+        return self.records[country_code][i]["code"]
+      end
+    end
+  end
 end