geocoder 1.1.4 → 1.1.5

data/test/lookup_test.rb

@@ -6,6 +6,7 @@ class LookupTest < Test::Unit::TestCase
   def test_search_returns_empty_array_when_no_results
     Geocoder::Lookup.all_services_except_test.each do |l|
       lookup = Geocoder::Lookup.get(l)
+      set_api_key!(l)
       assert_equal [], lookup.send(:results, Geocoder::Query.new("no results")),
         "Lookup #{l} does not return empty array when no results."
     end
@@ -29,12 +30,6 @@ class LookupTest < Test::Unit::TestCase
     assert_match "key=MY_KEY", g.send(:query_url, Geocoder::Query.new("Madison Square Garden, New York, NY  10001, United States"))
   end
 
-  def test_yahoo_app_id
-    Geocoder::Configuration.api_key = "MY_KEY"
-    g = Geocoder::Lookup::Yahoo.new
-    assert_match "appid=MY_KEY", g.send(:query_url, Geocoder::Query.new("Madison Square Garden, New York, NY  10001, United States"))
-  end
-
   def test_geocoder_ca_showpostal
     Geocoder::Configuration.api_key = "MY_KEY"
     g = Geocoder::Lookup::GeocoderCa.new

data/test/near_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class NearTest < Test::Unit::TestCase
+
+  def test_near_scope_options_without_sqlite_includes_bounding_box_condition
+    result = Event.send(:near_scope_options, 1.0, 2.0, 5)
+
+    assert_match /test_table_name.latitude BETWEEN 0.9276\d* AND 1.0723\d* AND test_table_name.longitude BETWEEN 1.9276\d* AND 2.0723\d* AND /,
+      result[:conditions][0]
+  end
+end

data/test/query_test.rb

@@ -20,6 +20,11 @@ class QueryTest < Test::Unit::TestCase
     assert !Geocoder::Query.new("Москва").blank? # no ASCII characters
   end
 
+  def test_blank_query_detection_for_coordinates
+    assert Geocoder::Query.new([nil,nil]).blank?
+    assert Geocoder::Query.new([87,nil]).blank?
+  end
+
   def test_coordinates_detection
     assert Geocoder::Query.new("51.178844,5").coordinates?
     assert Geocoder::Query.new("51.178844, -1.826189").coordinates?

data/test/result_test.rb

@@ -6,6 +6,7 @@ class ResultTest < Test::Unit::TestCase
   def test_result_has_required_attributes
     Geocoder::Lookup.all_services_except_test.each do |l|
       Geocoder::Configuration.lookup = l
+      set_api_key!(l)
       result = Geocoder.search([45.423733, -75.676333]).first
       assert_result_has_required_attributes(result)
     end

data/test/services_test.rb

@@ -6,12 +6,13 @@ class ServicesTest < Test::Unit::TestCase
 
   def test_query_url_contains_values_in_params_hash
     Geocoder::Lookup.all_services_except_test.each do |l|
-      next if l == :google_premier # TODO: need to set keys to test
       next if l == :freegeoip # does not use query string
+      set_api_key!(l)
       url = Geocoder::Lookup.get(l).send(:query_url, Geocoder::Query.new(
         "test", :params => {:one_in_the_hand => "two in the bush"}
       ))
-      assert_match /one_in_the_hand=two\+in\+the\+bush/, url,
+      # should be "+"s for all lookups except Yahoo
+      assert_match /one_in_the_hand=two(%20|\+)in(%20|\+)the(%20|\+)bush/, url,
         "Lookup #{l} does not appear to support arbitrary params in URL"
     end
   end
@@ -53,6 +54,7 @@ class ServicesTest < Test::Unit::TestCase
 
   def test_google_premier_result_components
     Geocoder::Configuration.lookup = :google_premier
+    set_api_key!(:google_premier)
     result = Geocoder.search("Madison Square Garden, New York, NY").first
     assert_equal "Manhattan",
       result.address_components_of_type(:sublocality).first['long_name']
@@ -67,37 +69,29 @@ class ServicesTest < Test::Unit::TestCase
 
   # --- Yahoo ---
 
-  def test_yahoo_v1_no_results
+  def test_yahoo_no_results
     Geocoder::Configuration.lookup = :yahoo
