geokit 1.7.1 → 1.8.0

data/test/test_maxmind_geocoder.rb

@@ -7,11 +7,42 @@ class MaxmindGeocoderTest < BaseGeocoderTest #:nodoc: all
     @ip = '118.210.47.142'
   end
 
-  def test_ip
-    VCR.use_cassette('maxmind_ip') do
+  def test_ip_from_autralia
+    location = mock()
+    city = mock()
+    ::GeoIP.stubs(:new).with(anything).returns(location)
+    location.expects(:city).with(@ip).returns(city)
+    city.stubs(:latitude).returns(-34.9287)
+    city.stubs(:longitude).returns(138.5986)
+    city.stubs(:city_name).returns('Adelaide')
+    city.stubs(:region_name).returns('Australia')
+    city.stubs(:postal_code).returns('')
+    city.stubs(:country_code2).returns('AU')
+
     res = Geokit::Geocoders::MaxmindGeocoder.geocode(@ip)
     assert_equal 'Adelaide', res.city
-    end
+    assert_equal 'AU', res.country_code
+    assert_equal true, res.success
+    assert res.city
+  end
+
+  def test_ip_from_south_america
+    location = mock()
+    city = mock()
+    ::GeoIP.stubs(:new).with(anything).returns(location)
+    location.expects(:city).with(@ip).returns(city)
+    city.stubs(:latitude).returns(-34)
+    city.stubs(:longitude).returns(-56)
+    city.stubs(:city_name).returns('Canelones')
+    city.stubs(:region_name).returns('')
+    city.stubs(:postal_code).returns('')
+    city.stubs(:country_code2).returns('UR')
+
+    res = Geokit::Geocoders::MaxmindGeocoder.geocode(@ip)
+    assert_equal 'Canelones', res.city
+    assert_equal 'UR', res.country_code
+    assert_equal true, res.success
+    assert res.city
   end
 
-end
+end

data/test/test_multi_geocoder.rb

@@ -79,7 +79,9 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_reverse_geocode_with_invalid_provider
     temp = Geokit::Geocoders::provider_order
     Geokit::Geocoders.provider_order = [:bogus]
-    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)
+    assert_raise NameError do
+      Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)
+    end
     Geokit::Geocoders.provider_order = temp
   end
 

data/test/test_ripe_geocoder.rb

@@ -0,0 +1,35 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+class RipeGeocoderTest < BaseGeocoderTest #:nodoc: all
+  def setup
+    super
+    @ip = '74.125.237.209'
+    @ip_au = '118.210.24.54'
+  end
+
+  def assert_url(expected_url)
+    assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+')
+  end
+
+  def test_ripe_geocode
+    VCR.use_cassette('ripe_geocode') do
+    url = "http://stat.ripe.net/data/geoloc/data.json?resource=#{@ip}"
+    res = Geokit::Geocoders::RipeGeocoder.geocode(@ip)
+    assert_url url
+    assert_equal res.city, 'Mountain View'
+    assert_equal res.state, 'CA'
+    assert_equal res.country_code, 'US'
+    end
+  end
+
+  def test_ripe_geocode_au
+    VCR.use_cassette('ripe_geocode_au') do
+    url = "http://stat.ripe.net/data/geoloc/data.json?resource=#{@ip_au}"
+    res = Geokit::Geocoders::RipeGeocoder.geocode(@ip_au)
+    assert_url url
+    assert_equal res.city, 'Adelaide'
+    assert_equal res.state, nil
+    assert_equal res.country_code, 'AU'
+    end
+  end
+end

data/test/test_yahoo_geocoder.rb

@@ -4,18 +4,6 @@ Geokit::Geocoders::yahoo_consumer_key = 'dj0yJmk9cXByQVN2WHZmTVhDJmQ9WVdrOVZscG1
 Geokit::Geocoders::yahoo_consumer_secret = 'SECRET'
 
 class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
