geocoder 1.1.2 → 1.1.3

data/.travis.yml

@@ -0,0 +1,19 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+gemfile:
+  - Gemfile
+  - gemfiles/Gemfile.mongoid-2.4.x
+env: SSL_CERT_DIR=/etc/ssl/certs
+matrix:
+  exclude:
+    - rvm: 1.8.7
+      gemfile: Gemfile
+      env: SSL_CERT_DIR=/etc/ssl/certs
+    - rvm: 1.9.2
+      gemfile: Gemfile
+      env: SSL_CERT_DIR=/etc/ssl/certs
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile.mongoid-2.4.x
+      env: SSL_CERT_DIR=/etc/ssl/certs

data/CHANGELOG.rdoc

@@ -2,6 +2,19 @@
 
 Per-release changes to Geocoder.
 
+== 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).
+* Add #precision method to Yandex results (thanks github.com/gemaker).
+* Add support for raising :all exceptions (thanks github.com/andyvb).
+* Add exceptions for certain Google geocoder responses (thanks github.com/andyvb).
+* Add Travis-CI integration (thanks github.com/petergoldstein).
+* Fix: unit config was not working with SQLite (thanks github.com/balvig).
+* Fix: get tests to pass under Jruby (thanks github.com/petergoldstein).
+* 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)
 
 * Add ability to specify default units and distance calculation method (thanks github.com/abravalheri).

data/README.rdoc

@@ -201,6 +201,20 @@ For reverse geocoding you can also specify an alternate name attribute where the
   reverse_geocoded_by :coordinates, :address => :loc                # MongoDB
 
 
+== Advanced Querying
+
+When querying for objects (if you're using ActiveRecord) you can also look within a square rather than a radius (circle) by using the <tt>within_bounding_box</tt> scope:
+
+  distance = 20
+  center_point = [40.71, 100.23]
+  box = Geocoder::Calculations.bounding_box(center_point, distance)
+  Venue.within_bounding_box(box, distance)
+
+This can also dramatically improve query performance, especially when used in conjunction with indexes on the latitude/longitude columns. Note, however, that returned results do not include +distance+ and +bearing+ attributes. If you want to improve performance AND have access to distance and bearing info, use both scopes:
+
+  Venue.near(center_point, distance).within_bounding_box(box, distance)
+
+
 == Advanced Geocoding
 
 So far we have looked at shortcuts for assigning geocoding results to object attributes. However, if you need to do something fancy you can skip the auto-assignment by providing a block (takes the object to be geocoded and an array of <tt>Geocoder::Result</tt> objects) in which you handle the parsed geocoding result any way you like, for example:
@@ -264,7 +278,7 @@ The following is a comparison of the supported geocoding APIs. The "Limitations"
 
 ==== Google (<tt>:google</tt>)
 
-API key:: optional (required for Premier)
+API key:: required for Premier (do NOT use a key for the free version)
 Key signup:: http://code.google.com/apis/maps/signup.html
 Quota:: 2,500 requests/day, 100,000 with Google Maps API Premier
 Region:: world
@@ -312,9 +326,8 @@ Limitations:: Please limit request rate to 1 per second and include your contact
 
 ==== Yandex (<tt>:yandex</tt>)
 
-API key:: required
-Key signup:: http://api.yandex.ru/maps/intro/concepts/intro.xml#apikey
-Quota:: ?
+API key:: none
+Quota:: 25000 requests / day
 Region:: Russia
 SSL support:: no
 Languages:: Russian, Belarusian, and Ukrainian
@@ -333,13 +346,24 @@ Documentation:: ?
 Terms of Service:: http://geocoder.ca/?terms=1
 Limitations:: "Under no circumstances can our data be re-distributed or re-sold by anyone to other parties without our written permission."
 
-==== FreeGeoIP
+==== Mapquest (<tt>:mapquest</tt>)
 
 API key:: none
 Quota:: ?
 Region:: world
 SSL support:: no
 Languages:: English
+Documentation:: http://www.mapquestapi.com/geocoding/
+Terms of Service:: http://info.mapquest.com/terms-of-use/
+Limitations:: ?
+
+==== FreeGeoIP
+
+API key:: none
+Quota:: 1000 requests per hour.  After reaching the hourly quota, all of your requests will result in HTTP 403 (Forbidden) until it clears up on the next roll over.
+Region:: world
+SSL support:: no
+Languages:: English
 Documentation:: http://github.com/fiorix/freegeoip/blob/master/README.rst
 Terms of Service:: ?
 Limitations:: ?
@@ -416,6 +440,29 @@ You can use Geocoder outside of Rails by calling the <tt>Geocoder.search</tt> me
 This returns an array of <tt>Geocoder::Result</tt> objects with all information provided by the geocoding service. Please see above and in the code for details.
 
 
+== Testing Apps that Use Geocoder
+
+When writing tests for an app that uses Geocoder it may be useful to avoid network calls and have Geocoder return consistent, configurable results. To do this, configure and use the <tt>:test</tt> lookup. For example:
+
+  Geocoder::Configuration.lookup = :test
+
+  Geocoder::Lookup::Test.add_stub(
+    "New York, NY", [
+      {
+        'latitude'     => 40.7143528,
+        'longitude'    => -74.0059731,
+        'address'      => 'New York, NY, USA',
+        'state'        => 'New York',
+        'state_code'   => 'NY',
+        'country'      => 'United States',
+        'country_code' => 'US'
+      }
+    ]
+  )
+
+Now, any time Geocoder looks up "New York, NY" its results array will contain one result with the above attributes.
+
+
 == Command Line Interface
 
 When you install the Geocoder gem it adds a +geocode+ command to your shell. You can search for a street address, IP address, postal code, coordinates, etc just like you can with the Geocoder.search method for example:
@@ -441,7 +488,7 @@ Mongo document classes (Mongoid and MongoMapper) have a built-in +near+ scope, b
 
 === Latitude/Longitude Order
 
-Coordinates are generally printed and spoken as latitude, then logitude ([lat,lon]). Geocoder respects this convention and always expects method arguments to be given in [lat,lon] order. However, MongoDB requires that coordinates be stored in [lon,lat] order as per the GeoJSON spec (http://geojson.org/geojson-spec.html#positions), so internally they are stored "backwards." However, this does not affect order of arguments to methods when using Mongoid or MongoMapper.
+Coordinates are generally printed and spoken as latitude, then longitude ([lat,lon]). Geocoder respects this convention and always expects method arguments to be given in [lat,lon] order. However, MongoDB requires that coordinates be stored in [lon,lat] order as per the GeoJSON spec (http://geojson.org/geojson-spec.html#positions), so internally they are stored "backwards." However, this does not affect order of arguments to methods when using Mongoid or MongoMapper.
 
 To access an object's coordinates in the conventional order, use the <tt>to_coordinates</tt> instance method provided by Geocoder. For example:
 
@@ -485,6 +532,12 @@ By default Geocoder will rescue any exceptions raised by calls to the geocoding
 
   Geocoder::Configuration.always_raise = [SocketError, TimeoutError]
 
+You can also do this to raise all exceptions:
+
+  Geocoder::Configuration.always_raise = :all
+
+See <tt>lib/geocoder/exceptions.rb</tt> for a list of raise-able exceptions.
+
 
 == Known Issue
 

data/gemfiles/Gemfile.mongoid-2.4.x

@@ -0,0 +1,15 @@
+source "http://rubygems.org"
+
+gemspec :path => '..'
+
+group :development, :test do
+  gem 'rake'
+  gem 'mongoid', '2.4.11'
+  gem 'bson_ext', :platforms => :ruby
+
+  gem 'rails'
+
+  platforms :jruby do
+    gem 'jruby-openssl'
+  end
+end

data/lib/generators/geocoder/config/templates/initializer.rb

@@ -1,4 +1,4 @@
-Geocoder.configure do
+Geocoder.configure do |config|
   ## Configurable parameters: if you wish to change some configurable
   ## behaviour in Geocoder, feel free to uncomment the following lines
   ## and provide custom parameters.
@@ -19,7 +19,7 @@ Geocoder.configure do
   # config.always_raise = []
 
   ## Calculation options
-  # config.units  = :mi        # :km for kilometers or :mi for miles
-  # config.method = :linear    # :spherical or :linear
+  # config.units     = :mi        # :km for kilometers or :mi for miles
+  # config.distances = :linear    # :spherical or :linear
 end
 

data/lib/geocoder.rb

@@ -57,7 +57,7 @@ module Geocoder
   # All street address lookups, default first.
   #
   def street_lookups
-    [:google, :google_premier, :yahoo, :bing, :geocoder_ca, :yandex, :nominatim]
+    [:google, :google_premier, :yahoo, :bing, :geocoder_ca, :yandex, :nominatim, :mapquest, :test]
   end
 
   ##

data/lib/geocoder/calculations.rb

@@ -24,6 +24,18 @@ module Geocoder
     # Not a number constant
     NAN = defined?(::Float::NAN) ? ::Float::NAN : 0 / 0.0
 
+    ##
+    # Returns true if all given arguments are valid latitude/longitude values.
+    #
+    def coordinates_present?(*args)
+      args.each do |a|
+        # note that Float::NAN != Float::NAN
+        # still, this could probably be improved:
+        return false if (!a.is_a?(Numeric) or a.to_s == "NaN")
+      end
+      true
+    end
+
     ##
     # Distance spanned by one degree of latitude in the given units.
     #

data/lib/geocoder/configuration.rb

@@ -99,5 +99,6 @@ module Geocoder
         instance.set_defaults
       end
     end
+
   end
 end

data/lib/geocoder/exceptions.rb

@@ -8,4 +8,11 @@ module Geocoder
 
   class OverQueryLimitError < Error
   end
+
+  class RequestDenied < Error
+  end
+
+  class InvalidRequest < Error
+  end
+
 end

data/lib/geocoder/lookups/base.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'net/https'
 require 'uri'
 
 unless defined?(ActiveSupport::JSON)
@@ -99,7 +100,8 @@ module Geocoder
       # Return false if exception not raised.
       #
       def raise_error(error, message = nil)
-        if Geocoder::Configuration.always_raise.include?( error.is_a?(Class) ? error : error.class )
+        exceptions = Geocoder::Configuration.always_raise
+        if exceptions == :all or exceptions.include?( error.is_a?(Class) ? error : error.class )
           raise error, message
         else
           false

data/lib/geocoder/lookups/google.rb

@@ -18,9 +18,11 @@ module Geocoder::Lookup
         raise_error(Geocoder::OverQueryLimitError) ||
           warn("Google Geocoding API error: over query limit.")
       when "REQUEST_DENIED"
-        warn "Google Geocoding API error: request denied."
+        raise_error(Geocoder::RequestDenied) ||
+          warn("Google Geocoding API error: request denied.")
       when "INVALID_REQUEST"
-        warn "Google Geocoding API error: invalid request."
+        raise_error(Geocoder::InvalidRequest) ||
+          warn("Google Geocoding API error: invalid request.")
       end
       return []
     end

data/lib/geocoder/lookups/mapquest.rb

@@ -0,0 +1,33 @@
+require 'geocoder/lookups/base'
+require "geocoder/results/mapquest"
+
+module Geocoder::Lookup
+  class Mapquest < Base
+
+    private # ---------------------------------------------------------------
+
+    def results(query, reverse = false)
+      return [] unless doc = fetch_data(query, reverse)
+      doc.is_a?(Array) ? doc : [doc]
+    end
+
+    def query_url(query, reverse = false)
+      params = {
+        :format => "json",
+        :polygon => "1",
+        :addressdetails => "1",
+        :"accept-language" => Geocoder::Configuration.language
+      }
+      if (reverse)
+        method = 'reverse'
+        parts = query.split(/\s*,\s*/);
+        params[:lat] = parts[0]
+        params[:lon] = parts[1]
+      else
+        method = 'search'
+        params[:q] = query
+      end
+      "http://open.mapquestapi.com/#{method}?" + hash_to_query(params)
+    end
+  end
+end

data/lib/geocoder/lookups/test.rb

@@ -0,0 +1,32 @@
+require 'geocoder/lookups/base'
+require 'geocoder/results/test'
+
+module Geocoder
+  module Lookup
+    class Test < Base
+
+      def self.add_stub(query, results)
+        stubs[query] = results
+      end
+
+      def self.read_stub(query)
+        stubs.fetch(query) { raise ArgumentError, "unknown stub request #{query}" }
+      end
+
+      def self.stubs
+        @stubs ||= {}
+      end
+
+      def self.reset
+        @stubs = {}
+      end
+
+      private
+
+      def results(query, reverse = false)
+        Geocoder::Lookup::Test.read_stub(query)
+      end
+
+    end
+  end
+end

data/lib/geocoder/models/mongoid.rb

@@ -1,3 +1,4 @@
+require 'mongoid/version'
 require 'geocoder/models/base'
 require 'geocoder/models/mongo_base'
 
@@ -17,8 +18,14 @@ module Geocoder
       def geocoder_init(options)
         super(options)
         if options[:skip_index] == false
-          index [[ geocoder_options[:coordinates], Mongo::GEO2D ]],
-            :min => -180, :max => 180 # create 2d index
+          # create 2d index
+          if (::Mongoid::VERSION >= "3")
+            index({ geocoder_options[:coordinates].to_sym => '2d' }, 
+                  {:min => -180, :max => 180})
+          else
+            index [[ geocoder_options[:coordinates], '2d' ]],
+              :min => -180, :max => 180
+          end
         end
       end
     end

data/lib/geocoder/results/mapquest.rb

@@ -0,0 +1,66 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class Mapquest < Base
+
+    def house_number
+      @data['address']['house_number']
+    end
+
+    def address
+      @data['display_name']
+    end
+
+    def street
+      @data['address']['road']
+    end
+
+    def city
+      @data['address']['city']
+    end
+
+    def village
+      @data['address']['villiage']
+    end
+
+    def town
+      @data['address']['town']
+    end
+
+    def state
+      @data['address']['state']
+    end
+
+    alias_method :state_code, :state
+
+    def postal_code
+      @data['address']['postcode']
+    end
+
+    def county
+      @data['address']['county']
+    end
+
+    def country
+      @data['address']['country']
+    end
+
+    def country_code
+      @data['address']['country_code']
+    end
+
+    def coordinates
+      [@data['lat'].to_f, @data['lon'].to_f]
+    end
+
+    def self.response_attributes
+      %w[place_id boundingbox license polygonpoints display_name class type stadium suburb]
+    end
+
+    response_attributes.each do |a|
+      define_method a do
+        @data[a]
+      end
+    end
+  end
+end

data/lib/geocoder/results/nominatim.rb

@@ -3,6 +3,12 @@ require 'geocoder/results/base'
 module Geocoder::Result
   class Nominatim < Base
 
+    def poi
+      %w[stadium bus_stop tram_stop].each do |key|
+        @data['address'][key] if @data['address'].key?(key)
+      end
+    end
+
     def house_number
       @data['address']['house_number']
     end
@@ -12,11 +18,17 @@ module Geocoder::Result
     end
 
     def street
-      @data['address']['road']
+      %w[road pedestrian highway].each do |key|
+        return @data['address'][key] if @data['address'].key?(key)
+      end
+      return nil
     end
 
     def city
-      @data['address']['city']
+      %w[city town village hamlet].each do |key|
+        return @data['address'][key] if @data['address'].key?(key)
+      end
+      return nil
     end
 
     def village
@@ -49,13 +61,17 @@ module Geocoder::Result
       @data['address']['country_code']
     end
 
+    def suburb
+      @data['address']['suburb']
+    end
+
     def coordinates
       [@data['lat'].to_f, @data['lon'].to_f]
     end
 
     def self.response_attributes
-      %w[place_id, osm_type, osm_id, boundingbox, license,
-         polygonpoints, display_name, class, type, stadium, suburb]
+      %w[place_id osm_type osm_id boundingbox license
+         polygonpoints display_name class type stadium]
     end
 
     response_attributes.each do |a|

data/lib/geocoder/results/test.rb

@@ -0,0 +1,15 @@
+require 'geocoder/results/base'
+
+module Geocoder
+  module Result
+    class Test < Base
+
+      %w[latitude longitude city state state_code province
+      province_code postal_code country country_code address].each do |attr|
+        define_method(attr) do
+          @data[attr.to_s] || @data[attr.to_sym]
+        end
+      end
+    end
+  end
+end

data/lib/geocoder/results/yandex.rb

@@ -57,6 +57,10 @@ module Geocoder::Result
       address_details['Locality']['Premise']['PremiseName']
     end
 
+    def precision
+      @data['GeoObject']['metaDataProperty']['GeocoderMetaData']['precision']
+    end
+
     private # ----------------------------------------------------------------
 
     def address_details

data/lib/geocoder/stores/active_record.rb

@@ -33,7 +33,7 @@ module Geocoder::Store
         #
         scope :near, lambda{ |location, *args|
           latitude, longitude = Geocoder::Calculations.extract_coordinates(location)
-          if latitude and longitude and ![latitude, longitude].include?(Geocoder::Calculations::NAN)
+          if Geocoder::Calculations.coordinates_present?(latitude, longitude)
             near_scope_options(latitude, longitude, *args)
           else
             where(false_condition) # no results if no lat/lon given
@@ -68,7 +68,9 @@ module Geocoder::Store
 
       def distance_from_sql(location, *args)
         latitude, longitude = Geocoder::Calculations.extract_coordinates(location)
-        distance_from_sql_options(latitude, longitude, *args) if latitude and longitude
+        if Geocoder::Calculations.coordinates_present?(latitude, longitude)
+          distance_from_sql_options(latitude, longitude, *args)
+        end
       end
 
       private # ----------------------------------------------------------------
@@ -202,21 +204,21 @@ module Geocoder::Store
         end
         if options[:bearing]
           bearing = "CASE " +
-            "WHEN (#{lat_attr} >= #{latitude} AND #{lon_attr} >= #{longitude}) THEN  45.0 " +
-            "WHEN (#{lat_attr} <  #{latitude} AND #{lon_attr} >= #{longitude}) THEN 135.0 " +
-            "WHEN (#{lat_attr} <  #{latitude} AND #{lon_attr} <  #{longitude}) THEN 225.0 " +
-            "WHEN (#{lat_attr} >= #{latitude} AND #{lon_attr} <  #{longitude}) THEN 315.0 " +
+            "WHEN (#{full_column_name(lat_attr)} >= #{latitude} AND #{full_column_name(lon_attr)} >= #{longitude}) THEN  45.0 " +
+            "WHEN (#{full_column_name(lat_attr)} <  #{latitude} AND #{full_column_name(lon_attr)} >= #{longitude}) THEN 135.0 " +
+            "WHEN (#{full_column_name(lat_attr)} <  #{latitude} AND #{full_column_name(lon_attr)} <  #{longitude}) THEN 225.0 " +
+            "WHEN (#{full_column_name(lat_attr)} >= #{latitude} AND #{full_column_name(lon_attr)} <  #{longitude}) THEN 315.0 " +
           "END"
         else
           bearing = false
         end
 
-        distance = approx_distance_from_sql(latitude, longitude, options)
         options[:units] ||= (geocoder_options[:units] || Geocoder::Configuration.units)
+        distance = approx_distance_from_sql(latitude, longitude, options)
 
         b = Geocoder::Calculations.bounding_box([latitude, longitude], radius, options)
         conditions = [
-          "#{lat_attr} BETWEEN ? AND ? AND #{lon_attr} BETWEEN ? AND ?"] +
+          "#{full_column_name(lat_attr)} BETWEEN ? AND ? AND #{full_column_name(lon_attr)} BETWEEN ? AND ?"] +
           [b[0], b[2], b[1], b[3]
         ]
         default_near_scope_options(latitude, longitude, radius, options).merge(

data/lib/geocoder/version.rb

@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/test/calculations_test.rb

@@ -152,24 +152,24 @@ class CalculationsTest < Test::Unit::TestCase
 
   def test_extract_coordinates
     result = Geocoder::Calculations.extract_coordinates([ nil, nil ])
-    assert_equal [ Geocoder::Calculations::NAN ] * 2, result
+    assert is_nan_coordinates?(result)
 
     result = Geocoder::Calculations.extract_coordinates([ 1.0 / 3, 2.0 / 3 ])
     assert_in_delta 1.0 / 3, result.first, 1E-5
     assert_in_delta 2.0 / 3, result.last, 1E-5
 
     result = Geocoder::Calculations.extract_coordinates(nil)
-    assert_equal [ Geocoder::Calculations::NAN ] * 2, result
+    assert is_nan_coordinates?(result)
 
     result = Geocoder::Calculations.extract_coordinates('')
-    assert_equal [ Geocoder::Calculations::NAN ] * 2, result
+    assert is_nan_coordinates?(result)
 
     result = Geocoder::Calculations.extract_coordinates([ 'nix' ])
-    assert_equal [ Geocoder::Calculations::NAN ] * 2, result
+    assert is_nan_coordinates?(result)
 
     o = Object.new
     result = Geocoder::Calculations.extract_coordinates(o)
-    assert_equal [ Geocoder::Calculations::NAN ] * 2, result
+    assert is_nan_coordinates?(result)
 
     def o.to_coordinates
       [ 1.0 / 3, 2.0 / 3 ]
@@ -178,5 +178,11 @@ class CalculationsTest < Test::Unit::TestCase
     assert_in_delta 1.0 / 3, result.first, 1E-5
     assert_in_delta 2.0 / 3, result.last, 1E-5
   end
-end
 
+  def test_coordinates_present
+    assert Geocoder::Calculations.coordinates_present?(3.23)
+    assert !Geocoder::Calculations.coordinates_present?(nil)
+    assert !Geocoder::Calculations.coordinates_present?(Geocoder::Calculations::NAN)
+    assert !Geocoder::Calculations.coordinates_present?(3.23, nil)
+  end
+end

data/test/error_handling_test.rb

@@ -10,7 +10,7 @@ class ErrorHandlingTest < Test::Unit::TestCase
   def test_does_not_choke_on_timeout
     # keep test output clean: suppress timeout warning
     orig = $VERBOSE; $VERBOSE = nil
-    all_lookups.each do |l|
+    all_lookups_except_test.each do |l|
       Geocoder::Configuration.lookup = l
       assert_nothing_raised { Geocoder.search("timeout") }
     end
@@ -19,7 +19,7 @@ class ErrorHandlingTest < Test::Unit::TestCase
 
   def test_always_raise_timeout_error
     Geocoder::Configuration.always_raise = [TimeoutError]
-    all_lookups.each do |l|
+    all_lookups_except_test.each do |l|
       lookup = Geocoder.send(:get_lookup, l)
       assert_raises TimeoutError do
         lookup.send(:results, "timeout")
@@ -29,7 +29,7 @@ class ErrorHandlingTest < Test::Unit::TestCase
 
   def test_always_raise_socket_error
     Geocoder::Configuration.always_raise = [SocketError]
-    all_lookups.each do |l|
+    all_lookups_except_test.each do |l|
       lookup = Geocoder.send(:get_lookup, l)
       assert_raises SocketError do
         lookup.send(:results, "socket_error")

data/test/fixtures/mapquest_madison_square_garden.json

@@ -0,0 +1,27 @@
+[
+  {
+    "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

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

data/test/lookup_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 class LookupTest < Test::Unit::TestCase
 
   def test_search_returns_empty_array_when_no_results
-    all_lookups.each do |l|
+    all_lookups_except_test.each do |l|
       lookup = Geocoder.send(:get_lookup, l)
       assert_equal [], lookup.send(:results, "no results"),
         "Lookup #{l} does not return empty array when no results."

data/test/mongoid_test.rb

@@ -17,7 +17,8 @@ class MongoidTest < Test::Unit::TestCase
   def test_custom_coordinate_field_near_scope
     location = [40.750354, -73.993371]
     p = Place.near(location)
-    assert_equal p.selector[:location]['$nearSphere'], location.reverse
+    key = Mongoid::VERSION >= "3" ? "location" : :location
+    assert_equal p.selector[key]['$nearSphere'], location.reverse
   end
 
   def test_model_configuration

data/test/mongoid_test_helper.rb

@@ -7,8 +7,12 @@ require 'geocoder/models/mongoid'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-Mongoid.configure do |config|
-  config.logger = Logger.new($stderr, :debug)
+if (::Mongoid::VERSION >= "3")
+  Mongoid.logger = Logger.new($stderr, :debug)
+else
+  Mongoid.configure do |config|
+    config.logger = Logger.new($stderr, :debug)
+  end
 end
 
 ##

data/test/result_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 class ResultTest < Test::Unit::TestCase
 
   def test_result_has_required_attributes
-    all_lookups.each do |l|
+    all_lookups_except_test.each do |l|
       Geocoder::Configuration.lookup = l
       result = Geocoder.search([45.423733, -75.676333]).first
       assert_result_has_required_attributes(result)

data/test/test_helper.rb

@@ -163,6 +163,19 @@ module Geocoder
       end
     end
 
+    class Mapquest < Base
+      private #-----------------------------------------------------------------
+      def fetch_raw_data(query, reverse = false)
+        raise TimeoutError if query == "timeout"
+        raise SocketError if query == "socket_error"
+        file = case query
+          when "no results";  :no_results
+          else                :madison_square_garden
+        end
+        read_fixture "mapquest_#{file}.json"
+      end
+    end
+
   end
 end
 
@@ -268,8 +281,18 @@ class Test::Unit::TestCase
     Geocoder.valid_lookups
   end
 
+  def all_lookups_except_test
+    Geocoder.valid_lookups - [:test]
+  end
+
   def street_lookups
     all_lookups - [:freegeoip]
   end
+
+  def is_nan_coordinates?(coordinates)
+    return false unless coordinates.respond_to? :size # Should be an array
+    return false unless coordinates.size == 2 # Should have dimension 2
+    coordinates[0].nan? && coordinates[1].nan? # Both coordinates should be NaN
+  end
 end
 

data/test/test_mode_test.rb

@@ -0,0 +1,51 @@
+require 'test_helper'
+require 'geocoder/lookups/test'
+
+class TestModeTest < Test::Unit::TestCase
+
+  def setup
+    @_original_lookup = Geocoder::Configuration.lookup
+    Geocoder::Configuration.lookup = :test
+  end
+
+  def teardown
+    Geocoder::Lookup::Test.reset
+    Geocoder::Configuration.lookup = @_original_lookup
+  end
+
+  def test_search_with_known_stub
+    coordinates = [40.7143528, -74.0059731]
+    attributes = {
+      'coordinates'  => coordinates,
+      'latitude'     => coordinates[0],
+      'longitude'    => coordinates[1],
+      'address'      => 'New York, NY, USA',
+      'state'        => 'New York',
+      'state_code'   => 'NY',
+      '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,34 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: geocoder
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.3
   prerelease: 
-  version: 1.1.2
 platform: ruby
-authors: 
+authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-24 00:00:00 Z
+date: 2012-08-26 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, result caching, and more. Designed for Rails but works with Sinatra and other Rack frameworks too.
-email: 
+description: Provides object geocoding (by street or IP address), reverse geocoding
+  (coordinates to street address), distance queries for ActiveRecord and Mongoid,
+  result caching, and more. Designed for Rails but works with Sinatra and other Rack
+  frameworks too.
+email:
 - alex@alexreisner.com
-executables: 
+executables:
 - geocode
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
 - Rakefile
 - bin/geocode
+- gemfiles/Gemfile.mongoid-2.4.x
 - lib/generators/geocoder/config/config_generator.rb
 - lib/generators/geocoder/config/templates/initializer.rb
 - lib/geocoder.rb
@@ -43,7 +44,9 @@ files:
 - 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/nominatim.rb
+- lib/geocoder/lookups/test.rb
 - lib/geocoder/lookups/yahoo.rb
 - lib/geocoder/lookups/yandex.rb
 - lib/geocoder/models/active_record.rb
@@ -59,7 +62,9 @@ files:
 - 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/nominatim.rb
+- lib/geocoder/results/test.rb
 - lib/geocoder/results/yahoo.rb
 - lib/geocoder/results/yandex.rb
 - lib/geocoder/stores/active_record.rb
@@ -86,6 +91,8 @@ files:
 - 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_garbage.json
@@ -106,32 +113,35 @@ files:
 - test/result_test.rb
 - test/services_test.rb
 - test/test_helper.rb
+- test/test_mode_test.rb
 homepage: http://www.rubygeocoder.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 585705263
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 585705263
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Complete geocoding solution for Ruby.
 test_files: []
-