ip2location_ruby 8.7.2 → 8.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9172b1c0b6b238c12d44df60b765218045e6fc3d27e3b2c551e2613bd9cf23cd
-  data.tar.gz: 4a45aad55ad12dbd2a80b6093d3f228e0fc57399f78a5238fa738a5fbaff3f27
+  metadata.gz: 25bcf30ad8b3df703b3f9e60869c7bf3964caff22bb6a32c078e771ae4fcea8d
+  data.tar.gz: e59e3569acacb0d262ebf1de4114633a78529707b62c4aa8092cec7a58303930
 SHA512:
-  metadata.gz: 1d83b024d3f3357b35552f236e55ab482f8fdbc3cd059b8ed27d5cd5b02eeb2e2ccf535fb5cde230b0b9445ea0c5dc5326a6fc9f706d5745f9adbaf60a6f7d9b
-  data.tar.gz: cac3c8810e8b30a65d0b6a92e75ef872169b1f4880c1dbc2758be3bc79645fed97ed962afa2fabddbfa104d7664af6b3f0fd4ec1bf26a75219eda45e1fc584fc
+  metadata.gz: fa3a4ffd3a2123780c3576e25d63c4fe7a9cb38d270c46e7995b94375614c6f02f5e99a7941f97ce03524d8e1988185373eb7f17b98fc51520fb88e0aee4ebcd
+  data.tar.gz: c0134ba082b34fc1a1340367b15c9783b1935cbf3c2488df4564d00d644afc1a04c1e6fff845790abe768c1341ef182054e5a02da558c4f6270d095a8ee73de9

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem 'bindata'
+gem 'bindata', "~> 2.4.15"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 

data/LICENSE.txt

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

data/example.rb

@@ -32,14 +32,11 @@ 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()
 
-# Web Service
-ws = Ip2locationWebService.new('demo', 'WS25', true)
-record = ws.lookup('8.8.8.8', 'continent,country,region,city,geotargeting,country_groupings,time_zone_info', 'en')
-puts record
-puts ws.get_credit()
-
 # IP Tools
 iptool = Ip2locationIpTools.new()
 puts iptool.is_ipv4('8.8.8.8')

data/ip2location_ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ip2location_ruby"
-  s.version = "8.7.2"
+  s.version = "8.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "Rakefile",
     "VERSION",
@@ -57,18 +56,18 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bindata>, [">= 0"])
+      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>, [">= 0"])
+      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>, [">= 0"])
+    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"])

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.rb

@@ -12,9 +12,9 @@ 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, :databaseyear, :databasemonth, :databaseday, :last_err_msg
+  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.2'
+  VERSION = '8.8.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.'
@@ -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

data/spec/ip2location_ruby_database_spec.rb

@@ -157,6 +157,24 @@ describe "Ip2location" do
     expect(record).to eq 'NOT SUPPORTED'
   end
 
+  it "work correctly with get_as_domain" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_as_domain('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_as_usagetype" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_as_usagetype('8.8.8.8')
+    expect(record).to eq 'NOT SUPPORTED'
+  end
+
+  it "work correctly with get_as_cidr" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP2LOCATION-LITE-DB1.IPV6.BIN")
+    record = i2l.get_as_cidr('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')

data/spec/ip2location_ruby_iptools_spec.rb

@@ -74,7 +74,7 @@ describe "Ip2location" do
     iptool = Ip2locationIpTools.new()
     record = iptool.cidr_to_ipv6('2002::1234:abcd:ffff:c0a8:101/64')
     expect(record).to include(
-  "ip_start"=>"2002:0000:0000:1234:abcd:ffff:c0a8:0101",
+  "ip_start"=>"2002:0000:0000:1234:0000:0000:0000:0000",
   "ip_end"=>"2002:0000:0000:1234:ffff:ffff:ffff:ffff"
 )
   end

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: ip2location_ruby
 version: !ruby/object:Gem::Version
-  version: 8.7.2
+  version: 8.8.0
 platform: ruby
 authors:
 - ip2location
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.15
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +81,6 @@ files:
 - ".document"
 - ".rspec"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -114,7 +112,6 @@ metadata:
   documentation_uri: https://www.rubydoc.info/gems/ip2location_ruby
   homepage_uri: https://www.ip2location.com
   source_code_uri: https://github.com/ip2location/ip2location-ruby
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -129,8 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.7.1
 specification_version: 4
 summary: the ip2location ruby library
 test_files: []

data/Gemfile.lock

@@ -1,25 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    bindata (2.4.10)
-    diff-lcs (1.1.3)
-    json (>= 2.3.0)
-    rdoc (>= 6.3.1)
-      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 (>= 6.3.1)
-  rspec (~> 2.8.0)