-    YAHOO_FULL=<<-EOF.strip
-      {"ResultSet":{"version":"1.0","Error":0,"ErrorMessage":"No error","Locale":"us_US","Quality":87,"Found":1,"Results":[{"quality":87,"latitude":"37.792406","longitude":"-122.39411","offsetlat":"37.792332","offsetlon":"-122.394027","radius":500,"name":"","line1":"100 Spear St","line2":"San Francisco, CA  94105-1522","line3":"","line4":"United States","house":"100","street":"Spear St","xstreet":"","unittype":"","unit":"","postal":"94105-1522","neighborhood":"","city":"San Francisco","county":"San Francisco County","state":"California","country":"United States","countrycode":"US","statecode":"CA","countycode":"","uzip":"94105","hash":"0FA06819B5F53E75","woeid":12797156,"woetype":11}]}}
-    EOF
-
-    YAHOO_CITY=<<-EOF.strip
-      {"ResultSet":{"version":"1.0","Error":0,"ErrorMessage":"No error","Locale":"us_US","Quality":40,"Found":1,"Results":[{"quality":40,"latitude":"37.7742","longitude":"-122.417068","offsetlat":"37.7742","offsetlon":"-122.417068","radius":10700,"name":"","line1":"","line2":"San Francisco, CA","line3":"","line4":"United States","house":"","street":"","xstreet":"","unittype":"","unit":"","postal":"","neighborhood":"","city":"San Francisco","county":"San Francisco County","state":"California","country":"United States","countrycode":"US","statecode":"CA","countycode":"","uzip":"94102","hash":"","woeid":2487956,"woetype":7}]}}
-    EOF
-
-    YAHOO_NO_RESULTS=<<-EOF.strip
-      {"ResultSet":{"version":"1.0","Error":0,"ErrorMessage":"No error","Locale":"us_US","Quality":10,"Found":0}}
-    EOF
-
   def setup
     super
     @yahoo_full_hash = {:street_address=>"100 Spear St", :city=>"San Francisco", :state=>"CA", :zip=>"94105-1522", :country_code=>"US"}

metadata

@@ -1,139 +1,142 @@
 --- !ruby/object:Gem::Specification
 name: geokit
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
-- Michael Noack, James Cox, Andre Lewis & Bill Eisenhauer
+- Michael Noack
+- James Cox
+- Andre Lewis
+- Bill Eisenhauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: '1.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'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   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: rake
   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: mocha
   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: coveralls
   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: vcr
   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: webmock
   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: Geokit provides geocoding and distance calculation in an easy-to-use
@@ -149,50 +152,68 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- LICENSE
-- Manifest.txt
+- MIT-LICENSE
 - README.markdown
 - Rakefile
-- data/GeoLiteCity.dat
-- fixtures/vcr_cassettes/google3_city.yml
-- fixtures/vcr_cassettes/google3_country_code_biased_result.yml
-- fixtures/vcr_cassettes/google3_full.yml
-- fixtures/vcr_cassettes/google3_full_short.yml
-- fixtures/vcr_cassettes/google3_language_response_fr.yml
-- fixtures/vcr_cassettes/google3_multi.yml
-- fixtures/vcr_cassettes/google3_reverse_madrid.yml
+- fixtures/vcr_cassettes/bing_full.yml
+- fixtures/vcr_cassettes/bing_full_au.yml
+- fixtures/vcr_cassettes/bing_full_de.yml
+- fixtures/vcr_cassettes/fcc_reverse_geocode.yml
+- fixtures/vcr_cassettes/free_geo_ip_geocode.yml
+- fixtures/vcr_cassettes/geo_plugin_geocode.yml
+- fixtures/vcr_cassettes/geonames_geocode.yml
+- fixtures/vcr_cassettes/google_city.yml
+- fixtures/vcr_cassettes/google_country_code_biased_result.yml
+- fixtures/vcr_cassettes/google_full.yml
+- fixtures/vcr_cassettes/google_full_short.yml
+- fixtures/vcr_cassettes/google_language_response_fr.yml
+- fixtures/vcr_cassettes/google_multi.yml
+- fixtures/vcr_cassettes/google_reverse_madrid.yml
+- fixtures/vcr_cassettes/ripe_geocode.yml
+- fixtures/vcr_cassettes/ripe_geocode_au.yml
 - fixtures/vcr_cassettes/yahoo_city.yml
 - fixtures/vcr_cassettes/yahoo_full.yml
 - fixtures/vcr_cassettes/yahoo_no_results.yml
 - geokit.gemspec
 - lib/geokit.rb
+- lib/geokit/bounds.rb
+- lib/geokit/core_ext.rb
+- lib/geokit/geo_loc.rb
 - lib/geokit/geocoders.rb