-    assert_equal [], Geocoder.search("no results v1")
-  end
-
-  def test_yahoo_v1_result_components
-    Geocoder::Configuration.lookup = :yahoo
-    result = Geocoder.search("madison square garden v1").first
-    assert_equal "10001", result.postal_code
-  end
-
-  def test_yahoo_v1_address_formatting
-    Geocoder::Configuration.lookup = :yahoo
-    result = Geocoder.search("madison square garden v1").first
-    assert_equal "Madison Square Garden, New York, NY  10001, United States", result.address
+    assert_equal [], Geocoder.search("no results")
   end
 
-  def test_yahoo_v2_no_results
+  def test_yahoo_error
     Geocoder::Configuration.lookup = :yahoo
-    assert_equal [], Geocoder.search("no results")
+    # keep test output clean: suppress timeout warning
+    orig = $VERBOSE; $VERBOSE = nil
+    assert_equal [], Geocoder.search("error")
+  ensure
+    $VERBOSE = orig
   end
 
-  def test_yahoo_v2_result_components
+  def test_yahoo_result_components
     Geocoder::Configuration.lookup = :yahoo
-    result = Geocoder.search("madison square garden v2").first
+    result = Geocoder.search("madison square garden").first
     assert_equal "10001", result.postal_code
   end
 
-  def test_yahoo_v2_address_formatting
+  def test_yahoo_address_formatting
     Geocoder::Configuration.lookup = :yahoo
-    result = Geocoder.search("madison square garden v2").first
+    result = Geocoder.search("madison square garden").first
     assert_equal "Madison Square Garden, New York, NY 10001, United States", result.address
   end
 
@@ -109,6 +103,7 @@ class ServicesTest < Test::Unit::TestCase
     orig = $VERBOSE; $VERBOSE = nil
     Geocoder::Configuration.lookup = :yandex
     assert_equal [], Geocoder.search("invalid key")
+  ensure
     $VERBOSE = orig
   end
 
@@ -154,7 +149,7 @@ class ServicesTest < Test::Unit::TestCase
 
   # --- Nominatim ---
 
-   def test_nominatim_result_components
+  def test_nominatim_result_components
     Geocoder::Configuration.lookup = :nominatim
     result = Geocoder.search("Madison Square Garden, New York, NY").first
     assert_equal "10001", result.postal_code
@@ -166,4 +161,29 @@ class ServicesTest < Test::Unit::TestCase
     assert_equal "Madison Square Garden, West 31st Street, Long Island City, New York City, New York, 10001, United States of America",
       result.address
   end
+  # --- MapQuest ---
+
+  def test_api_route
+    Geocoder::Configuration.lookup = :mapquest
+    Geocoder::Configuration.api_key = "abc123"
+
+    lookup = Geocoder::Lookup::Mapquest.new
+    query = Geocoder::Query.new("Bluffton, SC")
+    res = lookup.send(:query_url, query)
+    assert_equal "http://www.mapquestapi.com/geocoding/v1/address?key=abc123&location=Bluffton%2C+SC",
+      res
+  end
+
+  def test_mapquest_result_components
+    Geocoder::Configuration.lookup = :mapquest
+    result = Geocoder.search("Madison Square Garden, New York, NY").first
+    assert_equal "10001", result.postal_code
+  end
+
+  def test_mapquest_address_formatting
+    Geocoder::Configuration.lookup = :mapquest
+    result = Geocoder.search("Madison Square Garden, New York, NY").first
+    assert_equal "46 West 31st Street, New York, NY, 10001, US",
+      result.address
+  end
 end

data/test/test_helper.rb

@@ -4,6 +4,12 @@ require 'test/unit'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+class MysqlConnection
+  def adapter_name
+    "mysql"
+  end
+end
+
 ##
 # Simulate enough of ActiveRecord::Base that objects can be used for testing.
 #
@@ -28,6 +34,10 @@ module ActiveRecord
 
     def self.scope(*args); end
 
+    def self.connection
+      MysqlConnection.new
+    end
+
     def method_missing(name, *args, &block)
       if name.to_s[-1..-1] == "="
         write_attribute name.to_s[0...-1], *args
@@ -65,13 +75,19 @@ module Geocoder
     class Base
       private #-----------------------------------------------------------------
       def read_fixture(file)
-        File.read(File.join("test", "fixtures", file)).strip.gsub(/\n\s*/, "")
+        filepath = File.join("test", "fixtures", file)
+        s = File.read(filepath).strip.gsub(/\n\s*/, "")
+        s.instance_eval do
+          def body; self; end
+          def code; "200"; end
+        end
+        s
       end
     end
 
     class Google < Base
       private #-----------------------------------------------------------------
