ip2proxy_ruby 2.1.0 → 3.2.0

data/lib/ip2proxy_ruby/i2p_database_config.rb

@@ -1,26 +1,28 @@
-class I2pDbConfig 
-  COLUMNS = { 
-     :COUNTRY                  => [0, 2, 3, 3, 3, 3, 3, 3, 3],
-     :REGION                   => [0, 0, 0, 4, 4, 4, 4, 4, 4],
-     :CITY                     => [0, 0, 0, 5, 5, 5, 5, 5, 5],
-     :ISP                      => [0, 0, 0, 0, 6, 6, 6, 6, 6],
-     :PROXYTYPE                => [0, 0, 2, 2, 2, 2, 2, 2, 2],
-     :DOMAIN                   => [0, 0, 0, 0, 0, 7, 7, 7, 7],
-     :USAGETYPE                => [0, 0, 0, 0, 0, 0, 8, 8, 8],
-     :ASN                      => [0, 0, 0, 0, 0, 0, 0, 9, 9],
-     :AS                       => [0, 0, 0, 0, 0, 0, 0, 10, 10],
-     :LASTSEEN                 => [0, 0, 0, 0, 0, 0, 0, 0, 11]
-   }
-   
- def self.setup_database(db_index)
-   # strip all 0 value & downcase keys
-  cols = COLUMNS.inject({}) {|memo, (key, value)|
-   (memo[key.to_s.downcase.to_sym] = value[db_index] if value[db_index] > 0)
-   memo
-  }
-  # order by value
-  col_array = cols.sort_by {|key,value| value}
- end
- 
-end
+class I2pDbConfig 
+  COLUMNS = { 
+     :COUNTRY                  => [0, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3],
+     :REGION                   => [0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 4],
+     :CITY                     => [0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5],
+     :ISP                      => [0, 0, 0, 0, 6, 6, 6, 6, 6, 6, 6, 6],
+     :PROXYTYPE                => [0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2],
+     :DOMAIN                   => [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7],
+     :USAGETYPE                => [0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8],
+     :ASN                      => [0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9],
+     :AS                       => [0, 0, 0, 0, 0, 0, 0, 10, 10, 10, 10, 10],
+     :LASTSEEN                 => [0, 0, 0, 0, 0, 0, 0, 0, 11, 11, 11, 11],
+     :THREAT                   => [0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 12, 12],
+     :PROVIDER                 => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13]
+   }
+   
+ def self.setup_database(db_index)
+   # strip all 0 value & downcase keys
+  cols = COLUMNS.inject({}) {|memo, (key, value)|
+   (memo[key.to_s.downcase.to_sym] = value[db_index] if value[db_index] > 0)
+   memo
+  }
+  # order by value
+  col_array = cols.sort_by {|key,value| value}
+ end
+ 
+end
  

data/lib/ip2proxy_ruby/i2p_ip_data.rb

@@ -1,10 +1,10 @@
-class I2pIpData  < BinData::BasePrimitive
-  def read_and_return_value(io)
-    iv = eval_parameter(:ip_version)
-    if iv == 4
-      addr = BinData::Uint32le.read(io)
-    elsif iv == 6
-      addr = BinData::Uint128le.read(io)
-    end
-  end
+class I2pIpData  < BinData::BasePrimitive
+  def read_and_return_value(io)
+    iv = eval_parameter(:ip_version)
+    if iv == 4
+      addr = BinData::Uint32le.read(io)
+    elsif iv == 6
+      addr = BinData::Uint128le.read(io)
+    end
+  end
 end

data/lib/ip2proxy_ruby/i2p_string_data.rb

@@ -1,16 +1,16 @@
-class I2pStringData  < 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')
-    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
-  end
-
+class I2pStringData  < 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')
+    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
+  end
+
 end

data/lib/ip2proxy_ruby/ip2proxy_config.rb

@@ -1,17 +1,20 @@
-class Ip2proxyConfig < BinData::Record
-  endian :little
-	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
+class Ip2proxyConfig < BinData::Record
+  endian :little
+  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/lib/ip2proxy_ruby/ip2proxy_record.rb

@@ -1,20 +1,20 @@
-class Ip2ProxyRecord 
-  def self.init(database, ip_version)
-    cls = Class.new(BinData::Record)
-    cls.class_eval {
-      endian :little
-      i2p_ip_data :ip_from, :ip_version => ip_version
-      database.each do |col|
-        if col.first == :country
-          i2p_string_data :country_short
-          i2p_string_data :country_long, :country_long => true
-        else
-          i2p_string_data col.first
-        end
-      end
-      
-      i2p_ip_data :ip_to, :ip_version => ip_version
-    }
-    cls 
-  end
+class Ip2ProxyRecord 
+  def self.init(database, ip_version)
+    cls = Class.new(BinData::Record)
+    cls.class_eval {
+      endian :little
+      i2p_ip_data :ip_from, :ip_version => ip_version
+      database.each do |col|
+        if col.first == :country
+          i2p_string_data :country_short
+          i2p_string_data :country_long, :country_long => true
+        else
+          i2p_string_data col.first
+        end
+      end
+      
+      i2p_ip_data :ip_to, :ip_version => ip_version
+    }
+    cls 
+  end
 end

