ipgeo 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 68c1cb1bc29d9f9a5b7eaccc7e217f510bfdc6ed
-  data.tar.gz: ec862a01b85fe8ed78cc7bb0feb53553aa465e4e
+SHA256:
+  metadata.gz: 563b1bbe0427862838716f371c4778c3976b894d3d1e80f3026153204edec44b
+  data.tar.gz: a75fb09520d13a10606e1eeffb0e818bb6c067c2295e1f43a5f6f19db6b94165
 SHA512:
-  metadata.gz: bbd08169a069583a9947e29bb8be568784354ec4e5cc689629c99aed8ade5eb9e54993d8ff3880943a1f8e88aaa188acb1bf7e148edd158987db4c5d9590cd96
-  data.tar.gz: c5bd2b7ac2d0f2f005a9fd5a792bf9a96c996e3d30b82d8032b6b7ab14593a6e64a1eed2fa5777216bf6001941418e4f2d82ebcfba6db290d03d7c7c020fa261
+  metadata.gz: 9ae15bc388188531d0fa92afbc93a83b20e6e4a362ca4658373c73683b58162bba8e3b142ad70fcfe891a488a426d16df4902d2bcac92414c94b353337da5672
+  data.tar.gz: c5a58bdd73b8b9eb775b3bae2bb4c31af38f21d1568ced84b0dfac9125ab0bf3477da71652d55a027e0090d472352404dc7ea1df29962ae552ccd9f8f7cacb7b

data/lib/ip_geo/client.rb

@@ -1,6 +1,7 @@
 require 'net/https'
 require 'json'
 require 'ip_geo/result'
+require 'timeout'
 
 module IPGeo
   class Client
@@ -11,15 +12,20 @@ module IPGeo
     end
 
     def lookup(ip)
-      Net::HTTP.start(@hostname, @options[:port] || (@options[:ssl] == false ? 80 : 443), :use_ssl => @options[:ssl] != false) do |http|
-        request = Net::HTTP::Get.new("/#{ip}")
-        response = http.request(request)
-        if response.is_a?(Net::HTTPOK)
-          Result.new(JSON.parse(response.body))
-        else
-          false
+      Timeout.timeout(@options[:timeout] || 2) do
+        Net::HTTP.start(@hostname, @options[:port] || (@options[:ssl] == false ? 80 : 443), :use_ssl => @options[:ssl] != false) do |http|
+          request = Net::HTTP::Get.new("/#{ip}")
+          response = http.request(request)
+          if response.is_a?(Net::HTTPOK)
+            Result.new(JSON.parse(response.body))
+          else
+            false
+          end
         end
       end
+    rescue Exception, Timeout::Error => e
+      STDERR.puts "Error during IP lookup of #{ip} with #{@hostname}: #{e.class} (#{e.message})"
+      false
     end
 
   end

data/lib/ip_geo/result.rb

@@ -1,6 +1,10 @@
 module IPGeo
   class Result
 
+    EU_COUNTRY_CODES = ["AT", "BE", "BG", "HR", "CY", "CZ", "DK", "EE", "FI",
+      "FR", "DE", "GB", "GR", "HU", "IE", "IT", "LV", "LT", "LU", "MT", "NL",
+      "PL", "PT", "RO", "SK", "SI", "ES", "SE"].freeze
+
     def initialize(hash)
       @hash = hash
     end
@@ -29,5 +33,9 @@ module IPGeo
       @hash['geoname_id']
     end
 
+    def eu?
+      EU_COUNTRY_CODES.include?(country)
+    end
+
   end
 end

data/lib/ipgeo.rb

@@ -0,0 +1 @@
+require 'ip_geo'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ipgeo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -34,6 +34,7 @@ files:
 - lib/ip_geo.rb
 - lib/ip_geo/client.rb
 - lib/ip_geo/result.rb
+- lib/ipgeo.rb
 homepage: https://github.com/adamcooke/ipgeo-ruby
 licenses:
 - MIT
@@ -54,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A client for communicating with an IPGeo server