ip2location_ruby 8.7.3 → 8.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecc166b6193e9ed97e8ad60faaf2f26d1ab5b0764a9b4520c968bc2578401e4e
-  data.tar.gz: 89a822c6eb06a3781c7b66e579ba1ad707fdf9ae2a4068cb72fe980b3e7ceda1
+  metadata.gz: 977ac426ebd7ff2a2d6f39ab1727a5afd10ba19af91e98b2109576740f2221c5
+  data.tar.gz: 964283f98279e11d60f24ebfc3c0da115b756b1ae23b8e33856195c72fc829e6
 SHA512:
-  metadata.gz: 6fcbeda2d8bd5ef6bb61b434e37946c36d84f721137d26a4a076b9ddcb5e60ed4b38a8d01188cf4ca7ea07f49ed30cfc5a7472808342d3bb9d3bf29d281e372b
-  data.tar.gz: 0f70b47844945a9975552630eb5aa9eafcafba90cf740051344a18e7221c1fc7e5ba2a1c4220ed4c471f7cdf0e4d878fc3ceb495bb0aa73df4a2dd434c71349a
+  metadata.gz: 2b066e16d50591e514e623c7e3b54e26c05053cf04bbbe3f7682ab13f7dd12e3875a0dc19fe26f6e5ebc3ead5c6379b5f3b4dc21b88d509edf44f085cfd8793b
+  data.tar.gz: 7dde61e91effb12121643a44f48114d9dc0e8d3cf98175eb7fff8f8776e0f8be245ffa13969d6c7cbc80a198560d7a8f88924ba6fe14d50236c17d36777d3c21

data/Gemfile

@@ -2,12 +2,12 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem 'bindata', "~> 2.4.15"
+gem 'bindata', "~> 3.0"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 
 group :development do
-  gem "rspec", "~> 2.8.0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", ">= 1.2.0"
+  gem "rspec", "~> 3.13"
+  gem "rdoc", ">= 6.3.1"
+  gem "bundler", ">= 2.4"
 end

data/LICENSE.txt

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

@@ -1 +1 @@
-8.7.3
+8.8.1

data/example.rb

@@ -32,6 +32,9 @@ puts 'Category: ' + record['category']
 puts 'District: ' + record['district']
 puts 'ASN: ' + record['asn']
 puts 'AS: ' + record['as']
+puts 'AS Domain: ' + record['as_domain']
+puts 'AS Usage Type: ' + record['as_usagetype']
+puts 'AS CIDR: ' + record['as_cidr']
 i2l.close()
 
 # IP Tools

data/ip2location_ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ip2location_ruby"
-  s.version = "8.7.3"
+  s.version = "8.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -43,34 +43,17 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.summary = "the ip2location ruby library"
 
-  if s.respond_to?(:metadata=)
-    s.metadata = {
-      "bug_tracker_uri" => "https://github.com/ip2location/ip2location-ruby/issues",
-      "documentation_uri" => "https://www.rubydoc.info/gems/ip2location_ruby",
-      "homepage_uri" => "https://www.ip2location.com",
-      "source_code_uri" => "https://github.com/ip2location/ip2location-ruby",
-    }
-  end
+  s.metadata = {
+    "bug_tracker_uri" => "https://github.com/ip2location/ip2location-ruby/issues",
+    "documentation_uri" => "https://www.rubydoc.info/gems/ip2location_ruby",
+    "homepage_uri" => "https://www.ip2location.com",
+    "source_code_uri" => "https://github.com/ip2location/ip2location-ruby",
+  }
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bindata>, ["~> 2.4.15"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<rdoc>, [">= 6.3.1"])
-      s.add_development_dependency(%q<bundler>, [">= 1.2.0"])
-    else
-      s.add_dependency(%q<bindata>, ["~> 2.4.15"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<rdoc>, [">= 6.3.1"])
-      s.add_dependency(%q<bundler>, [">= 1.2.0"])
-    end
-  else
-    s.add_dependency(%q<bindata>, ["~> 2.4.15"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<rdoc>, [">= 6.3.1"])
-    s.add_dependency(%q<bundler>, [">= 1.2.0"])
-  end
+  s.required_ruby_version = ">= 3.0"
+  s.add_runtime_dependency "bindata", "~> 3.0"
+  s.add_development_dependency "rspec", "~> 3.13"
+  s.add_development_dependency "rdoc", ">= 6.3.1"
+  s.add_development_dependency "bundler", ">= 2.4"
 end
 

data/lib/ip2location_ruby/database_config.rb

@@ -23,7 +23,10 @@ class DbConfig
      :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]
+     :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],
+     :AS_DOMAIN                => [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, 26],
+     :AS_USAGETYPE            => [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, 27],
+     :AS_CIDR                  => [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, 28]
    }
    
  def self.setup_database(db_index)

data/lib/ip2location_ruby/i2l_string_data.rb

@@ -1,16 +1,19 @@
-class I2lStringData  < BinData::BasePrimitive
-  
+class I2lStringData < BinData::BasePrimitive
   def read_and_return_value(io)
     country_long = eval_parameter(:country_long)
-    io.seekbytes(-4) if country_long
-    file = io.instance_variable_get('@raw_io')
+    raw_io = io.instance_variable_get(:@io)
+    initial_pos = raw_io.instance_variable_get(:@initial_pos)
+    if country_long
+      io.seek_to_abs_offset(raw_io.offset - 4)
+    end
     addr = BinData::Uint32le.read(io)
