geokit 1.8.4 → 1.8.5

data/test/test_latlng.rb

@@ -216,4 +216,22 @@ class LatLngTest < Test::Unit::TestCase #:nodoc: all
     assert_equal "Porscheplatz 1, 45127 Essen, Deutschland", res.full_address #slightly different from yahoo
     assert_equal "google", res.provider
   end
+
+  def test_to_dms
+    point = Geokit::LatLng.new(41.957254, -87.660333)
+
+    dms = point.lat_dms
+    assert_kind_of Array, dms
+    assert_equal 3, dms.length
+    assert_kind_of Numeric, dms.length
+    assert_equal [41, 57], dms[0, 2]
+    assert_equal 26, dms[2].round
+
+    dms = point.lng_dms
+    assert_kind_of Array, dms
+    assert_equal 3, dms.length
+    assert_kind_of Numeric, dms.length
+    assert_equal [-87, 39], dms[0, 2]
+    assert_equal 37, dms[2].round
+  end
 end

data/test/test_map_quest.rb

@@ -0,0 +1,56 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+class MapQuestGeocoderTest < BaseGeocoderTest #:nodoc: all
+
+  def setup
+    super
+    @full_address = '100 Spear St Apt. 5, San Francisco, CA, 94105-1522, US'
+    @google_full_hash = {:street_address=>"100 Spear St Apt. 5", :city=>"San Francisco", :state=>"CA", :zip=>"94105", :country_code=>"US"}
+    @google_city_hash = {:city=>"San Francisco", :state=>"CA"}
+
+    @google_full_loc = Geokit::GeoLoc.new(@google_full_hash)
+    @google_city_loc = Geokit::GeoLoc.new(@google_city_hash)
+  end
+
+
+  def test_map_quest_full_address_with_geo_loc
+    VCR.use_cassette('map_quest_full') do
+    key = 'Fmjtd%7Cluur2d0125%2C2s%3Do5-9a8lhz'
+    Geokit::Geocoders::MapQuestGeocoder.key =key
+    url = "https://www.mapquestapi.com/geocoding/v1/address?key=#{key}&location=100+Spear+St+Apt.+5%2C+San+Francisco%2C+CA%2C+94105%2C+US"
+    TestHelper.expects(:last_url).with(url)
+    res=Geokit::Geocoders::MapQuestGeocoder.geocode(@google_full_loc)
+    assert_equal "CA", res.state
+    assert_equal "San Francisco", res.city
+    assert_array_in_delta [37.7921509, -122.394], res.to_a # slightly dif from yahoo
+    assert res.is_us?
+    assert_equal "100 Spear St, Apt 5, San Francisco, CA, 94105-1500, US", res.full_address #slightly different from yahoo
+    assert_equal "map_quest", res.provider
+    end
+  end
+
+
+  def test_reverse_geocode
+    VCR.use_cassette('map_quest_reverse_madrid') do
+    madrid = Geokit::GeoLoc.new
+    madrid.lat, madrid.lng = "40.4167413", "-3.7032498"
+    key = 'Fmjtd%7Cluur2d0125%2C2s%3Do5-9a8lhz'
+    Geokit::Geocoders::MapQuestGeocoder.key =key
+    url = "https://www.mapquestapi.com/geocoding/v1/reverse?key=#{key}&location=#{madrid.lat},#{madrid.lng}"
+    TestHelper.expects(:last_url).with(url)
+    res=Geokit::Geocoders::MapQuestGeocoder.do_reverse_geocode(madrid.ll)
+
+    assert_equal madrid.lat.to_s.slice(1..5), res.lat.to_s.slice(1..5)
+    assert_equal madrid.lng.to_s.slice(1..5), res.lng.to_s.slice(1..5)
+    assert_equal "ES", res.country_code
+    assert_equal "map_quest", res.provider
+
+    assert_equal "Madrid", res.city
+    assert_equal "Comunidad de Madrid", res.state
+
+    assert_equal nil, res.country
+    assert_equal "28014", res.zip
+    assert_equal true, res.success
+    end
+  end
+end

data/test/test_multi_geocoder.rb

@@ -92,4 +92,11 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal @failure, Geokit::Geocoders::MultiGeocoder.reverse_geocode("")
     Geokit::Geocoders.provider_order = t1 # reset to orig values
   end
+
+  def test_custom_provider_order
+    Geokit::Geocoders::YahooGeocoder.expects(:geocode).with(@address, {}).returns(@success)
+    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).never
+    Geokit::Geocoders::UsGeocoder.expects(:geocode).never
+    assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address, :provider_order => [:yahoo, :google, :us])
+  end
 end

data/test/test_ripe_geocoder.rb

@@ -11,25 +11,32 @@ class RipeGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+')
   end
 
+  def test_45
+    VCR.use_cassette('ripe_geocode_45') do
+      res = Geokit::Geocoders::RipeGeocoder.geocode('45.45.45.45')
+      assert !res.success
+    end
+  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'
+      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'
+      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

