RubyGems - geocoder - Versions diffs - 1.1.4 → 1.1.8 - Mend

geocoder 1.1.4 → 1.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (110) hide show

data/.travis.yml +4 -0
data/{CHANGELOG.rdoc → CHANGELOG.md} +120 -39
data/README.md +200 -54
data/examples/autoexpire_cache_dalli.rb +62 -0
data/examples/{autoexpire_cache.rb → autoexpire_cache_redis.rb} +4 -6
data/lib/generators/geocoder/config/templates/initializer.rb +19 -23
data/lib/geocoder/cache.rb +6 -1
data/lib/geocoder/calculations.rb +45 -13
data/lib/geocoder/cli.rb +10 -11
data/lib/geocoder/configuration.rb +67 -43
data/lib/geocoder/configuration_hash.rb +11 -0
data/lib/geocoder/exceptions.rb +3 -0
data/lib/geocoder/lookup.rb +3 -1
data/lib/geocoder/lookups/base.rb +89 -27
data/lib/geocoder/lookups/bing.rb +21 -11
data/lib/geocoder/lookups/esri.rb +48 -0
data/lib/geocoder/lookups/freegeoip.rb +8 -4
data/lib/geocoder/lookups/geocoder_ca.rb +11 -7
data/lib/geocoder/lookups/google.rb +18 -9
data/lib/geocoder/lookups/google_premier.rb +16 -8
data/lib/geocoder/lookups/mapquest.rb +33 -5
data/lib/geocoder/lookups/maxmind.rb +88 -0
data/lib/geocoder/lookups/nominatim.rb +13 -8
data/lib/geocoder/lookups/ovi.rb +52 -0
data/lib/geocoder/lookups/test.rb +10 -0
data/lib/geocoder/lookups/yahoo.rb +51 -38
data/lib/geocoder/lookups/yandex.rb +17 -9
data/lib/geocoder/models/mongoid.rb +1 -1
data/lib/geocoder/query.rb +20 -5
data/lib/geocoder/request.rb +7 -1
data/lib/geocoder/results/base.rb +8 -2
data/lib/geocoder/results/esri.rb +51 -0
data/lib/geocoder/results/google.rb +34 -0
data/lib/geocoder/results/mapquest.rb +46 -2
data/lib/geocoder/results/maxmind.rb +135 -0
data/lib/geocoder/results/nominatim.rb +0 -10
data/lib/geocoder/results/ovi.rb +62 -0
data/lib/geocoder/results/test.rb +2 -1
data/lib/geocoder/results/yahoo.rb +9 -2
data/lib/geocoder/results/yandex.rb +12 -2
data/lib/geocoder/sql.rb +6 -4
data/lib/geocoder/stores/active_record.rb +57 -30
data/lib/geocoder/stores/base.rb +3 -2
data/lib/geocoder/stores/mongo_base.rb +2 -1
data/lib/geocoder/version.rb +1 -1
data/lib/geocoder.rb +2 -4
data/lib/hash_recursive_merge.rb +74 -0
data/lib/oauth_util.rb +112 -0
data/test/cache_test.rb +19 -0
data/test/calculations_test.rb +10 -4
data/test/configuration_test.rb +26 -51
data/test/error_handling_test.rb +8 -4
data/test/fixtures/bing_invalid_key +1 -0
data/test/fixtures/esri_madison_square_garden +59 -0
data/test/fixtures/esri_no_results +8 -0
data/test/fixtures/esri_reverse +21 -0
data/test/fixtures/mapquest_madison_square_garden +52 -0
data/test/fixtures/mapquest_no_results +7 -0
data/test/fixtures/maxmind_24_24_24_21 +1 -0
data/test/fixtures/maxmind_24_24_24_22 +1 -0
data/test/fixtures/maxmind_24_24_24_23 +1 -0
data/test/fixtures/maxmind_24_24_24_24 +1 -0
data/test/fixtures/maxmind_74_200_247_59 +1 -0
data/test/fixtures/maxmind_invalid_key +1 -0
data/test/fixtures/maxmind_no_results +1 -0
data/test/fixtures/ovi_madison_square_garden +72 -0
data/test/fixtures/ovi_no_results +8 -0
data/test/fixtures/yahoo_error +1 -0
data/test/fixtures/yahoo_invalid_key +2 -0
data/test/fixtures/yahoo_madison_square_garden +52 -0
data/test/fixtures/yahoo_no_results +10 -0
data/test/fixtures/yahoo_over_limit +2 -0
data/test/fixtures/yandex_no_city_and_town +112 -0
data/test/https_test.rb +3 -3
data/test/integration/smoke_test.rb +2 -2
data/test/lookup_test.rb +84 -11
data/test/near_test.rb +43 -0
data/test/oauth_util_test.rb +30 -0
data/test/proxy_test.rb +2 -2
data/test/query_test.rb +13 -0
data/test/request_test.rb +29 -0
data/test/result_test.rb +12 -2
data/test/services_test.rb +208 -57
data/test/test_helper.rb +66 -100
data/test/test_mode_test.rb +35 -26
metadata +58 -35
data/test/fixtures/mapquest_madison_square_garden.json +0 -27
data/test/fixtures/mapquest_no_results.json +0 -1
data/test/fixtures/yahoo_madison_square_garden.json +0 -52
data/test/fixtures/yahoo_no_results.json +0 -10
data/test/fixtures/yahoo_v1_madison_square_garden.json +0 -46
data/test/fixtures/yahoo_v1_no_results.json +0 -10
/data/test/fixtures/{bing_madison_square_garden.json → bing_madison_square_garden} +0 -0
/data/test/fixtures/{bing_no_results.json → bing_no_results} +0 -0
/data/test/fixtures/{bing_reverse.json → bing_reverse} +0 -0
/data/test/fixtures/{freegeoip_74_200_247_59.json → freegeoip_74_200_247_59} +0 -0
/data/test/fixtures/{freegeoip_no_results.json → freegeoip_no_results} +0 -0
/data/test/fixtures/{geocoder_ca_madison_square_garden.json → geocoder_ca_madison_square_garden} +0 -0
/data/test/fixtures/{geocoder_ca_no_results.json → geocoder_ca_no_results} +0 -0
/data/test/fixtures/{geocoder_ca_reverse.json → geocoder_ca_reverse} +0 -0
/data/test/fixtures/{google_garbage.json → google_garbage} +0 -0
/data/test/fixtures/{google_madison_square_garden.json → google_madison_square_garden} +0 -0
/data/test/fixtures/{google_no_city_data.json → google_no_city_data} +0 -0
/data/test/fixtures/{google_no_locality.json → google_no_locality} +0 -0
/data/test/fixtures/{google_no_results.json → google_no_results} +0 -0
/data/test/fixtures/{nominatim_madison_square_garden.json → nominatim_madison_square_garden} +0 -0
/data/test/fixtures/{nominatim_no_results.json → nominatim_no_results} +0 -0
/data/test/fixtures/{yandex_invalid_key.json → yandex_invalid_key} +0 -0
/data/test/fixtures/{yandex_kremlin.json → yandex_kremlin} +0 -0
/data/test/fixtures/{yandex_no_results.json → yandex_no_results} +0 -0

