geocoder 1.1.6 → 1.1.7

data/test/result_test.rb

@@ -12,6 +12,15 @@ class ResultTest < Test::Unit::TestCase
     end
   end
 
+  def test_yandex_result_without_city_does_not_raise_exception
+    assert_nothing_raised do
+      Geocoder.configure(:lookup => :yandex)
+      set_api_key!(:yandex)
+      result = Geocoder.search("no city and town").first
+      assert_equal "", result.city
+    end
+  end
+
 
   private # ------------------------------------------------------------------
 

data/test/services_test.rb

@@ -17,6 +17,12 @@ class ServicesTest < Test::Unit::TestCase
       result.address_components_of_type(:route).first['long_name']
   end
 
+  def test_google_result_components_contains_street_number
+    result = Geocoder.search("Madison Square Garden, New York, NY").first
+    assert_equal "4",
+      result.address_components_of_type(:street_number).first['long_name']
+  end
+
   def test_google_returns_city_when_no_locality_in_result
     result = Geocoder.search("no locality").first
     assert_equal "Haram", result.city
@@ -27,6 +33,11 @@ class ServicesTest < Test::Unit::TestCase
     assert_equal nil, result.city
   end
 
+  def test_google_street_address_returns_formatted_street_address
+    result = Geocoder.search("Madison Square Garden, New York, NY").first
+    assert_equal "4 Penn Plaza", result.street_address
+  end
+
   def test_google_precision
     result = Geocoder.search("Madison Square Garden, New York, NY").first
     assert_equal "ROOFTOP",
@@ -160,27 +171,27 @@ class ServicesTest < Test::Unit::TestCase
   end
 
   def test_maxmind_result_knows_country_service_name
-    Geocoder.configure(:ip_lookup => :maxmind)
+    Geocoder.configure(:ip_lookup => :maxmind, :maxmind => {:service => :country})
     assert_equal :country, Geocoder.search("24.24.24.21").first.service_name
   end
 
   def test_maxmind_result_knows_city_service_name
-    Geocoder.configure(:ip_lookup => :maxmind)
+    Geocoder.configure(:ip_lookup => :maxmind, :maxmind => {:service => :city})
     assert_equal :city, Geocoder.search("24.24.24.22").first.service_name
   end
 
   def test_maxmind_result_knows_city_isp_org_service_name
-    Geocoder.configure(:ip_lookup => :maxmind)
+    Geocoder.configure(:ip_lookup => :maxmind, :maxmind => {:service => :city_isp_org})
     assert_equal :city_isp_org, Geocoder.search("24.24.24.23").first.service_name
   end
 
   def test_maxmind_result_knows_omni_service_name
-    Geocoder.configure(:ip_lookup => :maxmind)
+    Geocoder.configure(:ip_lookup => :maxmind, :maxmind => {:service => :omni})
     assert_equal :omni, Geocoder.search("24.24.24.24").first.service_name
   end
 
   def test_maxmind_special_result_components
-    Geocoder.configure(:ip_lookup => :maxmind)
+    Geocoder.configure(:ip_lookup => :maxmind, :maxmind => {:service => :omni})
     result = Geocoder.search("24.24.24.24").first
     assert_equal "Road Runner", result.isp_name
     assert_equal "Cable/DSL", result.netspeed
@@ -263,4 +274,47 @@ class ServicesTest < Test::Unit::TestCase
     assert_equal "46 West 31st Street, New York, NY, 10001, US",
       result.address
   end
+
+  # --- Esri ---
+
+  def test_esri_query_for_geocode
+    query = Geocoder::Query.new("Bluffton, SC")
+    lookup = Geocoder::Lookup.get(:esri)
+    res = lookup.query_url(query)
+    assert_equal "http://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/find?f=pjson&outFields=%2A&text=Bluffton%2C+SC",
+      res
+  end
+
+  def test_esri_query_for_reverse_geocode
+    query = Geocoder::Query.new([45.423733, -75.676333])
+    lookup = Geocoder::Lookup.get(:esri)
+    res = lookup.query_url(query)
+    assert_equal "http://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/reverseGeocode?location=-75.676333%2C45.423733&outFields=%2A&p=pjson",
+      res
+  end
+
+  def test_esri_results_component
+    Geocoder.configure(:lookup => :esri)
+    result = Geocoder.search("Madison Square Garden, New York, NY").first
+    assert_equal "10001", result.postal_code
+    assert_equal "USA", result.country
+    assert_equal "Madison Square Garden", result.address
+    assert_equal "New York", result.city
+    assert_equal "New York", result.state
+    assert_equal 40.75004981300049, result.coordinates[0]
+    assert_equal -73.99423889799965, result.coordinates[1]
+  end
+  
+  def test_esri_results_component_when_reverse_geocoding
+    Geocoder.configure(:lookup => :esri)
+    result = Geocoder.search([45.423733, -75.676333]).first
+    assert_equal "75007", result.postal_code
+    assert_equal "FRA", result.country
+    assert_equal "4 Avenue Gustave Eiffel", result.address
+    assert_equal "Paris", result.city
+    assert_equal "Île-de-France", result.state
+    assert_equal 48.858129997357558, result.coordinates[0]
+    assert_equal 2.2956200048981574, result.coordinates[1]
+  end
+
 end

data/test/test_helper.rb

@@ -239,7 +239,7 @@ end
 class Test::Unit::TestCase
 
   def setup
-    Geocoder.configure(:maxmind => {:service => :omni})
+    Geocoder.configure(:maxmind => {:service => :city_isp_org})
   end
 
   def teardown

data/test/test_mode_test.rb

@@ -13,8 +13,39 @@ class TestModeTest < Test::Unit::TestCase
   end
 
   def test_search_with_known_stub