-    old_offset = file.tell
-    country_long ? file.seek(addr + 3) : file.seek(addr)
-    length = BinData::Uint8.read(file)
-    res = BinData::String.new(:length => length).read(file)
-    file.seek(old_offset)
-    res
+    old_offset = raw_io.offset
+    string_offset = country_long ? addr + 3 : addr
+    relative_offset = string_offset - initial_pos
+    io.seek_to_abs_offset(relative_offset)
+    length = BinData::Uint8.read(io)
+    result = BinData::String.new(:length => length).read(io)
+    io.seek_to_abs_offset(old_offset)
+    result
   end
-
 end

data/lib/ip2location_ruby.rb

@@ -14,7 +14,7 @@ require 'ip2location_ruby/ip2location_record'
 class Ip2location
   attr_accessor :record_class4, :record_class6, :v4, :file, :db_index, :count, :base_addr, :ipno, :record, :database, :columns, :ip_version, :ipv4databasecount, :ipv4databaseaddr, :ipv4indexbaseaddr, :ipv6databasecount, :ipv6databaseaddr, :ipv6indexbaseaddr, :databaseyear, :databasemonth, :databaseday, :last_err_msg
 
-  VERSION = '8.7.3'
+  VERSION = '8.8.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.'
@@ -145,6 +145,9 @@ class Ip2location
             district = IPV6_ADDRESS_IN_IPV4_BIN
             asn = IPV6_ADDRESS_IN_IPV4_BIN
             as = IPV6_ADDRESS_IN_IPV4_BIN
+            as_domain = IPV6_ADDRESS_IN_IPV4_BIN
+            as_usagetype = IPV6_ADDRESS_IN_IPV4_BIN
+            as_cidr = 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
@@ -171,6 +174,9 @@ class Ip2location
             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
+            as_domain = (defined?(rec.as_domain) && rec.as_domain != '') ? rec.as_domain : FIELD_NOT_SUPPORTED
+            as_usagetype = (defined?(rec.as_usagetype) && rec.as_usagetype != '') ? rec.as_usagetype : FIELD_NOT_SUPPORTED
+            as_cidr = (defined?(rec.as_cidr) && rec.as_cidr != '') ? rec.as_cidr : FIELD_NOT_SUPPORTED
         else
             country_short = INVALID_IP_ADDRESS
             country_long = INVALID_IP_ADDRESS
@@ -197,6 +203,9 @@ class Ip2location
             district = INVALID_IP_ADDRESS
             asn = INVALID_IP_ADDRESS
             as = INVALID_IP_ADDRESS
+            as_domain = INVALID_IP_ADDRESS
+            as_usagetype = INVALID_IP_ADDRESS
+            as_cidr = INVALID_IP_ADDRESS
         end
     else
         country_short = INVALID_IP_ADDRESS
@@ -224,6 +233,9 @@ class Ip2location
         district = INVALID_IP_ADDRESS
         asn = INVALID_IP_ADDRESS
         as = INVALID_IP_ADDRESS
+        as_domain = INVALID_IP_ADDRESS
+        as_usagetype = INVALID_IP_ADDRESS
+        as_cidr = INVALID_IP_ADDRESS
     end
     results = {}
     results['country_short'] = country_short
@@ -251,6 +263,9 @@ class Ip2location
     results['district'] = district
     results['asn'] = asn
     results['as'] = as
+    results['as_domain'] = as_domain
+    results['as_usagetype'] = as_usagetype
+    results['as_cidr'] = as_cidr
     return results
   end
 
@@ -679,6 +694,57 @@ class Ip2location
     return as
   end
 
+  def get_as_domain(ip)
+    valid = !(IPAddr.new(ip) rescue nil).nil?
+    if valid
+        rec = get_record(ip)
+        if rec == IPV6_ADDRESS_IN_IPV4_BIN
+          as_domain = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
+          as_domain = (defined?(rec.as_domain) && rec.as_domain != '') ? rec.as_domain : FIELD_NOT_SUPPORTED
+        else
+          as_domain = INVALID_IP_ADDRESS
+        end
+    else
+      as_domain = INVALID_IP_ADDRESS
+    end
+    return as_domain
+  end
+
+  def get_as_usagetype(ip)
+    valid = !(IPAddr.new(ip) rescue nil).nil?
+    if valid
+        rec = get_record(ip)
+        if rec == IPV6_ADDRESS_IN_IPV4_BIN
+          as_usagetype = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
+          as_usagetype = (defined?(rec.as_usagetype) && rec.as_usagetype != '') ? rec.as_usagetype : FIELD_NOT_SUPPORTED
+        else
+          as_usagetype = INVALID_IP_ADDRESS
+        end
+    else
+      as_usagetype = INVALID_IP_ADDRESS
+    end
+    return as_usagetype
+  end
+
+  def get_as_cidr(ip)
+    valid = !(IPAddr.new(ip) rescue nil).nil?
+    if valid
+        rec = get_record(ip)
+        if rec == IPV6_ADDRESS_IN_IPV4_BIN
+          as_cidr = IPV6_ADDRESS_IN_IPV4_BIN
+        elsif !(rec.nil?)
+          as_cidr = (defined?(rec.as_cidr) && rec.as_cidr != '') ? rec.as_cidr : FIELD_NOT_SUPPORTED
+        else
+          as_cidr = INVALID_IP_ADDRESS
+        end
+    else
+      as_cidr = INVALID_IP_ADDRESS
+    end
+    return as_cidr
+  end
+
   def bsearch(low, high, ipnum, base_addr, col_length)
     while low <= high do
         mid = (low + high) >> 1