RubyGems - ip2proxy_ruby - Versions diffs - 3.0.0 → 3.2.1 - Mend

ip2proxy_ruby 3.0.0 → 3.2.1

Files changed (19) hide show

checksums.yaml +4 -4
data/LICENSE.txt +20 -20
data/README.md +98 -131
data/example.rb +52 -43
data/ip2proxy_ruby.gemspec +8 -14
data/lib/ip2proxy_ruby/i2p_database_config.rb +27 -26
data/lib/ip2proxy_ruby/i2p_ip_data.rb +9 -9
data/lib/ip2proxy_ruby/i2p_string_data.rb +15 -15
data/lib/ip2proxy_ruby/ip2proxy_config.rb +19 -16
data/lib/ip2proxy_ruby/ip2proxy_record.rb +19 -19
data/lib/ip2proxy_ruby.rb +524 -427
data/rb/data/PX11.SAMPLE.BIN +0 -0
data/spec/assets/PX11.SAMPLE.BIN +0 -0
data/spec/ip2proxy_ruby_database_spec.rb +123 -0
data/spec/spec_helper.rb +0 -1
metadata +11 -39
data/rb/data/IP2PROXY-LITE-PX1.BIN +0 -0
data/spec/assets/IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP.SAMPLE.BIN +0 -0
data/spec/ip2proxy_ruby_spec.rb +0 -20

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a0f076da57bce1ce3df8766d07dde4855d90601d5e184b5bb1c15a099e8342f
-  data.tar.gz: 8c9ae8dcf68cf2d9447397299572bc82317bebca1d15bbd85124250306c664bb
+  metadata.gz: dd1e0bbbfed7c2c8810a7673dedb3b2217e9b15f2ee66db8996b0193c1f29954
+  data.tar.gz: 268884174492ad2fb1e359f499fb4f783f2ff0bcd07a075fb772d5dbbc80be45
 SHA512:
-  metadata.gz: 7f546e8cc2e57db0130b996cc0b8d436b8897ea33a6c92f2346617d66475de8b89d651dbd472457ca691c8c71b6787e9138452c8dc07852ca3a0461f711c4774
-  data.tar.gz: 904aa801ab54f8b9c00ca38121ab3011e78fea24273d902ae2f6a57fb3b8e7f8a37858697ff75b94c9ed0efb06c50013f337082d942f01b13f0a5d92513e9623
+  metadata.gz: ee2149410b6e181dc04055c245b35a43e26f32fa67443a35d88415e04389d0fca830b0aefdc33973ae9538aa5744dcb050a6d79916d8d9e0833ae581412b63d0
+  data.tar.gz: 9f6762d6926650eb3ef9b5b5dcb9ff1e36f342bb1f965612324a0c1a6c82f40890158d760d5d681c58ac8c76a98a6a6787fd98f432486b35bf6466d6f31a1f73

data/LICENSE.txt CHANGED Viewed

@@ -1,20 +1,20 @@
-Copyright (c) 2019 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
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+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
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md CHANGED Viewed

