geo_ip 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 50054c411a52ff7b1fe638e97720c28c4692f765
-  data.tar.gz: dfa433e0664d7eee413191f6f8982d71f819bb70
+SHA256:
+  metadata.gz: 1b657b45c91e3977b4d16e5f890e24c0acf9ce70cbcec8a29c72ab2c7ac7c0a1
+  data.tar.gz: 521cb290641b1011acb6d62364788f084569872803e94b475549c90b3851f38f
 SHA512:
-  metadata.gz: 4580ba6425fcaf90b3cc0c5fbbb7e6bda60ec19d43e8523cd7cc822455fccbecb3f1776aa2b945d37a67de7dd0cb0bba9d4932156948cbf4c14490d962050dd4
-  data.tar.gz: c56a070d072d073b20c73098247deda556bf90be1554c88f6c159a6c4b3cdcf3c2a57f9c0b2a80cbf0482d92a981cec43b5c1e040b38f2f8c741008bf29f7835
+  metadata.gz: 358758b68eee3a17a27082ec69242cf46a6e1760e6f6dd14e5f9d7b01b634e2b53ac0193351ee44b931de2ce060d7c4b6d8d9cb03a9a2933f1c80c63757c6252
+  data.tar.gz: 8b8f3e731d78609f6eb188b53a95e380d65a122bedb18214b797724ad30104ef126001d3d49dfa443a155ad6a52787ca95a1b03a2817918cd544f4ef70cf5502

data/CHANGES.md

@@ -1,3 +1,10 @@
+### 0.7.0 (2018-03-03)
+
+* Requires ruby >= 1.9.3 from the gemspec.
+* Adds ruby 2.4 and 2.5 to the Travis build matrix
+* Removes dependency on rest-client. By [elfenars](https://github.com/elfenars)
+* Updates test suite to RSpec 3.x. By [elfenars](https://github.com/elfenars)
+
 ### 0.6.2 (2016-02-10)
 
 * Removes explicit json (gem) dependency as it is bundled with all supported ruby versions.

data/lib/geo_ip.rb

@@ -1,5 +1,6 @@
 require 'json'
-require 'rest-client'
+require 'resolv'
+require 'net/http'
 
 class GeoIp
   class InvalidPrecissionError < ArgumentError; end
@@ -66,7 +67,7 @@ class GeoIp
     def geolocation(ip, options = {})
       location = nil
       Timeout.timeout(fallback_timeout) do
-        parsed_response = JSON.parse RestClient::Request.execute(method: :get, url: lookup_url(ip, options), timeout: timeout)
+        parsed_response = JSON.parse Net::HTTP.get(URI(lookup_url(ip, options)))
         location = convert_keys(parsed_response, options)
       end
 

data/spec/geo_ip_spec.rb

@@ -12,6 +12,7 @@ USE_WEBMOCK = true
 
 describe 'GeoIp' do
   before :all do
+    @ruby_19 = Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2')
     unless USE_WEBMOCK
       puts 'Running tests WITHOUT WebMock. You will need an internet connection. You may need to increase the GeoIp.fallback_timeout amount.'
       WebMock.disable!
@@ -19,9 +20,20 @@ describe 'GeoIp' do
   end
 
   def stub_geolocation(ip, options = {}, &_block)
+    headers = {
+                'Accept'          => '*/*',
+                'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+                'Host'            => 'api.ipinfodb.com',
+                'User-Agent'      => 'Ruby'
+              }
+    if @ruby_19
+      headers.delete('Accept-Encoding')
+      headers.delete('Host')
+    end
+
     if USE_WEBMOCK
       stub_request(:get, GeoIp.lookup_url(ip, options))
-        .with(headers: { 'Accept' => '*/*; q=0.5, application/xml', 'Accept-Encoding' => 'gzip, deflate' })
+        .with(headers: headers)
         .to_return(status: 200, body: yield, headers: {})
     end
   end
@@ -34,12 +46,12 @@ describe 'GeoIp' do
   context 'api_key' do
     it 'should return the API key when set' do
       GeoIp.api_key = 'my_api_key'
-      GeoIp.api_key.should == 'my_api_key'
+      expect(GeoIp.api_key).to eq('my_api_key')
     end
 
     it 'should throw an error when API key is not set' do
       GeoIp.api_key = nil
-      -> { GeoIp.geolocation(IP_GOOGLE_US) }.should raise_error
+      expect { GeoIp.geolocation(IP_GOOGLE_US) }.to raise_error(GeoIp::ApiKeyError)
     end
   end
 
@@ -62,9 +74,9 @@ describe 'GeoIp' do
       end
 
       geolocation = GeoIp.geolocation(IP_GOOGLE_US)
-      geolocation[:country_code].should == 'US'
-      geolocation[:country_name].should == 'UNITED STATES'
-      geolocation[:city].should == 'MONTEREY PARK'
+      expect(geolocation[:country_code]).to eq('US')
+      expect(geolocation[:country_name]).to eq('UNITED STATES')
+      expect(geolocation[:city]).to eq('MONTEREY PARK')
     end
 
     it 'should return nothing city for a private ip address' do
@@ -85,9 +97,9 @@ describe 'GeoIp' do
       end
 
       geolocation = GeoIp.geolocation(IP_PRIVATE)
-      geolocation[:country_code].should == '-'
-      geolocation[:country_name].should == '-'
-      geolocation[:city].should == '-'
+      expect(geolocation[:country_code]).to eq('-')
+      expect(geolocation[:country_name]).to eq('-')
+      expect(geolocation[:city]).to eq('-')
     end
 
     it 'should return nothing for localhost ip address' do
@@ -108,9 +120,9 @@ describe 'GeoIp' do
       end
 
       geolocation = GeoIp.geolocation(IP_LOCAL)
-      geolocation[:country_code].should == '-'
-      geolocation[:country_name].should == '-'
-      geolocation[:city].should == '-'
+      expect(geolocation[:country_code]).to eq('-')
+      expect(geolocation[:country_name]).to eq('-')
+      expect(geolocation[:city]).to eq('-')
     end
 
     it 'should return the correct city for a public ip address when explicitly requiring it' do
@@ -131,9 +143,9 @@ describe 'GeoIp' do
       end
 
       geolocation = GeoIp.geolocation(IP_GOOGLE_US, precision: :city)
-      geolocation[:country_code].should == 'US'
-      geolocation[:country_name].should == 'UNITED STATES'
-      geolocation[:city].should == 'MONTEREY PARK'
+      expect(geolocation[:country_code]).to eq('US')
+      expect(geolocation[:country_name]).to eq('UNITED STATES')
+      expect(geolocation[:city]).to eq('MONTEREY PARK')
     end
   end
 
@@ -149,8 +161,8 @@ describe 'GeoIp' do
         })
       end
       geolocation = GeoIp.geolocation(IP_GOOGLE_US, precision: :country)