-      def fetch_raw_data(query)
+      def make_api_request(query)
         raise TimeoutError if query.text == "timeout"
         raise SocketError if query.text == "socket_error"
         file = case query.text
@@ -89,14 +105,13 @@ module Geocoder
 
     class Yahoo < Base
       private #-----------------------------------------------------------------
-      def fetch_raw_data(query)
+      def make_api_request(query)
         raise TimeoutError if query.text == "timeout"
         raise SocketError if query.text == "socket_error"
         file = case query.text
-          when "no results v1"; :v1_no_results
-          when "madison square garden v1"; :v1_madison_square_garden
-          when "no results";    :no_results
-          else                  :madison_square_garden
+          when "no results"; :no_results
+          when "error";      :error
+          else               :madison_square_garden
         end
         read_fixture "yahoo_#{file}.json"
       end
@@ -104,7 +119,7 @@ module Geocoder
 
     class Yandex < Base
       private #-----------------------------------------------------------------
-      def fetch_raw_data(query)
+      def make_api_request(query)
         raise TimeoutError if query.text == "timeout"
         raise SocketError if query.text == "socket_error"
         file = case query.text
@@ -118,7 +133,7 @@ module Geocoder
 
     class GeocoderCa < Base
       private #-----------------------------------------------------------------
-      def fetch_raw_data(query)
+      def make_api_request(query)
         raise TimeoutError if query.text == "timeout"
         raise SocketError if query.text == "socket_error"
         if query.reverse_geocode?
@@ -135,7 +150,7 @@ module Geocoder
 
     class Freegeoip < Base
       private #-----------------------------------------------------------------
-      def fetch_raw_data(query)
+      def make_api_request(query)
         raise TimeoutError if query.text == "timeout"
         raise SocketError if query.text == "socket_error"
         file = case query.text
@@ -148,7 +163,7 @@ module Geocoder
 
     class Bing < Base
       private #-----------------------------------------------------------------
-      def fetch_raw_data(query)
+      def make_api_request(query)
         raise TimeoutError if query.text == "timeout"
         raise SocketError if query.text == "socket_error"
         if query.reverse_geocode?
@@ -165,7 +180,7 @@ module Geocoder
 
     class Nominatim < Base
       private #-----------------------------------------------------------------
-      def fetch_raw_data(query)
+      def make_api_request(query)
         raise TimeoutError if query.text == "timeout"
         raise SocketError if query.text == "socket_error"
         file = case query.text
@@ -176,9 +191,9 @@ module Geocoder
       end
     end
 
-    class Mapquest < Nominatim
+    class Mapquest < Base
       private #-----------------------------------------------------------------
-      def fetch_raw_data(query)
+      def make_api_request(query)
         raise TimeoutError if query.text == "timeout"
         raise SocketError if query.text == "socket_error"
         file = case query.text
@@ -309,5 +324,21 @@ class Test::Unit::TestCase
     return false unless coordinates.size == 2 # Should have dimension 2
     coordinates[0].nan? && coordinates[1].nan? # Both coordinates should be NaN
   end
-end
 
+  def set_api_key!(lookup_name)
+    if lookup_name == :google_premier
+      Geocoder::Configuration.api_key = [
+        'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+        'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+        'cccccccccccccccccccccccccccccc'
+      ]
+    elsif lookup_name == :yahoo
+      Geocoder::Configuration.api_key = [
+        'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+        'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
+      ]
+    else
+      Geocoder::Configuration.api_key = nil
+    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.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-11-09 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,
@@ -77,8 +77,10 @@ files:
 - lib/geocoder/stores/mongo_mapper.rb
 - lib/geocoder/stores/mongoid.rb
 - lib/geocoder/version.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
@@ -100,10 +102,9 @@ files:
 - test/fixtures/mapquest_no_results.json
 - test/fixtures/nominatim_madison_square_garden.json
 - test/fixtures/nominatim_no_results.json
+- test/fixtures/yahoo_error.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
@@ -114,6 +115,7 @@ files:
 - test/method_aliases_test.rb
 - test/mongoid_test.rb
 - test/mongoid_test_helper.rb
+- test/near_test.rb
 - test/proxy_test.rb
 - test/query_test.rb
 - test/result_test.rb
@@ -134,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -301313299
+      hash: -57977969
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -143,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -301313299
+      hash: -57977969
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

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
-  }
-}