+- lib/geokit/geocoders/base_ip.rb
+- lib/geokit/geocoders/bing.rb
+- lib/geokit/geocoders/ca_geocoder.rb
+- lib/geokit/geocoders/fcc.rb
+- lib/geokit/geocoders/free_geo_ip.rb
+- lib/geokit/geocoders/geo_plugin.rb
+- lib/geokit/geocoders/geonames.rb
+- lib/geokit/geocoders/google.rb
+- lib/geokit/geocoders/ip.rb
+- lib/geokit/geocoders/mapquest.rb
+- lib/geokit/geocoders/maxmind.rb
+- lib/geokit/geocoders/openstreetmap.rb
+- lib/geokit/geocoders/ripe.rb
+- lib/geokit/geocoders/us_geocoder.rb
+- lib/geokit/geocoders/yahoo.rb
+- lib/geokit/geocoders/yandex.rb
 - lib/geokit/inflectors.rb
+- lib/geokit/lat_lng.rb
 - lib/geokit/mappable.rb
 - lib/geokit/multi_geocoder.rb
-- lib/geokit/services/ca_geocoder.rb
-- lib/geokit/services/fcc.rb
-- lib/geokit/services/geo_plugin.rb
-- lib/geokit/services/geonames.rb
-- lib/geokit/services/google.rb
-- lib/geokit/services/google3.rb
-- lib/geokit/services/ip.rb
-- lib/geokit/services/maxmind.rb
-- lib/geokit/services/openstreetmap.rb
-- lib/geokit/services/ripe.rb
-- lib/geokit/services/us_geocoder.rb
-- lib/geokit/services/yahoo.rb
-- lib/geokit/services/yandex.rb
+- lib/geokit/polygon.rb
 - lib/geokit/version.rb
 - test/helper.rb
 - test/test_base_geocoder.rb
+- test/test_bing_geocoder.rb
 - test/test_bounds.rb
 - test/test_ca_geocoder.rb
+- test/test_fcc_geocoder.rb
+- test/test_free_geo_ip_geocoder.rb
+- test/test_geo_plugin_geocoder.rb
 - test/test_geoloc.rb
+- test/test_geonames_geocoder.rb
 - test/test_geoplugin_geocoder.rb
 - test/test_google_geocoder.rb
-- test/test_google_geocoder3.rb
-- test/test_google_reverse_geocoder.rb
 - test/test_inflector.rb
 - test/test_ipgeocoder.rb
 - test/test_latlng.rb
@@ -201,6 +222,7 @@ files:
 - test/test_multi_ip_geocoder.rb
 - test/test_openstreetmap_geocoder.rb
 - test/test_polygon_contains.rb
+- test/test_ripe_geocoder.rb
 - test/test_us_geocoder.rb
 - test/test_yahoo_geocoder.rb
 - test/test_yandex_geocoder.rb
@@ -216,30 +238,33 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
-summary: ! 'Geokit: encoding and distance calculation gem'
+summary: 'Geokit: encoding and distance calculation gem'
 test_files:
 - test/helper.rb
 - test/test_base_geocoder.rb
+- test/test_bing_geocoder.rb
 - test/test_bounds.rb
 - test/test_ca_geocoder.rb
+- test/test_fcc_geocoder.rb
+- test/test_free_geo_ip_geocoder.rb
+- test/test_geo_plugin_geocoder.rb
 - test/test_geoloc.rb
+- test/test_geonames_geocoder.rb
 - test/test_geoplugin_geocoder.rb
 - test/test_google_geocoder.rb
-- test/test_google_geocoder3.rb
-- test/test_google_reverse_geocoder.rb
 - test/test_inflector.rb
 - test/test_ipgeocoder.rb
 - test/test_latlng.rb
@@ -248,6 +273,7 @@ test_files:
 - test/test_multi_ip_geocoder.rb
 - test/test_openstreetmap_geocoder.rb
 - test/test_polygon_contains.rb
+- test/test_ripe_geocoder.rb
 - test/test_us_geocoder.rb
 - test/test_yahoo_geocoder.rb
 - test/test_yandex_geocoder.rb

data/LICENSE

@@ -1,25 +0,0 @@
-## LICENSE
-
-(The MIT License)
-
-Copyright (c) 2012+     James Cox
-Copyright (c) 2007-2011 Andre Lewis and Bill Eisenhauer
-
-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.