-      geolocation[:country_code].should == 'US'
-      geolocation[:country_name].should == 'UNITED STATES'
+      expect(geolocation[:country_code]).to eq('US')
+      expect(geolocation[:country_name]).to eq('UNITED STATES')
     end
 
     it 'should return nothing country for a private ip address' do
@@ -164,8 +176,8 @@ describe 'GeoIp' do
         })
       end
       geolocation = GeoIp.geolocation(IP_PRIVATE, precision: :country)
-      geolocation[:country_code].should == '-'
-      geolocation[:country_name].should == '-'
+      expect(geolocation[:country_code]).to eq('-')
+      expect(geolocation[:country_name]).to eq('-')
     end
 
     it 'should return nothing country for localhost ip address' do
@@ -179,8 +191,8 @@ describe 'GeoIp' do
         })
       end
       geolocation = GeoIp.geolocation(IP_LOCAL, precision: :country)
-      geolocation[:country_code].should == '-'
-      geolocation[:country_name].should == '-'
+      expect(geolocation[:country_code]).to eq('-')
+      expect(geolocation[:country_name]).to eq('-')
     end
 
     it 'should not return the city for a public ip address' do
@@ -194,9 +206,9 @@ describe 'GeoIp' do
         })
       end
       geolocation = GeoIp.geolocation(IP_GOOGLE_US, precision: :country)
-      geolocation[:country_code].should == 'US'
-      geolocation[:country_name].should == 'UNITED STATES'
-      geolocation[:city].should be_nil
+      expect(geolocation[:country_code]).to eq('US')
+      expect(geolocation[:country_name]).to eq('UNITED STATES')
+      expect(geolocation[:city]).to eq(nil)
     end
   end
 
@@ -218,7 +230,7 @@ describe 'GeoIp' do
         })
       end
       geolocation = GeoIp.geolocation(IP_GOOGLE_US, timezone: true)
-      geolocation[:timezone].should == '-08:00' # This one is likely to break when dst changes.
+      expect(geolocation[:timezone]).to eq('-08:00') # This one is likely to break when dst changes.
     end
 
     it 'should not return the timezone information when explicitly not requesting it' do
@@ -238,7 +250,7 @@ describe 'GeoIp' do
         })
       end
       geolocation = GeoIp.geolocation(IP_GOOGLE_US, timezone: false)
-      geolocation[:timezone].should be_nil
+      expect(geolocation[:timezone]).to eq(nil)
     end
 
     it 'should not return the timezone information when not requesting it' do