@@ -19,7 +19,7 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
   # the testing methods themselves
   def test_yahoo_full_address
     VCR.use_cassette('yahoo_full') do
-    url = "http://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@full_address)}"
+    url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@full_address)}"
     do_full_address_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@full_address))
     assert_yahoo_url url
     end
@@ -27,7 +27,7 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_yahoo_full_address_accuracy
     VCR.use_cassette('yahoo_full') do
-    url = "http://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@full_address)}"
+    url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@full_address)}"
     res = Geokit::Geocoders::YahooGeocoder.geocode(@full_address)
     assert_yahoo_url url
     assert_equal 8, res.accuracy
@@ -36,7 +36,7 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_yahoo_full_address_with_geo_loc
     VCR.use_cassette('yahoo_full') do
-    url = "http://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@full_address)}"
+    url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@full_address)}"
     do_full_address_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@yahoo_full_loc))
     assert_yahoo_url url
     end
@@ -44,7 +44,7 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_yahoo_city
     VCR.use_cassette('yahoo_city') do
-    url = "http://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@address)}"
+    url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@address)}"
     do_city_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@address))
     assert_yahoo_url url
     end
@@ -52,7 +52,7 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_yahoo_city_accuracy
     VCR.use_cassette('yahoo_city') do
-    url = "http://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@address)}"
+    url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@address)}"
     res = Geokit::Geocoders::YahooGeocoder.geocode(@address)
     assert_yahoo_url url
     assert_equal 4, res.accuracy
@@ -61,7 +61,7 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_yahoo_city_with_geo_loc
     VCR.use_cassette('yahoo_city') do
-    url = "http://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@address)}"
+    url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@address)}"
     do_city_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@yahoo_city_loc))
     assert_yahoo_url url
     end
@@ -73,7 +73,7 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
     no_results_full_loc = Geokit::GeoLoc.new(no_results_full_hash)
 
     VCR.use_cassette('yahoo_no_results') do
-    url = "http://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(no_results_address)}"
+    url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(no_results_address)}"
     result = Geokit::Geocoders::YahooGeocoder.geocode(no_results_address)
     assert_yahoo_url url
     assert_equal ",", result.ll

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geokit
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -190,12 +190,14 @@ files:
 - MIT-LICENSE
 - README.markdown
 - Rakefile
+- fixtures/vcr_cassettes/bing_au.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/geocodio_geocode.yml
 - fixtures/vcr_cassettes/geonames_geocode.yml
 - fixtures/vcr_cassettes/google_city.yml
 - fixtures/vcr_cassettes/google_country_code_biased_result.yml
@@ -205,7 +207,10 @@ files:
 - fixtures/vcr_cassettes/google_multi.yml
 - fixtures/vcr_cassettes/google_reverse_madrid.yml
 - fixtures/vcr_cassettes/google_reverse_madrid_es.yml
+- fixtures/vcr_cassettes/map_quest_full.yml
+- fixtures/vcr_cassettes/map_quest_reverse_madrid.yml
 - fixtures/vcr_cassettes/ripe_geocode.yml
+- fixtures/vcr_cassettes/ripe_geocode_45.yml
 - fixtures/vcr_cassettes/ripe_geocode_au.yml
 - fixtures/vcr_cassettes/yahoo_city.yml
 - fixtures/vcr_cassettes/yahoo_full.yml
@@ -222,6 +227,7 @@ files:
 - lib/geokit/geocoders/fcc.rb
 - lib/geokit/geocoders/free_geo_ip.rb
 - lib/geokit/geocoders/geo_plugin.rb
+- lib/geokit/geocoders/geocodio.rb
 - lib/geokit/geocoders/geonames.rb
 - lib/geokit/geocoders/google.rb
 - lib/geokit/geocoders/ip.rb
@@ -248,12 +254,14 @@ files:
 - test/test_fcc_geocoder.rb
 - test/test_free_geo_ip_geocoder.rb
 - test/test_geo_plugin_geocoder.rb
+- test/test_geocodio_geocoder.rb
 - test/test_geoloc.rb
 - test/test_geonames_geocoder.rb
 - test/test_google_geocoder.rb
 - test/test_inflector.rb
 - test/test_ipgeocoder.rb
 - test/test_latlng.rb
+- test/test_map_quest.rb
 - test/test_mappable.rb
 - test/test_maxmind_geocoder.rb
 - test/test_multi_geocoder.rb
@@ -280,18 +288,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1117828600571501675
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1117828600571501675
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -307,12 +309,14 @@ test_files:
 - test/test_fcc_geocoder.rb
 - test/test_free_geo_ip_geocoder.rb
 - test/test_geo_plugin_geocoder.rb
+- test/test_geocodio_geocoder.rb
 - test/test_geoloc.rb
 - test/test_geonames_geocoder.rb
 - test/test_google_geocoder.rb
 - test/test_inflector.rb
 - test/test_ipgeocoder.rb
 - test/test_latlng.rb
+- test/test_map_quest.rb
 - test/test_mappable.rb
 - test/test_maxmind_geocoder.rb
 - test/test_multi_geocoder.rb