+    Geocoder::Lookup::Test.add_stub("New York, NY", [mock_attributes])
+
+    results = Geocoder.search("New York, NY")
+    result = results.first
+
+    assert_equal 1, results.size
+    mock_attributes.keys.each do |attr|
+      assert_equal mock_attributes[attr], result.send(attr)
+    end
+  end
+
+  def test_search_with_unknown_stub_without_default
+    assert_raise ArgumentError do
+      Geocoder.search("New York, NY")
+    end
+  end
+
+  def test_search_with_unknown_stub_with_default
+    Geocoder::Lookup::Test.set_default_stub([mock_attributes])
+
+    results = Geocoder.search("Atlantis, OC")
+    result = results.first
+
+    assert_equal 1, results.size
+    mock_attributes.keys.each do |attr|
+      assert_equal mock_attributes[attr], result.send(attr)
+    end
+  end
+
+  private
+  def mock_attributes
     coordinates = [40.7143528, -74.0059731]
-    attributes = {
+    @mock_attributes ||= {
       'coordinates'  => coordinates,
       'latitude'     => coordinates[0],
       'longitude'    => coordinates[1],
@@ -24,27 +55,5 @@ class TestModeTest < Test::Unit::TestCase
       'country'      => 'United States',
       'country_code' => 'US',
     }
-
-    Geocoder::Lookup::Test.add_stub("New York, NY", [attributes])
-
-    results = Geocoder.search("New York, NY")
-    assert_equal 1, results.size
-
-    result = results.first
-    assert_equal coordinates,                result.coordinates
-    assert_equal attributes['latitude'],     result.latitude
-    assert_equal attributes['longitude'],    result.longitude
-    assert_equal attributes['address'],      result.address
-    assert_equal attributes['state'],        result.state
-    assert_equal attributes['state_code'],   result.state_code
-    assert_equal attributes['country'],      result.country
-    assert_equal attributes['country_code'], result.country_code
-  end
-
-  def test_search_with_unknown_stub
-    assert_raise ArgumentError do
-      Geocoder.search("New York, NY")
-    end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies: []
 description: Provides object geocoding (by street or IP address), reverse geocoding
   (coordinates to street address), distance queries for ActiveRecord and Mongoid,
@@ -29,7 +29,8 @@ files:
 - README.md
 - Rakefile
 - bin/geocode
-- examples/autoexpire_cache.rb
+- examples/autoexpire_cache_dalli.rb
+- examples/autoexpire_cache_redis.rb
 - gemfiles/Gemfile.mongoid-2.4.x
 - lib/generators/geocoder/config/config_generator.rb
 - lib/generators/geocoder/config/templates/initializer.rb
@@ -43,6 +44,7 @@ files:
 - lib/geocoder/lookup.rb
 - lib/geocoder/lookups/base.rb
 - lib/geocoder/lookups/bing.rb
+- lib/geocoder/lookups/esri.rb
 - lib/geocoder/lookups/freegeoip.rb
 - lib/geocoder/lookups/geocoder_ca.rb
 - lib/geocoder/lookups/google.rb
@@ -50,6 +52,7 @@ files:
 - lib/geocoder/lookups/mapquest.rb
 - lib/geocoder/lookups/maxmind.rb
 - lib/geocoder/lookups/nominatim.rb
+- lib/geocoder/lookups/ovi.rb
 - lib/geocoder/lookups/test.rb
 - lib/geocoder/lookups/yahoo.rb
 - lib/geocoder/lookups/yandex.rb
@@ -63,6 +66,7 @@ files:
 - lib/geocoder/request.rb
 - lib/geocoder/results/base.rb
 - lib/geocoder/results/bing.rb
+- lib/geocoder/results/esri.rb
 - lib/geocoder/results/freegeoip.rb
 - lib/geocoder/results/geocoder_ca.rb
 - lib/geocoder/results/google.rb
@@ -70,6 +74,7 @@ files:
 - lib/geocoder/results/mapquest.rb
 - lib/geocoder/results/maxmind.rb
 - lib/geocoder/results/nominatim.rb
+- lib/geocoder/results/ovi.rb
 - lib/geocoder/results/test.rb
 - lib/geocoder/results/yahoo.rb
 - lib/geocoder/results/yandex.rb
@@ -93,6 +98,9 @@ files:
 - test/fixtures/bing_madison_square_garden
 - test/fixtures/bing_no_results
 - test/fixtures/bing_reverse
+- test/fixtures/esri_madison_square_garden
+- test/fixtures/esri_no_results
+- test/fixtures/esri_reverse
 - test/fixtures/freegeoip_74_200_247_59
 - test/fixtures/freegeoip_no_results
 - test/fixtures/geocoder_ca_madison_square_garden
@@ -114,6 +122,8 @@ files:
 - test/fixtures/maxmind_no_results
 - test/fixtures/nominatim_madison_square_garden
 - test/fixtures/nominatim_no_results
+- test/fixtures/ovi_madison_square_garden
+- test/fixtures/ovi_no_results
 - test/fixtures/yahoo_error
 - test/fixtures/yahoo_invalid_key
 - test/fixtures/yahoo_madison_square_garden
@@ -121,6 +131,7 @@ files:
 - test/fixtures/yahoo_over_limit
 - test/fixtures/yandex_invalid_key
 - test/fixtures/yandex_kremlin
+- test/fixtures/yandex_no_city_and_town
 - test/fixtures/yandex_no_results
 - test/geocoder_test.rb
 - test/https_test.rb
@@ -133,6 +144,7 @@ files:
 - test/oauth_util_test.rb
 - test/proxy_test.rb
 - test/query_test.rb
+- test/request_test.rb
 - test/result_test.rb
 - test/services_test.rb
 - test/test_helper.rb