@@ -258,7 +270,7 @@ describe 'GeoIp' do
         })
       end
       geolocation = GeoIp.geolocation(IP_GOOGLE_US)
-      geolocation[:timezone].should be_nil
+      expect(geolocation[:timezone]).to eq(nil)
     end
 
     it 'should not return the timezone information when country precision is selected' do
@@ -278,26 +290,26 @@ describe 'GeoIp' do
         })
       end
       geolocation = GeoIp.geolocation(IP_GOOGLE_US, precision: :country, timezone: true)
-      geolocation[:timezone].should be_nil
+      expect(geolocation[:timezone]).to eq(nil)
     end
   end
 
   context 'timeout' do
     it 'should trigger timeout when the request is taking too long' do
       stub_request(:get, GeoIp.lookup_url(IP_GOOGLE_US)).to_timeout
-      -> { GeoIp.geolocation(IP_GOOGLE_US) }.should raise_exception('Request Timeout')
+      expect { GeoIp.geolocation(IP_GOOGLE_US) }.to raise_error(Timeout::Error)
     end
 
-    it 'should trigger fallback timeout when RestClient is taking too long to send the request', focus: true do
+    it 'should trigger fallback timeout when Net::HTTP is taking too long to send the request', focus: true do
       GeoIp.fallback_timeout = 1
-      RestClient::Request.stub(:execute) { sleep 2 }
-      -> { GeoIp.geolocation(IP_GOOGLE_US) }.should raise_exception(Timeout::Error)
+      allow(Net::HTTP).to receive(:get) { sleep 2 }
+      expect { GeoIp.geolocation(IP_GOOGLE_US) }.to raise_error(Timeout::Error)
     end
   end
 
   context 'ip' do
     it 'should trigger invalid ip when invalid IPv4 address is provided' do
-      RestClient::Request.stub(:execute) do
+      allow(Net::HTTP).to receive(:get) do
         %({
           "statusCode" : "OK",
           "statusMessage" : "",
@@ -312,11 +324,11 @@ describe 'GeoIp' do
           "timeZone" : "-08:00"
         })
       end
-      -> { GeoIp.geolocation(IPV4_INVALID) }.should raise_error(GeoIp::InvalidIpError)
+      expect { GeoIp.geolocation(IPV4_INVALID) }.to raise_error(GeoIp::InvalidIpError)
     end
 
     it 'should not trigger invalid ip when valid IPv4 address is provided' do
-      RestClient::Request.stub(:execute) do
+      allow(Net::HTTP).to receive(:get) do
         %({
           "statusCode" : "OK",
           "statusMessage" : "",
@@ -331,11 +343,11 @@ describe 'GeoIp' do
           "timeZone" : "-08:00"
         })
       end
-      -> { GeoIp.geolocation(IP_GOOGLE_US) }.should_not raise_error(GeoIp::InvalidIpError)
+      expect { GeoIp.geolocation(IP_GOOGLE_US) }.not_to raise_error
     end
 
     it 'should trigger invalid ip when invalid IPv6 address is provided' do
-      RestClient::Request.stub(:execute) do
+      allow(Net::HTTP).to receive(:get) do
         %({
           "statusCode" : "OK",
           "statusMessage" : "",
@@ -350,11 +362,11 @@ describe 'GeoIp' do
           "timeZone" : "-08:00"
         })
       end
-      -> { GeoIp.geolocation(IPV6_INVALID) }.should raise_error(GeoIp::InvalidIpError)
+      expect { GeoIp.geolocation(IPV6_INVALID) }.to raise_error(GeoIp::InvalidIpError)
     end
 
     it 'should not trigger invalid ip when valid IPv6 address is provided' do
-      RestClient::Request.stub(:execute) do
+      allow(Net::HTTP).to receive(:get) do
         %({
           "statusCode" : "OK",
           "statusMessage" : "",
@@ -369,7 +381,7 @@ describe 'GeoIp' do
           "timeZone" : "-08:00"
         })
       end
-      -> { GeoIp.geolocation(IPV6) }.should_not raise_error(GeoIp::InvalidIpError)
+      expect { GeoIp.geolocation(IPV6) }.not_to raise_error
     end
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: geo_ip
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Jeroen Jacobs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2018-03-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.10
+        version: 2.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.10
+        version: 2.3.2
 description: A call to the ipinfodb.com will be done to retreive the geolocation based
   on the IP address. No need to include a database file in the application.
 email: gems@jeroenj.be
@@ -93,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -101,14 +87,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Retreive the geolocation of an IP address based on the ipinfodb.com webservice
 test_files:
 - spec/api.yml
+- spec/spec_helper.rb
+- spec/spec.opts
 - spec/api.yml.example
 - spec/geo_ip_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-has_rdoc: