geocoder 1.1.4 → 1.1.8

data/test/test_mode_test.rb

@@ -3,18 +3,49 @@ require 'test_helper'
 class TestModeTest < Test::Unit::TestCase
 
   def setup
-    @_original_lookup = Geocoder::Configuration.lookup
-    Geocoder::Configuration.lookup = :test
+    @_original_lookup = Geocoder.config.lookup
+    Geocoder.configure(:lookup => :test)
   end
 
   def teardown
     Geocoder::Lookup::Test.reset
-    Geocoder::Configuration.lookup = @_original_lookup
+    Geocoder.configure(:lookup => @_original_lookup)
   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.4
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2013-04-22 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,
@@ -24,12 +24,13 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
-- CHANGELOG.rdoc
+- CHANGELOG.md
 - LICENSE
 - 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
@@ -38,16 +39,20 @@ files:
 - lib/geocoder/calculations.rb
 - lib/geocoder/cli.rb
 - lib/geocoder/configuration.rb
+- lib/geocoder/configuration_hash.rb
 - lib/geocoder/exceptions.rb
 - 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
 - lib/geocoder/lookups/google_premier.rb
 - 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
@@ -61,12 +66,15 @@ 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
 - lib/geocoder/results/google_premier.rb
 - 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
@@ -77,36 +85,54 @@ files:
 - lib/geocoder/stores/mongo_mapper.rb
 - lib/geocoder/stores/mongoid.rb
 - lib/geocoder/version.rb
+- lib/hash_recursive_merge.rb
+- lib/oauth_util.rb
 - lib/tasks/geocoder.rake
 - test/active_record_test.rb
+- test/cache_test.rb
 - test/calculations_test.rb
 - test/configuration_test.rb
 - test/custom_block_test.rb
 - test/error_handling_test.rb
-- test/fixtures/bing_madison_square_garden.json
-- test/fixtures/bing_no_results.json
-- test/fixtures/bing_reverse.json
-- test/fixtures/freegeoip_74_200_247_59.json
-- test/fixtures/freegeoip_no_results.json
-- test/fixtures/geocoder_ca_madison_square_garden.json
-- test/fixtures/geocoder_ca_no_results.json
-- test/fixtures/geocoder_ca_reverse.json
-- test/fixtures/google_garbage.json
-- test/fixtures/google_madison_square_garden.json
-- test/fixtures/google_no_city_data.json
-- test/fixtures/google_no_locality.json
-- test/fixtures/google_no_results.json
-- test/fixtures/mapquest_madison_square_garden.json
-- test/fixtures/mapquest_no_results.json
-- test/fixtures/nominatim_madison_square_garden.json
-- test/fixtures/nominatim_no_results.json
-- test/fixtures/yahoo_madison_square_garden.json
-- test/fixtures/yahoo_no_results.json
-- test/fixtures/yahoo_v1_madison_square_garden.json
-- test/fixtures/yahoo_v1_no_results.json
-- test/fixtures/yandex_invalid_key.json
-- test/fixtures/yandex_kremlin.json
-- test/fixtures/yandex_no_results.json
+- test/fixtures/bing_invalid_key
+- 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
+- test/fixtures/geocoder_ca_no_results
+- test/fixtures/geocoder_ca_reverse
+- test/fixtures/google_garbage
+- test/fixtures/google_madison_square_garden
+- test/fixtures/google_no_city_data
+- test/fixtures/google_no_locality
+- test/fixtures/google_no_results
+- test/fixtures/mapquest_madison_square_garden
+- test/fixtures/mapquest_no_results
+- test/fixtures/maxmind_24_24_24_21
+- test/fixtures/maxmind_24_24_24_22
+- test/fixtures/maxmind_24_24_24_23
+- test/fixtures/maxmind_24_24_24_24
+- test/fixtures/maxmind_74_200_247_59
+- test/fixtures/maxmind_invalid_key
+- 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
+- test/fixtures/yahoo_no_results
+- 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
 - test/integration/smoke_test.rb
@@ -114,8 +140,11 @@ files:
 - test/method_aliases_test.rb
 - test/mongoid_test.rb
 - test/mongoid_test_helper.rb
+- test/near_test.rb
+- 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
@@ -132,21 +161,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -301313299
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -301313299
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Complete geocoding solution for Ruby.

data/test/fixtures/mapquest_madison_square_garden.json

@@ -1,27 +0,0 @@
-[
-  {
-    "place_id":"2177656031",
-    "licence":"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.",
-    "osm_type":"way",
-    "osm_id":"138141251",
-    "boundingbox":["40.7498588562012","40.751163482666","-73.9944381713867","-73.9925842285156"],
-    "polygonpoints":[["-73.9944367","40.7505417"],["-73.9940278","40.7511034"],["-73.9939442","40.7510658"],["-73.9938776","40.7510941"],["-73.9937734","40.7511298"],["-73.9936562","40.7511561"],["-73.993619","40.7511624"],["-73.9935537","40.7510862"],["-73.9935336","40.7510885"],["-73.9934248","40.7510898"],["-73.9933248","40.7510806"],["-73.9932268","40.7510614"],["-73.9931334","40.7510327"],["-73.9930378","40.7509909"],["-73.9929554","40.7509421"],["-73.9928865","40.7508886"],["-73.992821","40.7508216"],["-73.9927742","40.7507572"],["-73.9926591","40.7507581"],["-73.9926036","40.750603"],["-73.992704","40.7505536"],["-73.9927029","40.7505065"],["-73.9925855","40.7505009"],["-73.9925989","40.7503952"],["-73.9926442","40.7504003"],["-73.9926722","40.7503155"],["-73.9927117","40.7502402"],["-73.9927617","40.7501715"],["-73.992824","40.7501067"],["-73.9928991","40.7500484"],["-73.992869","40.7500159"],["-73.9929742","40.749956"],["-73.9930375","40.7500318"],["-73.9931229","40.7499938"],["-73.9931273","40.7499005"],["-73.9933201","40.7498624"],["-73.9933853","40.7499355"],["-73.993402","40.7499336"],["-73.9935038","40.749932"],["-73.9936041","40.7499407"],["-73.9936962","40.7499579"],["-73.9937875","40.7499846"],["-73.9938783","40.7500221"],["-73.9939639","40.7500701"],["-73.9940328","40.7501206"],["-73.9940991","40.7501842"],["-73.9941506","40.7502504"],["-73.9941562","40.7502603"],["-73.9942791","40.7502628"],["-73.9942969","40.7503035"],["-73.9943271","40.7503844"],["-73.9943435","40.7504689"],["-73.9943454","40.7505049"],["-73.9944367","40.7505417"]],
-    "lat":"40.7505206016777",
-    "lon":"-73.993490694181",
-    "display_name":"Madison Square Garden, 46, West 31st Street, Chelsea, New York City, New York, United States of America",
-    "class":"leisure",
-    "type":"stadium",
-    "address":{
-      "stadium":"Madison Square Garden",
-      "house_number":"46",
-      "road":"West 31st Street",
-      "suburb":"Chelsea",
-      "city":"New York City",
-      "county":"New York",
-      "state":"New York",
-      "postcode":"10119",
-      "country":"United States of America",
-      "country_code":"us"
-    }
-  }
-]

data/test/fixtures/mapquest_no_results.json

@@ -1 +0,0 @@
-[]

data/test/fixtures/yahoo_madison_square_garden.json

@@ -1,52 +0,0 @@
-{
-  "@lang": "en-US",
-  "ResultSet": {
-    "@version": "2.0",
-    "@lang": "en-US",
-    "Error": "0",
-    "ErrorMessage": "No error",
-    "Locale": "en-US",
-    "Found": "1",
-    "Quality": "90",
-    "Result": {
-      "quality": "90",
-      "latitude": "40.750381",
-      "longitude": "-73.993988",
-      "offsetlat": "40.750381",
-      "offsetlon": "-73.993988",
-      "radius": "100",
-      "boundingbox": {
-        "north": "40.750832",
-        "south": "40.749931",
-        "east": "-73.993393",
-        "west": "-73.994591"
-      },
-      "name": "Madison Square Garden",
-      "line1": "Madison Square Garden",
-      "line2": "New York, NY 10001",
-      "line3": "",
-      "line4": "United States",
-      "cross": "",
-      "house": "",
-      "street": "",
-      "xstreet": "",
-      "unittype": "",
-      "unit": "",
-      "postal": "10001",
-      "neighborhood": "Garment District|Midtown|Midtown West|Manhattan",
-      "city": "New York",
-      "county": "New York County",
-      "state": "New York",
-      "country": "United States",
-      "countrycode": "US",
-      "statecode": "NY",
-      "countycode": "",
-      "timezone": "America/New_York",
-      "areacode": "212",
-      "uzip": "10001",
-      "hash": "",
-      "woeid": "23617041",
-      "woetype": "20"
-    }
-  }
-}

data/test/fixtures/yahoo_no_results.json

@@ -1,10 +0,0 @@
-{
-  "ResultSet":{
-    "version":"1.0",
-    "Error":0,
-    "ErrorMessage":"No error",
-    "Locale":"us_US",
-    "Quality":10,
-    "Found":0
-  }
-}

data/test/fixtures/yahoo_v1_madison_square_garden.json

@@ -1,46 +0,0 @@
-{
-  "ResultSet":{
-    "version":"1.0",
-    "Error":0,
-    "ErrorMessage":"No error",
-    "Locale":"us_US",
-    "Quality":90,
-    "Found":1,
-    "Results":[{
-      "quality":90,
-      "latitude":"40.750381",
-      "longitude":"-73.993988",
-      "offsetlat":"40.750381",
-      "offsetlon":"-73.993988",
-      "radius":100,
-      "name":"Madison Square Garden",
-      "line1":"Madison Square Garden",
-      "line2":"New York, NY  10001",
-      "line3":"",
-      "line4":"United States",
-      "house":"",
-      "street":"",
-      "xstreet":"",
-      "unittype":"",
-      "unit":"",
-      "postal":"10001",
-      "neighborhood":"",
-      "city":"New York",
-      "county":"New York County",
-      "state":"New York",
-      "country":"United States",
-      "countrycode":"US",
-      "statecode":"NY",
-      "countycode":"",
-      "uzip":"10001",
-      "hash":"",
-      "woeid":23617041,
-      "woetype":20,
-      "cross":"",
-      "timezone":"America/New_York",
-      "neighborhood":"Garment District|Midtown|Midtown West|Manhattan",
-      "areacode":"212",
-      "boundingbox":{"north":"40.750832","south":"40.749931","east":"-73.993393","west":"-73.994591"}
-    }]
-  }
-}

data/test/fixtures/yahoo_v1_no_results.json

@@ -1,10 +0,0 @@
-{
-  "ResultSet":{
-    "version":"1.0",
-    "Error":0,
-    "ErrorMessage":"No error",
-    "Locale":"us_US",
-    "Quality":10,
-    "Found":0
-  }
-}