data/spec/ip2proxy_ruby_database_spec.rb

@@ -0,0 +1,123 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Ip2proxy" do
+  it "work correctly with invalid ip" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_all('1.0.0.x')
+    expect(record['country_short']).to eq 'INVALID IP ADDRESS'
+  end
+
+  it "work correctly with get_all ipv4" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_all('1.0.0.8')
+    expect(record['country_short']).to eq 'US'
+  end
+
+  it "work correctly with get_country_short" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_country_short('1.0.0.8')
+    expect(record).to eq 'US'
+  end
+
+  it "work correctly with get_country_long" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_country_long('1.0.0.8')
+    expect(record).to eq 'United States of America'
+  end
+
+  it "work correctly with get_region" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_region('1.0.0.8')
+    expect(record).to eq 'California'
+  end
+
+  it "work correctly with get_city" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_city('1.0.0.8')
+    expect(record).to eq 'Los Angeles'
+  end
+
+  it "work correctly with get_isp" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_isp('1.0.0.8')
+    expect(record).to eq 'APNIC and CloudFlare DNS Resolver Project'
+  end
+
+  it "work correctly with get_domain" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_domain('1.0.0.8')
+    expect(record).to eq 'cloudflare.com'
+  end
+
+  it "work correctly with get_usagetype" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_usagetype('1.0.0.8')
+    expect(record).to eq 'CDN'
+  end
+
+  it "work correctly with get_asn" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_asn('1.0.0.8')
+    expect(record).to eq '13335'
+  end
+
+  it "work correctly with get_as" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_as('1.0.0.8')
+    expect(record).to eq 'CLOUDFLARENET'
+  end
+
+  it "work correctly with get_last_seen" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_last_seen('1.0.0.8')
+    expect(record).to eq '22'
+  end
+
+  it "work correctly with get_threat" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_threat('1.0.0.8')
+    expect(record).to eq '-'
+  end
+
+  it "work correctly with is_proxy" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.is_proxy('1.0.0.8')
+    expect(record).to eq 2
+  end
+
+  it "work correctly with get_proxytype" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_proxytype('1.0.0.8')
+    expect(record).to eq 'DCH'
+  end
+
+  it "work correctly with get_provider" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_provider('1.0.0.8')
+    expect(record).to eq 'CloudFlare'
+  end
+
+  it "work correctly with get_all ipv6" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_all('2c0f:ffa0::4')
+    expect(record['country_short']).to eq 'UG'
+  end
+
+  it "work correctly with get_module_version" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_module_version()
+    expect(record).to eq '3.2.0'
+  end
+
+  it "work correctly with get_package_version" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_package_version()
+    expect(record).to eq '11'
+  end
+
+  it "work correctly with get_database_version" do
+    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/PX11.SAMPLE.BIN")
+    record = i2p.get_database_version()
+    expect(record).to eq '2021.5.28'
+  end
+end

data/spec/spec_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ip2proxy_ruby
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - ip2location
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-05 00:00:00.000000000 Z
+date: 2021-08-13 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,24 +66,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !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 IP2Proxy Ruby library to detect VPN servers, open proxies,
-  web proxies, Tor exit nodes, search engine robots and data center ranges using IP2Proxy
-  BIN database. Other information available includes proxy type, country, state, city,
-  ISP, domain name, usage type, AS number, AS name and last seen date.
+  web proxies, Tor exit nodes, search engine robots, data center ranges and residential
+  proxies using IP2Proxy BIN database. Other information available includes proxy
+  type, country, state, city, ISP, domain name, usage type, AS number, AS name, threats,
+  last seen date and provider names.
 email:
 - support@ip2location.com
 executables: []
@@ -120,9 +93,9 @@ files:
 - lib/ip2proxy_ruby/i2p_string_data.rb
 - lib/ip2proxy_ruby/ip2proxy_config.rb
 - lib/ip2proxy_ruby/ip2proxy_record.rb
-- rb/data/IP2PROXY-LITE-PX1.BIN
-- spec/assets/IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP.SAMPLE.BIN
-- spec/ip2proxy_ruby_spec.rb
+- rb/data/PX11.SAMPLE.BIN
+- spec/assets/PX11.SAMPLE.BIN
+- spec/ip2proxy_ruby_database_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ip2location/ip2proxy-ruby
 licenses:
@@ -146,7 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: IP2Proxy Ruby library

data/spec/ip2proxy_ruby_spec.rb

@@ -1,20 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Ip2proxy" do
-  it "work correctly with ipv4" do
-    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP.SAMPLE.BIN")
-    record = i2p.get_all('1.0.241.135')
-    record.should_not be_nil
-    record['is_proxy'].should == 1
-    i2p.close()
-  end
-
-  it "work correctly with ipv6" do
-    i2p = Ip2proxy.new.open(File.dirname(__FILE__) + "/assets/IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP.SAMPLE.BIN")
-    record = i2p.get_all('2001::')
-    record.should_not be_nil
-    record['is_proxy'].should == 0
-    i2p.close()
-  end
-
-end