ip2location_ruby 8.2.0 → 8.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d40ddb96c3b68fc1ff4d851a0389f715e09c41c3b185d8936558686fa39ce2a4
-  data.tar.gz: 1b0d493cddb9e69b692be6f3a84b4e178d1ad16a1c63641732638b6134cf51e1
+  metadata.gz: 87b2d8b319cb9e62e4d99875d0f01dc5043d9f3bbc7556488efcb9b7091d656e
+  data.tar.gz: b3166341ec4b79588c683611ca24b5019052258f2fab60a8d74029de52d6f5c0
 SHA512:
-  metadata.gz: c21ffd658ec663cc61c726a77a907e56bb69114ac1a016ccea7568ccf0b6faa180a4efade585009dbed2c526880fddef1dce724f1e724f0592ec1b52174ae287
-  data.tar.gz: 6337c61e5594a6e48bc2b2541afe9d0f944eeeabd6200091ac6f3b0459d60e31f216ac4ca5aaa51e5bc3c890eb17b1fd28fbdadce4d7b46c6308faa117a621de
+  metadata.gz: 888a244c319e9fb212cd0c1343261035e37c03e24bfe27e71940cf6673b8525661ac7e577159585f3abe78a2a566d10499826232cd6e960634b8dce8d64bc4ab
+  data.tar.gz: ef010901688b3d4da4fc161ad0a162f109bf0323f382542b2d7ab4afc4e522185b08d6fd1da93d51fef5f37631c9a74c2e9a56b0156b7651d489f8599eeea144

data/README.md

@@ -19,7 +19,6 @@ Below is the description of the functions available in the **BIN Database** look
 |---|---|
 | open | Open the IP2Location BIN data for lookup. |
 | close | Close and clean up the file pointer. |
-| close | Close and clean up the file pointer. |
 | get_all | Return the geolocation information in array. |
 | get_country_short | Return the ISO3166-1 country code (2-digits) of the IP address. |
 | get_country_long  | Return the ISO3166-1 country name of the IP address. |
@@ -48,7 +47,7 @@ Below is the description of the functions available in the **Web Service** looku
 
 | Function Name | Description |
 |---|---|
-| Constructor | Expect 2 input parameters:<ol><li>IP2Location API Key.</li><li>Package (WS1 - WS24)</li></ol> |
+| Constructor | Expect 3 input parameters:<ol><li>IP2Location API Key.</li><li>Package (WS1 - WS24)</li></li><li>Use HTTPS or HTTP</li></ol> |
 | lookup | Return the IP information in array.<ul><li>country_code</li><li>country_name</li><li>region_name</li><li>city_name</li><li>latitude</li><li>longitude</li><li>zip_code</li><li>time_zone</li><li>isp</li><li>domain</li><li>net_speed</li><li>idd_code</li><li>area_code</li><li>weather_station_code</li><li>weather_station_name</li><li>mcc</li><li>mnc</li><li>mobile_brand</li><li>elevation</li><li>usage_type</li><li>continent<ul><li>name</li><li>code</li><li>hemisphere</li><li>translations</li></ul></li><li>country<ul><li>name</li><li>alpha3_code</li><li>numeric_code</li><li>demonym</li><li>flag</li><li>capital</li><li>total_area</li><li>population</li><li>currency<ul><li>code</li><li>name</li><li>symbol</li></ul></li><li>language<ul><li>code</li><li>name</li></ul></li><li>idd_code</li><li>tld</li><li>translations</li></ul></li><li>region<ul><li>name</li><li>code</li><li>translations</li></ul></li><li>city<ul><li>name</li><li>translations</li></ul></li><li>geotargeting<ul><li>metro</li></ul></li><li>country_groupings</li><li>time_zone_info<ul><li>olson</li><li>current_time</li><li>gmt_offset</li><li>is_dst</li><li>sunrise</li><li>sunset</li></ul></li><ul> |
 | get_credit | Return remaining credit of the web service account. |
 

data/VERSION

@@ -1 +1 @@
-8.2.0
+8.2.1

data/example.rb

@@ -34,7 +34,7 @@ print 'Usage Type: ' + record['usagetype'] + "\n"
 i2l.close()
 
 # Web Service
-ws = Ip2locationWebService.new('demo', 'WS24')
+ws = Ip2locationWebService.new('demo', 'WS24', true)
 record = ws.lookup('8.8.8.8', 'continent,country,region,city,geotargeting,country_groupings,time_zone_info', 'en')
 print record
 print "\n"

data/ip2location_ruby.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ip2location_ruby"
-  s.version = "8.2.0"
+  s.version = "8.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/ip2location_ruby.rb

@@ -540,21 +540,29 @@ class Ip2location
 end
 
 class Ip2locationWebService
-  attr_accessor :ws_api_key, :ws_package
+  attr_accessor :ws_api_key, :ws_package, :ws_use_ssl
 
-  def initialize(api_key, package)
+  def initialize(api_key, package, use_ssl)
     if !api_key.match(/^[0-9A-Z]{10}$/) && api_key != 'demo'
       raise Exception.new "Please provide a valid IP2Location web service API key."
     end
     if !package.match(/^WS[0-9]+$/)
       package = 'WS1'
     end
+    if use_ssl == ''
+      use_ssl = true
+    end
     self.ws_api_key = api_key
     self.ws_package = package
+    self.ws_use_ssl = use_ssl
   end
 
   def lookup(ip, add_ons, language)
-    response =  Net::HTTP.get(URI("https://api.ip2location.com/v2/?key=" + self.ws_api_key + "&ip=" + ip + "&package=" + self.ws_package + "&format=json&addon=" + add_ons + "&lang=" + language))
+    if self.ws_use_ssl
+      response =  Net::HTTP.get(URI("https://api.ip2location.com/v2/?key=" + self.ws_api_key + "&ip=" + ip + "&package=" + self.ws_package + "&format=json&addon=" + add_ons + "&lang=" + language))
+    else
+      response =  Net::HTTP.get(URI("http://api.ip2location.com/v2/?key=" + self.ws_api_key + "&ip=" + ip + "&package=" + self.ws_package + "&format=json&addon=" + add_ons + "&lang=" + language))
+    end
     parsed_response = JSON.parse(response)
     if parsed_response.nil?
       return false
@@ -566,7 +574,11 @@ class Ip2locationWebService
   end
 
   def get_credit()
-    response =  Net::HTTP.get(URI("https://api.ip2location.com/v2/?key=" + self.ws_api_key + "&check=true"))
+    if self.ws_use_ssl
+      response =  Net::HTTP.get(URI("https://api.ip2location.com/v2/?key=" + self.ws_api_key + "&check=true"))
+    else
+      response =  Net::HTTP.get(URI("http://api.ip2location.com/v2/?key=" + self.ws_api_key + "&check=true"))
+    end
     parsed_response = JSON.parse(response)
     if parsed_response.nil?
       return 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ip2location_ruby
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 8.2.1
 platform: ruby
 authors:
 - ip2location
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata