geocoder 1.1.3 → 1.1.4

data/lib/geocoder/stores/mongo_base.rb

@@ -59,7 +59,7 @@ module Geocoder::Store
       do_lookup(false) do |o,rs|
         if r = rs.first
           unless r.coordinates.nil?
-            o.send :write_attribute, self.class.geocoder_options[:coordinates], r.coordinates.reverse
+            o.__send__ "#{self.class.geocoder_options[:coordinates]}=", r.coordinates.reverse
           end
           r.coordinates
         end
@@ -74,7 +74,7 @@ module Geocoder::Store
       do_lookup(true) do |o,rs|
         if r = rs.first
           unless r.address.nil?
-            o.send :write_attribute, self.class.geocoder_options[:fetched_address], r.address
+            o.__send__ "#{self.class.geocoder_options[:fetched_address]}=", r.address
           end
           r.address
         end

data/lib/geocoder/version.rb

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

data/test/active_record_test.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+require 'test_helper'
+
+class ActiveRecordTest < Test::Unit::TestCase
+
+  def test_exclude_condition_when_model_has_a_custom_primary_key
+    venue = VenuePlus.new(*venue_params(:msg))
+
+    # just call private method directly so we don't have to stub .near scope
+    conditions = venue.class.send(:add_exclude_condition, ["fake_condition"], venue)
+
+    assert_match( /#{VenuePlus.primary_key}/, conditions.join)
+  end
+
+end

data/test/calculations_test.rb

@@ -185,4 +185,11 @@ class CalculationsTest < Test::Unit::TestCase
     assert !Geocoder::Calculations.coordinates_present?(Geocoder::Calculations::NAN)
     assert !Geocoder::Calculations.coordinates_present?(3.23, nil)
   end
+
+  def test_extract_coordinates
+    coords = [-23,47]
+    l = Landmark.new("Madagascar", coords[0], coords[1])
+    assert_equal coords, Geocoder::Calculations.extract_coordinates(l)
+    assert_equal coords, Geocoder::Calculations.extract_coordinates(coords)
+  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_except_test.each do |l|
+    Geocoder::Lookup.all_services_except_test.each do |l|
       Geocoder::Configuration.lookup = l
       assert_nothing_raised { Geocoder.search("timeout") }
     end
@@ -19,20 +19,20 @@ class ErrorHandlingTest < Test::Unit::TestCase
 
   def test_always_raise_timeout_error
     Geocoder::Configuration.always_raise = [TimeoutError]
-    all_lookups_except_test.each do |l|
-      lookup = Geocoder.send(:get_lookup, l)
+    Geocoder::Lookup.all_services_except_test.each do |l|
+      lookup = Geocoder::Lookup.get(l)
       assert_raises TimeoutError do
-        lookup.send(:results, "timeout")
+        lookup.send(:results, Geocoder::Query.new("timeout"))
       end
     end
   end
 
   def test_always_raise_socket_error
     Geocoder::Configuration.always_raise = [SocketError]
-    all_lookups_except_test.each do |l|
-      lookup = Geocoder.send(:get_lookup, l)
+    Geocoder::Lookup.all_services_except_test.each do |l|
+      lookup = Geocoder::Lookup.get(l)
       assert_raises SocketError do
-        lookup.send(:results, "socket_error")
+        lookup.send(:results, Geocoder::Query.new("socket_error"))
       end
     end
   end

data/test/fixtures/yahoo_madison_square_garden.json

@@ -1,46 +1,52 @@
 {
-  "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"}
-    }]
+  "@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_v1_madison_square_garden.json

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

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

data/test/https_test.rb

@@ -6,11 +6,11 @@ class HttpsTest < Test::Unit::TestCase
   def test_uses_https_for_secure_query
     Geocoder::Configuration.use_https = true
     g = Geocoder::Lookup::Google.new
-    assert_match /^https:/, g.send(:query_url, {:a => 1, :b => 2})
+    assert_match /^https:/, g.send(:query_url, Geocoder::Query.new("test"))
   end
 
   def test_uses_http_by_default
     g = Geocoder::Lookup::Google.new
-    assert_match /^http:/, g.send(:query_url, {:a => 1, :b => 2})
+    assert_match /^http:/, g.send(:query_url, Geocoder::Query.new("test"))
   end
 end

data/test/integration/smoke_test.rb

@@ -8,15 +8,17 @@ class SmokeTest < Test::Unit::TestCase
 
   def test_simple_zip_code_search
     result = Geocoder.search "27701"
-    assert_equal "Durham", result.first.city
-    assert_equal "North Carolina", result.first.state
+    assert_not_nil (r = result.first)
+    assert_equal "Durham", r.city
+    assert_equal "North Carolina", r.state
   end
 
   def test_simple_zip_code_search_with_ssl
     Geocoder::Configuration.use_https = true
     result = Geocoder.search "27701"
-    assert_equal "Durham", result.first.city
-    assert_equal "North Carolina", result.first.state
+    assert_not_nil (r = result.first)
+    assert_equal "Durham", r.city
+    assert_equal "North Carolina", r.state
   ensure
     Geocoder::Configuration.use_https = false
   end

data/test/lookup_test.rb

@@ -4,13 +4,20 @@ require 'test_helper'
 class LookupTest < Test::Unit::TestCase
 
   def test_search_returns_empty_array_when_no_results
-    all_lookups_except_test.each do |l|
-      lookup = Geocoder.send(:get_lookup, l)
-      assert_equal [], lookup.send(:results, "no results"),
+    Geocoder::Lookup.all_services_except_test.each do |l|
+      lookup = Geocoder::Lookup.get(l)
+      assert_equal [], lookup.send(:results, Geocoder::Query.new("no results")),
         "Lookup #{l} does not return empty array when no results."
     end
   end
 
+  def test_does_not_choke_on_nil_address
+    Geocoder::Lookup.all_services.each do |l|
+      Geocoder::Configuration.lookup = l
+      assert_nothing_raised { Venue.new("Venue", nil).geocode }
+    end
+  end
+
   def test_hash_to_query
     g = Geocoder::Lookup::Google.new
     assert_equal "a=1&b=2", g.send(:hash_to_query, {:a => 1, :b => 2})
@@ -19,19 +26,19 @@ class LookupTest < Test::Unit::TestCase
   def test_google_api_key
     Geocoder::Configuration.api_key = "MY_KEY"
     g = Geocoder::Lookup::Google.new
-    assert_match "key=MY_KEY", g.send(:query_url, "Madison Square Garden, New York, NY  10001, United States")
+    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, "Madison Square Garden, New York, NY  10001, United States")
+    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
-    assert_match "showpostal=1", g.send(:query_url, "Madison Square Garden, New York, NY  10001, United States")
+    assert_match "showpostal=1", g.send(:query_url, Geocoder::Query.new("Madison Square Garden, New York, NY  10001, United States"))
   end
 
 end

data/test/query_test.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+require 'test_helper'
+
+class QueryTest < Test::Unit::TestCase
+
+  def test_ip_address_detection
+    assert Geocoder::Query.new("232.65.123.94").ip_address?
+    assert Geocoder::Query.new("666.65.123.94").ip_address? # technically invalid
+    assert Geocoder::Query.new("::ffff:12.34.56.78").ip_address?
+    assert !Geocoder::Query.new("232.65.123.94.43").ip_address?
+    assert !Geocoder::Query.new("232.65.123").ip_address?
+    assert !Geocoder::Query.new("::ffff:123.456.789").ip_address?
+  end
+
+  def test_blank_query_detection
+    assert Geocoder::Query.new(nil).blank?
+    assert Geocoder::Query.new("").blank?
+    assert Geocoder::Query.new("\t  ").blank?
+    assert !Geocoder::Query.new("a").blank?
+    assert !Geocoder::Query.new("Москва").blank? # no ASCII characters
+  end
+
+  def test_coordinates_detection
+    assert Geocoder::Query.new("51.178844,5").coordinates?
+    assert Geocoder::Query.new("51.178844, -1.826189").coordinates?
+    assert !Geocoder::Query.new("232.65.123").coordinates?
+  end
+
+  def test_loopback_ip_address
+    assert Geocoder::Query.new("0.0.0.0").loopback_ip_address?
+    assert Geocoder::Query.new("127.0.0.1").loopback_ip_address?
+    assert !Geocoder::Query.new("232.65.123.234").loopback_ip_address?
+  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_except_test.each do |l|
+    Geocoder::Lookup.all_services_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/services_test.rb

@@ -4,6 +4,18 @@ require 'test_helper'
 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
+      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,
+        "Lookup #{l} does not appear to support arbitrary params in URL"
+    end
+  end
+
   # --- Google ---
 
   def test_google_result_components
@@ -28,6 +40,14 @@ class ServicesTest < Test::Unit::TestCase
       result.precision
   end
 
+  def test_google_query_url_contains_bounds
+    lookup = Geocoder::Lookup::Google.new
+    url = lookup.send(:query_url, Geocoder::Query.new(
+      "Some Intersection",
+      :bounds => [[40.0, -120.0], [39.0, -121.0]]
+    ))
+    assert_match /bounds=40.0+%2C-120.0+%7C39.0+%2C-121.0+/, url
+  end
 
   # --- Google Premier ---
 
@@ -41,23 +61,44 @@ class ServicesTest < Test::Unit::TestCase
   def test_google_premier_query_url
     Geocoder::Configuration.api_key = ["deadbeef", "gme-test", "test-dev"]
     assert_equal "http://maps.googleapis.com/maps/api/geocode/json?address=Madison+Square+Garden%2C+New+York%2C+NY&channel=test-dev&client=gme-test&language=en&sensor=false&signature=doJvJqX7YJzgV9rJ0DnVkTGZqTg=",
-      Geocoder::Lookup::GooglePremier.new.send(:query_url, "Madison Square Garden, New York, NY", false)
+      Geocoder::Lookup::GooglePremier.new.send(:query_url, Geocoder::Query.new("Madison Square Garden, New York, NY"))
   end
 
 
   # --- Yahoo ---
 
-  def test_yahoo_result_components
+  def test_yahoo_v1_no_results
     Geocoder::Configuration.lookup = :yahoo
-    result = Geocoder.search("Madison Square Garden, New York, NY").first
+    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_address_formatting
+  def test_yahoo_v1_address_formatting
     Geocoder::Configuration.lookup = :yahoo
-    result = Geocoder.search("Madison Square Garden, New York, NY").first
-    assert_equal "Madison Square Garden, New York, NY  10001, United States",
-      result.address
+    result = Geocoder.search("madison square garden v1").first
+    assert_equal "Madison Square Garden, New York, NY  10001, United States", result.address
+  end
+
+  def test_yahoo_v2_no_results
+    Geocoder::Configuration.lookup = :yahoo
+    assert_equal [], Geocoder.search("no results")
+  end
+
+  def test_yahoo_v2_result_components
+    Geocoder::Configuration.lookup = :yahoo
+    result = Geocoder.search("madison square garden v2").first
+    assert_equal "10001", result.postal_code
+  end
+
+  def test_yahoo_v2_address_formatting
+    Geocoder::Configuration.lookup = :yahoo
+    result = Geocoder.search("madison square garden v2").first
+    assert_equal "Madison Square Garden, New York, NY 10001, United States", result.address
   end