@@ -1,131 +1,98 @@
-[![Latest Stable Version](https://img.shields.io/gem/v/ip2proxy_ruby.svg)](https://rubygems.org/gems/ip2proxy_ruby)
-[![Total Downloads](https://img.shields.io/gem/dt/ip2proxy_ruby.svg)](https://rubygems.org/gems/ip2proxy_ruby)
-# IP2Proxy Ruby Library
-This module allows user to reverse search of IP address to detect VPN servers, open proxies, 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 and last seen date.
-It lookup the proxy IP address from **IP2Proxy BIN Data** file. This data file can be downloaded at
-* Free IP2Proxy BIN Data: https://lite.ip2location.com
-* Commercial IP2Proxy BIN Data: https://www.ip2location.com/proxy-database
-For more details, please visit:
-[https://www.ip2location.com/ip2proxy/developers/ruby](https://www.ip2location.com/ip2proxy/developers/ruby)
-## Methods
-Below are the methods supported in this module.
-|Method Name|Description|
-|---|---|
-|open|Open the IP2Proxy BIN data with **File I/O** mode for lookup.|
-|close|Close and clean up the file pointer.|
-|get_package_version|Get the package version (1 to 10 for PX1 to PX10 respectively).|
-|get_module_version|Get the module version.|
-|get_database_version|Get the database version.|
-|is_proxy|Check whether if an IP address was a proxy. Please see [Proxy Type](#proxy-type) for details. Returned value:<ul><li>-1 : errors</li><li>0 : not a proxy</li><li>1 : a proxy</li><li>2 : a data center IP address</li></ul>|
-|get_all|Return the proxy information in array.|
-|get_proxytype|Return the proxy type. Please visit <a href="https://www.ip2location.com/database/px10-ip-proxytype-country-region-city-isp-domain-usagetype-asn-lastseen-threat-residential" target="_blank">IP2Location</a> for the list of proxy types supported|
-|get_country_short|Return the ISO3166-1 country code (2-digits) of the proxy.|
-|get_country_long|Return the ISO3166-1 country name of the proxy.|
-|get_region|Return the ISO3166-2 region name of the proxy. Please visit <a href="https://www.ip2location.com/free/iso3166-2" target="_blank">ISO3166-2 Subdivision Code</a> for the information of ISO3166-2 supported|
-|get_city|Return the city name of the proxy.|
-|get_isp|Return the ISP name of the proxy.|
-|get_domain|Return the domain name of proxy's IP address or domain name.|
-|get_usagetype|Return the ISP's usage type of proxy's IP address or domain name. Please see [Usage Type](#usage-type) for details.|
-|get_asn|Return the autonomous system number (ASN) of proxy's IP address or domain name.|
-|get_as|Return the autonomous system (AS) name of proxy's IP address or domain name.|
-|get_last_seen|Return the last seen days ago value of proxy's IP address or domain name.|
-|get_threat|Return the threat types reported to proxy's IP address or domain name. Please see [Threat Type](#threat-type) for details.|
-## Usage
-```
-require 'ip2proxy_ruby'
-# open IP2Proxy BIN database for proxy lookup
-i2p = Ip2proxy.new.open("./data/IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP-DOMAIN-USAGETYPE-ASN-LASTSEEN-THREAT-RESIDENTIAL.BIN")
-# get versioning information
-print 'Module Version: ' + i2p.get_module_version + "\n"
-print 'Package Version: ' + i2p.get_package_version + "\n"
-print 'Database Version: ' + i2p.get_database_version + "\n"
-# individual proxy data check
-print 'Is Proxy: ' + i2p.is_proxy('1.2.3.4').to_s + "\n"
-print 'Proxy Type: ' + i2p.get_proxytype('1.2.3.4') + "\n"
-print 'Country Code: ' + i2p.get_country_short('1.2.3.4') + "\n"
-print 'Country Name: ' + i2p.get_country_long('1.2.3.4') + "\n"
-print 'Region Name: ' + i2p.get_region('1.2.3.4') + "\n"
-print 'City Name: ' + i2p.get_city('1.2.3.4') + "\n"
-print 'ISP: ' + i2p.get_isp('1.2.3.4') + "\n"
-print 'Domain: ' + i2p.get_domain('1.2.3.4') + "\n"
-print 'Usage Type: ' + i2p.get_usagetype('1.2.3.4') + "\n"
-print 'ASN: ' + i2p.get_asn('1.2.3.4') + "\n"
-print 'AS: ' + i2p.get_as('1.2.3.4') + "\n"
-print 'Last Seen: ' + i2p.get_last_seen('1.2.3.4') + "\n"
-print 'Threat: ' + i2p.get_threat('1.2.3.4') + "\n"
-# single function to get all proxy data returned in array
-record = i2p.get_all('1.2.3.4')
-print 'is Proxy: ' + record['is_proxy'].to_s + "\n"
-print 'Proxy Type: ' + record['proxy_type'] + "\n"
-print 'Country Code: ' + record['country_short'] + "\n"
-print 'Country Name: ' + record['country_long'] + "\n"
-print 'Region Name: ' + record['region'] + "\n"
-print 'City Name: ' + record['city'] + "\n"
-print 'ISP: ' + record['isp'] + "\n"
-print 'Domain: ' + record['domain'] + "\n"
-print 'Usage Type: ' + record['usagetype'] + "\n"
-print 'ASN: ' + record['asn'] + "\n"
-print 'AS: ' + record['as'] + "\n"
-print 'Last Seen: ' + record['last_seen'] + "\n"
-print 'Threat: ' + record['threat'] + "\n"
-# close IP2Proxy BIN database
-i2p.close()
-```
-### Proxy Type
-|Proxy Type|Description|
-|---|---|
-|VPN|Anonymizing VPN services|
-|TOR|Tor Exit Nodes|
-|PUB|Public Proxies|
-|WEB|Web Proxies|
-|DCH|Hosting Providers/Data Center|
-|SES|Search Engine Robots|
-|RES|Residential Proxies [PX10+]|
-### Usage Type
-|Usage Type|Description|
-|---|---|
-|COM|Commercial|
-|ORG|Organization|
-|GOV|Government|
-|MIL|Military|
-|EDU|University/College/School|
-|LIB|Library|
-|CDN|Content Delivery Network|
-|ISP|Fixed Line ISP|
-|MOB|Mobile ISP|
-|DCH|Data Center/Web Hosting/Transit|
-|SES|Search Engine Spider|
-|RSV|Reserved|
-### Threat Type
-|Threat Type|Description|
-|---|---|
-|SPAM|Spammer|
-|SCANNER|Security Scanner or Attack|
-|BOTNET|Spyware or Malware|
-## Support
-Email: support@ip2location.com
-URL: [https://www.ip2location.com](https://www.ip2location.com)
+[![Latest Stable Version](https://img.shields.io/gem/v/ip2proxy_ruby.svg)](https://rubygems.org/gems/ip2proxy_ruby)
+[![Total Downloads](https://img.shields.io/gem/dt/ip2proxy_ruby.svg)](https://rubygems.org/gems/ip2proxy_ruby)
+# IP2Proxy Ruby Library
+This module allows user to reverse search of IP address to detect VPN servers, open proxies, 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. It lookup the proxy IP address from **IP2Proxy BIN Data** file or web service.
+For more details, please visit:
+[https://www.ip2location.com/ip2proxy/developers/ruby](https://www.ip2location.com/ip2proxy/developers/ruby)
+# Usage
+You can check the **example.rb** file to learn more about usage.
+## BIN Database
+An outdated BIN database was provided in the library for your testing. You are recommended to visit the [links](#dependencies) to download the latest BIN database and save it in the ```rb``` folder.
+Below is the description of the functions available in the **BIN Database** lookup.
+|Method Name|Description|
+|---|---|
+|open|Open the IP2Proxy BIN data with **File I/O** mode for lookup.|
+|close|Close and clean up the file pointer.|
+|get_package_version|Get the package version (1 to 11 for PX1 to PX11 respectively).|
+|get_module_version|Get the module version.|
+|get_database_version|Get the database version.|
+|is_proxy|Check whether if an IP address was a proxy. Please see [Proxy Type](#proxy-type) for details. Returned value:<ul><li>-1 : errors</li><li>0 : not a proxy</li><li>1 : a proxy</li><li>2 : a data center IP address</li></ul>|
+|get_all|Return the proxy information in array.|
+|get_proxytype|Return the proxy type. Please visit <a href="https://www.ip2location.com/database/px11-ip-proxytype-country-region-city-isp-domain-usagetype-asn-lastseen-threat-residential-provider" target="_blank">IP2Location</a> for the list of proxy types supported|
+|get_country_short|Return the ISO3166-1 country code (2-digits) of the proxy.|
+|get_country_long|Return the ISO3166-1 country name of the proxy.|
+|get_region|Return the ISO3166-2 region name of the proxy. Please visit <a href="https://www.ip2location.com/free/iso3166-2" target="_blank">ISO3166-2 Subdivision Code</a> for the information of ISO3166-2 supported|
+|get_city|Return the city name of the proxy.|
+|get_isp|Return the ISP name of the proxy.|
+|get_domain|Return the domain name of proxy's IP address or domain name.|
+|get_usagetype|Return the ISP's usage type of proxy's IP address or domain name. Please see [Usage Type](#usage-type) for details.|
+|get_asn|Return the autonomous system number (ASN) of proxy's IP address or domain name.|
+|get_as|Return the autonomous system (AS) name of proxy's IP address or domain name.|
+|get_last_seen|Return the last seen days ago value of proxy's IP address or domain name.|
+|get_threat|Return the threat types reported to proxy's IP address or domain name. Please see [Threat Type](#threat-type) for details.|
+|get_provider|Returns the VPN service provider name if available.|
+## Web Service
+Below is the description of the functions available in the **Web Service** lookup.
+| Function Name | Description |
+|---|---|
+| Constructor | Expect 3 input parameters:<ol><li>IP2Proxy API Key.</li><li>Package (PX1 - PX11)</li></li><li>Use HTTPS or HTTP</li></ol> |
+| lookup | Return the proxy information in array.<ul><li>countryCode</li><li>countryName</li><li>regionName</li><li>cityName</li><li>isp</li><li>domain</li><li>usageType</li><li>asn</li><li>as</li><li>lastSeen</li><li>threat</li><li>proxyType</li><li>isProxy</li><li>provider</li><ul> |
+| get_credit | Return remaining credit of the web service account. |
+### Proxy Type
+|Proxy Type|Description|
+|---|---|
+|VPN|Anonymizing VPN services|
+|TOR|Tor Exit Nodes|
+|PUB|Public Proxies|
+|WEB|Web Proxies|
+|DCH|Hosting Providers/Data Center|
+|SES|Search Engine Robots|
+|RES|Residential Proxies [PX10+]|
+### Usage Type
+|Usage Type|Description|
+|---|---|
+|COM|Commercial|
+|ORG|Organization|
+|GOV|Government|
+|MIL|Military|
+|EDU|University/College/School|
+|LIB|Library|
+|CDN|Content Delivery Network|
+|ISP|Fixed Line ISP|
+|MOB|Mobile ISP|
+|DCH|Data Center/Web Hosting/Transit|
+|SES|Search Engine Spider|
+|RSV|Reserved|
+### Threat Type
+|Threat Type|Description|
+|---|---|
+|SPAM|Spammer|
+|SCANNER|Security Scanner or Attack|
+|BOTNET|Spyware or Malware|
+# Dependencies
+This library requires IP2Proxy BIN data file to function. You may download the BIN data file at
+* IP2Proxy LITE BIN Data (Free): https://lite.ip2location.com
+* IP2Proxy Commercial BIN Data (Comprehensive): https://www.ip2location.com/proxy-database
+You can also sign up for [IP2Proxy Web Service](https://www.ip2location.com/web-service/ip2proxy) to lookup by IP2Proxy API.
+# Support
+Email: support@ip2location.com
+URL: [https://www.ip2location.com](https://www.ip2location.com)

data/example.rb CHANGED Viewed

@@ -1,43 +1,52 @@
-require 'ip2proxy_ruby'
-# open IP2Proxy BIN database for proxy lookup
-i2p = Ip2proxy.new.open("./data/IP2PROXY-LITE-PX1.BIN")
-# get versioning information
-print 'Module Version: ' + i2p.get_module_version + "\n"
-print 'Package Version: ' + i2p.get_package_version + "\n"
-print 'Database Version: ' + i2p.get_database_version + "\n"
-# individual proxy data check
-print 'Is Proxy: ' + i2p.is_proxy('1.2.3.4').to_s + "\n"
-print 'Proxy Type: ' + i2p.get_proxytype('1.2.3.4') + "\n"
-print 'Country Code: ' + i2p.get_country_short('1.2.3.4') + "\n"
-print 'Country Name: ' + i2p.get_country_long('1.2.3.4') + "\n"
-print 'Region Name: ' + i2p.get_region('1.2.3.4') + "\n"
-print 'City Name: ' + i2p.get_city('1.2.3.4') + "\n"
-print 'ISP: ' + i2p.get_isp('1.2.3.4') + "\n"
-print 'Domain: ' + i2p.get_domain('1.2.3.4') + "\n"
-print 'Usage Type: ' + i2p.get_usagetype('1.2.3.4') + "\n"
-print 'ASN: ' + i2p.get_asn('1.2.3.4') + "\n"
-print 'AS: ' + i2p.get_as('1.2.3.4') + "\n"
-print 'Last Seen: ' + i2p.get_last_seen('1.2.3.4') + "\n"
-print 'Threat: ' + i2p.get_threat('1.2.3.4') + "\n"
-# single function to get all proxy data returned in array
-record = i2p.get_all('1.2.3.4')
-print 'is Proxy: ' + record['is_proxy'].to_s + "\n"
-print 'Proxy Type: ' + record['proxy_type'] + "\n"
-print 'Country Code: ' + record['country_short'] + "\n"
-print 'Country Name: ' + record['country_long'] + "\n"
-print 'Region Name: ' + record['region'] + "\n"
-print 'City Name: ' + record['city'] + "\n"
-print 'ISP: ' + record['isp'] + "\n"
-print 'Domain: ' + record['domain'] + "\n"
-print 'Usage Type: ' + record['usagetype'] + "\n"
-print 'ASN: ' + record['asn'] + "\n"
-print 'AS: ' + record['as'] + "\n"
-print 'Last Seen: ' + record['last_seen'] + "\n"
-print 'Threat: ' + record['threat'] + "\n"
-# close IP2Proxy BIN database
-i2p.close()
+require 'ip2proxy_ruby'
+# open IP2Proxy BIN database for proxy lookup
+i2p = Ip2proxy.new.open("./data/PX11.SAMPLE.BIN")
+# get versioning information
+print 'Module Version: ' + i2p.get_module_version + "\n"
+print 'Package Version: ' + i2p.get_package_version + "\n"
+print 'Database Version: ' + i2p.get_database_version + "\n"
+# individual proxy data check
+print 'Is Proxy: ' + i2p.is_proxy('1.2.3.4').to_s + "\n"
+print 'Proxy Type: ' + i2p.get_proxytype('1.2.3.4') + "\n"
+print 'Country Code: ' + i2p.get_country_short('1.2.3.4') + "\n"
+print 'Country Name: ' + i2p.get_country_long('1.2.3.4') + "\n"
+print 'Region Name: ' + i2p.get_region('1.2.3.4') + "\n"
+print 'City Name: ' + i2p.get_city('1.2.3.4') + "\n"
+print 'ISP: ' + i2p.get_isp('1.2.3.4') + "\n"
+print 'Domain: ' + i2p.get_domain('1.2.3.4') + "\n"
+print 'Usage Type: ' + i2p.get_usagetype('1.2.3.4') + "\n"
+print 'ASN: ' + i2p.get_asn('1.2.3.4') + "\n"
+print 'AS: ' + i2p.get_as('1.2.3.4') + "\n"
+print 'Last Seen: ' + i2p.get_last_seen('1.2.3.4') + "\n"
+print 'Threat: ' + i2p.get_threat('1.2.3.4') + "\n"
+print 'Provider: ' + i2p.get_provider('1.2.3.4') + "\n"
+# single function to get all proxy data returned in array
+record = i2p.get_all('1.2.3.4')
+print 'is Proxy: ' + record['is_proxy'].to_s + "\n"
+print 'Proxy Type: ' + record['proxy_type'] + "\n"
+print 'Country Code: ' + record['country_short'] + "\n"
+print 'Country Name: ' + record['country_long'] + "\n"
+print 'Region Name: ' + record['region'] + "\n"
+print 'City Name: ' + record['city'] + "\n"
+print 'ISP: ' + record['isp'] + "\n"
+print 'Domain: ' + record['domain'] + "\n"
+print 'Usage Type: ' + record['usagetype'] + "\n"
+print 'ASN: ' + record['asn'] + "\n"
+print 'AS: ' + record['as'] + "\n"
+print 'Last Seen: ' + record['last_seen'] + "\n"
+print 'Threat: ' + record['threat'] + "\n"
+print 'Provider: ' + record['provider'] + "\n"
+# close IP2Proxy BIN database
+i2p.close()
+# Web Service
+ws = Ip2proxyWebService.new('demo', 'PX11', true)
+record = ws.lookup('1.2.3.4')
+print record
+print "\n"
+print ws.get_credit()

data/ip2proxy_ruby.gemspec CHANGED Viewed

@@ -2,12 +2,12 @@
 Gem::Specification.new do |s|
   s.name          = "ip2proxy_ruby"
-  s.version       = "3.0.0"
+  s.version       = "3.2.1"
   s.authors       = ["ip2location"]
   s.email         = ["support@ip2location.com"]
   s.summary       = "IP2Proxy Ruby library"
-  s.description   = "The official IP2Proxy Ruby library to detect VPN servers, open proxies, 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 and last seen date."
+  s.description   = "The official IP2Proxy Ruby library to detect VPN servers, open proxies, 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."
   s.homepage      = "https://github.com/ip2location/ip2proxy-ruby"
   s.licenses      = ["MIT"]
   s.require_paths = ["lib"]
@@ -31,10 +31,10 @@ Gem::Specification.new do |s|
     "lib/ip2proxy_ruby/i2p_string_data.rb",
     "lib/ip2proxy_ruby/ip2proxy_config.rb",
     "lib/ip2proxy_ruby/ip2proxy_record.rb",
-    "spec/assets/IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP.SAMPLE.BIN",
-    "spec/ip2proxy_ruby_spec.rb",
+    "spec/assets/PX11.SAMPLE.BIN",
+    "spec/ip2proxy_ruby_database_spec.rb",
     "spec/spec_helper.rb",
-    "rb/data/IP2PROXY-LITE-PX1.BIN"
+    "rb/data/PX11.SAMPLE.BIN"
   ]
   if s.respond_to?(:metadata=)
@@ -50,25 +50,19 @@ 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<rdoc>, [">= 6.3.1"])
       s.add_development_dependency(%q<bundler>, [">= 1.2.0"])
-      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<rdoc>, [">= 6.3.1"])
       s.add_dependency(%q<bundler>, [">= 1.2.0"])
-      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<rdoc>, [">= 6.3.1"])
     s.add_dependency(%q<bundler>, [">= 1.2.0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end

data/lib/ip2proxy_ruby/i2p_database_config.rb CHANGED Viewed

@@ -1,27 +1,28 @@
-class I2pDbConfig
-  COLUMNS = {
-     :COUNTRY                  => [0, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3],
-     :REGION                   => [0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4],
-     :CITY                     => [0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5],
-     :ISP                      => [0, 0, 0, 0, 6, 6, 6, 6, 6, 6, 6],
-     :PROXYTYPE                => [0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2],
-     :DOMAIN                   => [0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7],
-     :USAGETYPE                => [0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8],
-     :ASN                      => [0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9],
-     :AS                       => [0, 0, 0, 0, 0, 0, 0, 10, 10, 10, 10],
-     :LASTSEEN                 => [0, 0, 0, 0, 0, 0, 0, 0, 11, 11, 11],
-     :THREAT                   => [0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 12]
-   }
- 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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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