data/.travis.yml CHANGED Viewed

@@ -2,6 +2,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - jruby-19mode
 gemfile:
   - Gemfile
   - gemfiles/Gemfile.mongoid-2.4.x
@@ -17,3 +18,6 @@ matrix:
     - rvm: 1.9.3
       gemfile: gemfiles/Gemfile.mongoid-2.4.x
       env: SSL_CERT_DIR=/etc/ssl/certs
+    - rvm: jruby-19mode
+      gemfile: gemfiles/Gemfile.mongoid-2.4.x
+      env: SSL_CERT_DIR=/etc/ssl/certs

data/{CHANGELOG.rdoc → CHANGELOG.md} RENAMED Viewed

@@ -1,8 +1,55 @@
-= Changelog
-Per-release changes to Geocoder.
-== 1.1.4 (2012 Oct 2)
+Changelog
+=========
+Per-release changes to Geocoder. Note that only major changes are summarized here. Please see the Git log for all changes.
+1.1.8 (2013 Apr 22)
+-------------------
+* Fix bug in ESRI lookup that caused an exception on load in environments without rack/utils.
+1.1.7 (2013 Apr 21)
+-------------------
+* Add support for Ovi/Nokia API (thanks github.com/datenimperator).
+* Add support for ESRI API (thanks github.com/rpepato).
+* Add ability to omit distance and bearing from SQL select clause (thanks github.com/nicolasdespres).
+* Add support for caches that use read/write methods (thanks github.com/eskil).
+* Add support for nautical miles (thanks github.com/vanboom).
+* Fix: bug in parsing of MaxMind responses.
+* Fix: bugs in query regular expressions (thanks github.com/boone).
+* Fix: various bugs in MaxMind implementation.
+* Fix: don't require a key for MapQuest.
+* Fix: bug in handling of HTTP_X_FORWARDED_FOR header (thanks github.com/robdimarco).
+1.1.6 (2012 Dec 24)
+-------------------
+* Major changes to configuration syntax which allow for API-specific config options. Old config syntax is now DEPRECATED.
+* Add support for MaxMind API (thanks github.com/gonzoyumo).
+* Add optional Geocoder::InvalidApiKey exception for bad API credentials (Yahoo, Yandex, Bing, and Maxmind). Warn when bad key and exception not set in Geocoder.configure(:always_raise => [...]).
+* Add support for X-Real-IP and X-Forwarded-For headers (thanks github.com/konsti).
+* Add support for custom Nominatim host config: Geocoder.configure(:nominatim => {:host => "..."}).
+* Raise exception when required API key is missing or incorrect format.
+* Add support for Google's :region and :components parameters (thanks to github.com/tomlion).
+* Fix: string escaping bug in OAuth lib (thanks github.com/m0thman).
+* Fix: configured units were not always respected in SQL queries.
+* Fix: in #nearbys, don't try to exclude self if not yet persisted.
+* Fix: bug with cache stores that provided #delete but not #del.
+* Change #nearbys so that it returns nil instead of [] when object is not geocoded.
+1.1.5 (2012 Nov 9)
+------------------
+* Replace support for old Yahoo Placefinder with Yahoo BOSS (thanks github.com/pwoltman).
+* Add support for actual Mapquest API (was previously just a proxy for Nominatim), including the paid service (thanks github.com/jedschneider).
+* Add support for :select => :id_only option to near scope.
+* Treat a given query as blank (don't do a lookup) if coordinates are given but latitude or longitude is nil.
+* Speed up 'near' queries by adding bounding box condition (thanks github.com/mlandauer).
+* Fix: don't redefine Object#hash in Yahoo result object (thanks github.com/m0thman).
+1.1.4 (2012 Oct 2)
+------------------
 * Deprecate Geocoder::Result::Nominatim#class and #type methods. Use #place_class and #place_type instead.
 * Add support for setting arbitrary parameters in geocoding request URL.
@@ -14,7 +61,8 @@ Per-release changes to Geocoder.
 * Fix: :exclude option to .near scope when primary key != :id (thanks github.com/smisml).
 * Much code refactoring (added Geocoder::Query class and Geocoder::Sql module).
-== 1.1.3 (2012 Aug 26)
+1.1.3 (2012 Aug 26)
+-------------------
 * Add support for Mapquest geocoding service (thanks github.com/razorinc).
 * Add :test lookup for easy testing of apps using Geocoder (thanks github.com/mguterl).
@@ -27,7 +75,8 @@ Per-release changes to Geocoder.
 * Fix: bug in distance_from_sql method (error occurred when coordinates not found).
 * Fix: incompatibility with Mongoid 3.0.x (thanks github.com/petergoldstein).
-== 1.1.2 (2012 May 24)
+1.1.2 (2012 May 24)
+-------------------
 * Add ability to specify default units and distance calculation method (thanks github.com/abravalheri).
 * Add new (optional) configuration syntax (thanks github.com/abravalheri).
@@ -38,7 +87,8 @@ Per-release changes to Geocoder.
 * Fix: properly recognize IP addresses with ::ffff: prefix (thanks github.com/brian-ewell).
 * Fix: avoid exception during calculations when coordinates not known (thanks github.com/flori).
-== 1.1.1 (2012 Feb 16)
+1.1.1 (2012 Feb 16)
+-------------------
 * Add distance_from_sql class method to geocoded class (thanks github.com/dwilkie).
 * Add OverQueryLimitError and raise when relevant for Google lookup.
@@ -46,7 +96,8 @@ Per-release changes to Geocoder.
 * Fix: within_bounding_box now uses correct lat/lon DB columns (thanks github.com/kongo).
 * Fix: error accessing city in some cases with Yandex result (thanks github.com/kor6n and sld).
-== 1.1.0 (2011 Dec 3)
+1.1.0 (2011 Dec 3)
+------------------
 * A block passed to geocoded_by is now always executed, even if the geocoding service returns no results. This means you need to make sure you have results before trying to assign data to your object.
 * Fix issues with joins and row counts (issues #49, 86, and 108) by not using GROUP BY clause with ActiveRecord scopes.
@@ -58,17 +109,20 @@ Per-release changes to Geocoder.
 * Add support for API key to Geocoder.ca geocoding service (thanks github.com/ryanLonac).
 * Add support for state to Yandex results (thanks github.com/tipugin).
-== 1.0.5 (2011 Oct 26)
+1.0.5 (2011 Oct 26)
+-------------------
 * Fix error with `rake assets:precompile` (thanks github.com/Sush).
 * Fix HTTPS support (thanks github.com/rsanheim).
 * Improve cache interface.
-== 1.0.4 (2011 Sep 18)
+1.0.4 (2011 Sep 18)
+-------------------
 * Remove klass method from rake task, which could conflict with app methods (thanks github.com/mguterl).
-== 1.0.3 (2011 Sep 17)
+1.0.3 (2011 Sep 17)
+-------------------
 * Add support for Google Premier geocoding service (thanks github.com/steveh).
 * Update Google API URL (thanks github.com/soorajb).
@@ -76,19 +130,22 @@ Per-release changes to Geocoder.
 * Fix: rake assets:precompile (Rails 3.1) not working in some situations.
 * Fix: stop double-adjusting units when using kilometers (thanks github.com/hairyheron).
-== 1.0.2 (2011 June 25)
+1.0.2 (2011 June 25)
+--------------------
 * Add support for MongoMapper (thanks github.com/spagalloco).
 * Fix: user-specified coordinates field wasn't working with Mongoid (thanks github.com/thisduck).
 * Fix: invalid location given to near scope was returning all results (Active Record) or error (Mongoid) (thanks github.com/ogennadi).
-== 1.0.1 (2011 May 17)
+1.0.1 (2011 May 17)
+-------------------
 * Add option to not rescue from certain exceptions (thanks github.com/ahmedrb).
 * Fix STI child/parent geocoding bug (thanks github.com/ogennadi).
 * Other bugfixes.
-== 1.0.0 (2011 May 9)
+1.0.0 (2011 May 9)
+------------------
 * Add command line interface.
 * Add support for local proxy (thanks github.com/Olivier).
@@ -97,11 +154,13 @@ Per-release changes to Geocoder.
 * Fix single table inheritance bug (reported by github.com/enrico).
 * Fix bug when Google result supplies no city (thanks github.com/jkeen).
-== 0.9.13 (2011 Apr 11)
+0.9.13 (2011 Apr 11)
+--------------------
 * Fix "can't find special index: 2d" error when using Mongoid with Ruby 1.8.
-== 0.9.12 (2011 Apr 6)
+0.9.12 (2011 Apr 6)
+-------------------
 * Add support for Mongoid.
 * Add bearing_to/from methods to geocoded objects.
@@ -112,7 +171,8 @@ Per-release changes to Geocoder.
 * DEPRECATION: Geocoder.near should not take <tt>:limit</tt> or <tt>:offset</tt> options.
 * DEPRECATION: Change argument format of all methods that take lat/lon as separate arguments. Now you must pass the coordinates as an array [lat,lon], but you may alternatively pass a address string (will look up coordinates) or a geocoded object (or any object that implements a to_coordinates method which returns a [lat,lon] array).
-== 0.9.11 (2011 Mar 25)
+0.9.11 (2011 Mar 25)
+--------------------
 * Add support for result caching.
 * Add support for Geocoder.ca geocoding service.
@@ -122,12 +182,14 @@ Per-release changes to Geocoder.
 * DEPRECATION: <tt>Geocoder.search</tt> now returns an array instead of a single result.
 * DEPRECATION: <tt>obj.nearbys</tt> second argument is now an options hash (instead of units). Please change <tt>obj.nearbys(20, :km)</tt> to: <tt>obj.nearbys(20, :units => :km)</tt>.
-== 0.9.10 (2011 Mar 9)
+0.9.10 (2011 Mar 9)
+-------------------
 * Fix broken scopes (github.com/mikepinde).
 * Fix broken Ruby 1.9 and JRuby compatibility (don't require json gem).
-== 0.9.9 (2011 Mar 9)
+0.9.9 (2011 Mar 9)
+------------------
 * Add support for IP address geocoding via FreeGeoIp.net.
 * Add support for Yahoo PlaceFinder geocoding API.
@@ -142,7 +204,8 @@ Per-release changes to Geocoder.
 * DEPRECATION: <tt>fetch_address!</tt> has been superceded by +reverse_geocode+ (then save your object manually).
 * Fix: don't die when trying to get coordinates with a nil address (github.com/zmack).
-== 0.9.8 (2011 Feb 8)
+0.9.8 (2011 Feb 8)
+------------------
 * Include <tt>geocode:all</tt> Rake task in gem (was missing!).
 * Add <tt>Geocoder.search</tt> for access to Google's full response.
@@ -150,87 +213,105 @@ Per-release changes to Geocoder.
 * Emit warnings on Google connection problems and errors.
 * Refactor: insert Geocoder into ActiveRecord via Railtie.
-== 0.9.7 (2011 Feb 1)
+0.9.7 (2011 Feb 1)
+------------------
 * Add reverse geocoding (+reverse_geocoded_by+).
 * Prevent exception (uninitialized constant Geocoder::Net) when net/http not already required (github.com/sleepycat).
 * Refactor: split monolithic Geocoder module into several smaller ones.
-== 0.9.6 (2011 Jan 19)
+0.9.6 (2011 Jan 19)
+-------------------
 * Fix incompatibility with will_paginate gem.
 * Include table names in GROUP BY clause of nearby scope to avoid ambiguity in joins (github.com/matchu).
-== 0.9.5 (2010 Oct 15)
+0.9.5 (2010 Oct 15)
+-------------------
 * Fix broken PostgreSQL compatibility (now 100% compatible).
 * Switch from Google's XML to JSON geocoding API.
 * Separate Rails 2 and Rails 3-compatible branches.
 * Don't allow :conditions hash in 'options' argument to 'nearbys' method (was deprecated in 0.9.3).
-== 0.9.4 (2010 Aug 2)
+0.9.4 (2010 Aug 2)
+------------------
 * Google Maps API key no longer required (uses geocoder v3).
-== 0.9.3 (2010 Aug 2)
+0.9.3 (2010 Aug 2)
+------------------
 * Fix incompatibility with Rails 3 RC 1.
 * Deprecate 'options' argument to 'nearbys' method.
 * Allow inclusion of 'nearbys' in Arel method chains.
-== 0.9.2 (2010 Jun 3)
+0.9.2 (2010 Jun 3)
+------------------
 * Fix LIMIT clause bug in PostgreSQL (reported by github.com/kenzie).
-== 0.9.1 (2010 May 4)
+0.9.1 (2010 May 4)
+------------------
 * Use scope instead of named_scope in Rails 3.
-== 0.9.0 (2010 Apr 2)
+0.9.0 (2010 Apr 2)
+------------------
 * Fix bug in PostgreSQL support (caused "PGError: ERROR:  column "distance" does not exist"), reported by github.com/developish.
-== 0.8.9 (2010 Feb 11)
+0.8.9 (2010 Feb 11)
+-------------------
 * Add Rails 3 compatibility.
 * Avoid querying Google when query would be an empty string.
-== 0.8.8 (2009 Dec 7)
+0.8.8 (2009 Dec 7)
+------------------
 * Automatically select a less accurate but compatible distance algorithm when SQLite database detected (fixes SQLite incompatibility).
-== 0.8.7 (2009 Nov 4)
+0.8.7 (2009 Nov 4)
+------------------
 * Added Geocoder.geographic_center method.
 * Replaced _get_coordinates class method with read_coordinates instance method.
-== 0.8.6 (2009 Oct 27)
+0.8.6 (2009 Oct 27)
+-------------------
 * The fetch_coordinates method now assigns coordinates to attributes (behaves like fetch_coordinates! used to) and fetch_coordinates! both assigns and saves the attributes.
 * Added geocode:all rake task.
-== 0.8.5 (2009 Oct 26)
+0.8.5 (2009 Oct 26)
+-------------------
 * Avoid calling deprecated method from within Geocoder itself.
-== 0.8.4 (2009 Oct 23)
+0.8.4 (2009 Oct 23)
+-------------------
 * Deprecate <tt>find_near</tt> class method in favor of +near+ named scope.
-== 0.8.3 (2009 Oct 23)
+0.8.3 (2009 Oct 23)
+-------------------
 * Update Google URL query string parameter to reflect recent changes in Google's API.
-== 0.8.2 (2009 Oct 12)
+0.8.2 (2009 Oct 12)
+-------------------
 * Allow a model's geocoder search string method to be something other than an ActiveRecord attribute.
 * Clean up documentation.
-== 0.8.1 (2009 Oct 8)
+0.8.1 (2009 Oct 8)
+------------------
 * Extract XML-fetching code from <tt>Geocoder.search</tt> and place in Geocoder._fetch_xml (for ease of mocking).
 * Add tests for coordinate-fetching instance methods.
-== 0.8.0 (2009 Oct 1)
+0.8.0 (2009 Oct 1)
+------------------
 First release.