geocoder 0.9.13 → 1.0.0

data/lib/geocoder/results/yandex.rb

@@ -0,0 +1,48 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class Yandex < Base
+
+    def coordinates
+      @data['GeoObject']['Point']['pos'].split(' ').reverse.map(&:to_f)
+    end
+
+    def address(format = :full)
+      @data['GeoObject']['metaDataProperty']['GeocoderMetaData']['text']
+    end
+
+    def city
+      address_details['Locality']['LocalityName']
+    end
+
+    def country
+      address_details['CountryName']
+    end
+
+    def country_code
+      address_details['CountryNameCode']
+    end
+
+    def state
+      ""
+    end
+
+    def state_code
+      ""
+    end
+
+    def postal_code
+      ""
+    end
+
+    def premise_name
+      address_details['Locality']['Premise']['PremiseName']
+    end
+
+    private # ----------------------------------------------------------------
+
+    def address_details
+      @data['GeoObject']['metaDataProperty']['GeocoderMetaData']['AddressDetails']['Country']
+    end
+  end
+end

data/lib/geocoder/stores/active_record.rb

@@ -1,5 +1,4 @@
 require 'geocoder/stores/base'
-require 'geocoder/stores/active_record_legacy'
 
 ##
 # Add geocoding functionality to any ActiveRecord object.
@@ -7,7 +6,6 @@ require 'geocoder/stores/active_record_legacy'
 module Geocoder::Store
   module ActiveRecord
     include Base
-    include ActiveRecord::Legacy
 
     ##
     # Implementation of 'included' hook method.
@@ -180,9 +178,6 @@ module Geocoder::Store
           conditions[0] << " AND #{table_name}.id != ?"
           conditions << obj.id
         end
-        if options[:limit] || options[:offset]
-          warn "DEPRECATION WARNING: The :limit and :offset options to Geocoder's 'near' method are deprecated and will be removed in Geocoder v1.0. Please specify these options using ARel relations instead, for example: Place.near(...).limit(10).offset(20)."
-        end
         {
           :group  => columns.map{ |c| "#{table_name}.#{c.name}" }.join(','),
           :order  => options[:order],
@@ -208,7 +203,7 @@ module Geocoder::Store
       end
     end
 
-    #alias_method :fetch_coordinates, :geocode
+    alias_method :fetch_coordinates, :geocode
 
     ##
     # Look up address and assign to +address+ attribute (or other as specified
@@ -224,6 +219,6 @@ module Geocoder::Store
       end
     end
 
-    #alias_method :fetch_address, :reverse_geocode
+    alias_method :fetch_address, :reverse_geocode
   end
 end

data/lib/geocoder/stores/base.rb

@@ -22,14 +22,10 @@ module Geocoder
       # the point. Also takes a symbol specifying the units
       # (:mi or :km; default is :mi).
       #
-      def distance_to(point, *args)
-        if point.is_a?(Numeric) and args[0].is_a?(Numeric)
-          warn "DEPRECATION WARNING: Instead of passing latitude/longitude as separate arguments to the distance_to/from method, please pass an array [#{point},#{args[0]}], a geocoded object, or a geocodable address (string). The old argument format will not be supported in Geocoder v.1.0."
-          point = [point, args.shift]
-        end
+      def distance_to(point, units = :mi)
         return nil unless geocoded?
         Geocoder::Calculations.distance_between(
-          to_coordinates, point, :units => args.pop || :mi)
+          to_coordinates, point, :units => units)
       end
 
       alias_method :distance_from, :distance_to
@@ -62,10 +58,6 @@ module Geocoder
       #
       def nearbys(radius = 20, options = {})
         return [] unless geocoded?
-        if options.is_a?(Symbol)
-          options = {:units => options}
-          warn "DEPRECATION WARNING: The units argument to the nearbys method has been replaced with an options hash (same options hash as the near scope). You should instead call: obj.nearbys(#{radius}, :units => #{options[:units]}). The old syntax will not be supported in Geocoder v1.0."
-        end
         options.merge!(:exclude => self)
         self.class.near(self, radius, options)
       end

data/lib/geocoder/version.rb

@@ -0,0 +1,3 @@
+module Geocoder
+  VERSION = "1.0.0"
+end

data/test/fixtures/bing_madison_square_garden.json

@@ -0,0 +1,40 @@
+{
+   "authenticationResultCode":"ValidCredentials",
+   "brandLogoUri":"http:\/\/dev.virtualearth.net\/Branding\/logo_powered_by.png",
+   "copyright":"Copyright © 2011 Microsoft and its suppliers. All rights reserved. This API cannot be accessed and the content and any results may not be used, reproduced or transmitted in any manner without express written permission from Microsoft Corporation.",
+   "resourceSets":[
+      {
+         "estimatedTotal":1,
+         "resources":[
+            {
+               "__type":"Location:http:\/\/schemas.microsoft.com\/search\/local\/ws\/rest\/v1",
+               "bbox":[
+                  40.744944289326668,
+                  -74.002353921532631,
+                  40.755675807595253,
+                  -73.983625397086143
+               ],
+               "name":"Madison Square Garden, NY",
+               "point":{
+                  "type":"Point",
+                  "coordinates":[
+                     40.75031,
+                     -73.99299
+                  ]
+               },
+               "address":{
+                  "adminDistrict":"NY",
+                  "countryRegion":"United States",
+                  "formattedAddress":"Madison Square Garden, NY",
+                  "locality":"New York"
+               },
+               "confidence":"High",
+               "entityType":"Stadium"
+            }
+         ]
+      }
+   ],
+   "statusCode":200,
+   "statusDescription":"OK",
+   "traceId":"55094ee53c8d45e789794014666328cd|CH1M001466|02.00.82.2800|CH1MSNVM001396, CH1MSNVM001370, CH1MSNVM001397"
+}

data/test/fixtures/bing_no_results.json

@@ -0,0 +1,16 @@
+{
+   "authenticationResultCode":"ValidCredentials",
+   "brandLogoUri":"http:\/\/dev.virtualearth.net\/Branding\/logo_powered_by.png",
+   "copyright":"Copyright © 2011 Microsoft and its suppliers. All rights reserved. This API cannot be accessed and the content and any results may not be used, reproduced or transmitted in any manner without express written permission from Microsoft Corporation.",
+   "resourceSets":[
+      {
+         "estimatedTotal":0,
+         "resources":[
+
+         ]
+      }
+   ],
+   "statusCode":200,
+   "statusDescription":"OK",
+   "traceId":"907b76a307bc49129a489de3d4c992ea|CH1M001463|02.00.82.2800|CH1MSNVM001383, CH1MSNVM001358, CH1MSNVM001397"
+}

data/test/fixtures/bing_reverse.json

@@ -0,0 +1,42 @@
+{
+   "authenticationResultCode":"ValidCredentials",
+   "brandLogoUri":"http:\/\/dev.virtualearth.net\/Branding\/logo_powered_by.png",
+   "copyright":"Copyright © 2011 Microsoft and its suppliers. All rights reserved. This API cannot be accessed and the content and any results may not be used, reproduced or transmitted in any manner without express written permission from Microsoft Corporation.",
+   "resourceSets":[
+      {
+         "estimatedTotal":1,
+         "resources":[
+            {
+               "__type":"Location:http:\/\/schemas.microsoft.com\/search\/local\/ws\/rest\/v1",
+               "bbox":[
+                  45.419835111675845,
+                  -75.683656128790716,
+                  45.4275605468172,
+                  -75.66898098334994
+               ],
+               "name":"291 Rue Somerset E, Ottawa, ON, K1N",
+               "point":{
+                  "type":"Point",
+                  "coordinates":[
+                     45.423697829246521,
+                     -75.676318556070328
+                  ]
+               },
+               "address":{
+                  "addressLine":"291 Rue Somerset E",
+                  "adminDistrict":"ON",
+                  "countryRegion":"Canada",
+                  "formattedAddress":"291 Rue Somerset E, Ottawa, ON, K1N",
+                  "locality":"Ottawa",
+                  "postalCode":"K1N"
+               },
+               "confidence":"Medium",
+               "entityType":"Address"
+            }
+         ]
+      }
+   ],
+   "statusCode":200,
+   "statusDescription":"OK",
+   "traceId":"27bd5ed659e64ba6970c4144f1d4ea94|CH1M001470|02.00.82.2800|CH1MSNVM001396, CH1MSNVM001374"
+}

data/test/fixtures/yandex_invalid_key.json

@@ -0,0 +1 @@
+{"error":{"status":401,"message":"invalid key"}}

data/test/fixtures/yandex_kremlin.json

@@ -0,0 +1,48 @@
+{
+    "response": {
+        "GeoObjectCollection": {
+            "metaDataProperty": {
+                "GeocoderResponseMetaData": {
+                    "request": "Кремль, Moscow, Russia",
+                    "found": "1",
+                    "results": "10"
+                }
+            },
+            "featureMember": [
+                {
+                    "GeoObject": {
+                        "metaDataProperty": {
+                            "GeocoderMetaData": {
+                                "kind": "vegetation",
+                                "text": "Россия, Москва, Московский Кремль",
+                                "precision": "other",
+                                "AddressDetails": {
+                                    "Country": {
+                                        "CountryNameCode": "RU",
+                                        "CountryName": "Россия",
+                                        "Locality": {
+                                            "LocalityName": "Москва",
+                                            "Premise": {
+                                                "PremiseName": "Московский Кремль"
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        "name": "Московский Кремль",
+                        "boundedBy": {
+                            "Envelope": {
+                                "lowerCorner": "37.584182 55.733361",
+                                "upperCorner": "37.650064 55.770517"
+                            }
+                        },
+                        "Point": {
+                            "pos": "37.617123 55.751943"
+                        }
+                    }
+                }
+            ]
+        }
+    }
+}

data/test/fixtures/yandex_no_results.json

@@ -0,0 +1,16 @@
+{
+    "response": {
+        "GeoObjectCollection": {
+            "metaDataProperty": {
+                "GeocoderResponseMetaData": {
+                    "request": "blah",
+                    "found": "0",
+                    "results": "10"
+                }
+            },
+            "featureMember": [
+
+            ]
+        }
+    }
+}

data/test/geocoder_test.rb

@@ -20,6 +20,24 @@ class GeocoderTest < Test::Unit::TestCase
 
   # --- sanity checks ---
 
+  def test_uses_proxy_when_specified
+    Geocoder::Configuration.http_proxy = 'localhost'
+    lookup = Geocoder::Lookup::Google.new
+    assert lookup.send(:http_client).proxy_class?
+  end
+
+  def test_doesnt_use_proxy_when_not_specified
+    lookup = Geocoder::Lookup::Google.new
+    assert !lookup.send(:http_client).proxy_class?
+  end
+
+  def test_exception_raised_on_bad_proxy_url
+    Geocoder::Configuration.http_proxy = ' \\_O< Quack Quack'
+    assert_raise Geocoder::ConfigurationError do
+      Geocoder::Lookup::Google.new.send(:http_client)
+    end
+  end
+
   def test_uses_https_for_secure_query
     Geocoder::Configuration.use_https = true
     g = Geocoder::Lookup::Google.new
@@ -369,6 +387,17 @@ class GeocoderTest < Test::Unit::TestCase
   end
 
 
+  # --- Yandex ---
+
+  def test_yandex_with_invalid_key
+    # keep test output clean: suppress timeout warning
+    orig = $VERBOSE; $VERBOSE = nil
+    Geocoder::Configuration.lookup = :yandex
+    assert_equal [], Geocoder.search("invalid key")
+    $VERBOSE = orig
+  end
+
+
   # --- Geocoder.ca ---
 
   def test_geocoder_ca_result_components
@@ -392,6 +421,23 @@ class GeocoderTest < Test::Unit::TestCase
   end
 
 
+  # --- Bing ---
+
+  def test_bing_result_components
+    Geocoder::Configuration.lookup = :bing
+    result = Geocoder.search("Madison Square Garden, New York, NY").first
+    assert_equal "Madison Square Garden, NY", result.address
+    assert_equal "NY", result.state
+    assert_equal "New York", result.city
+  end
+
+  def test_bing_no_results
+    Geocoder::Configuration.lookup = :bing
+    results = Geocoder.search("no results")
+    assert_equal 0, results.length
+  end
+
+
   # --- search queries ---
 
   def test_hash_to_query
@@ -416,13 +462,17 @@ class GeocoderTest < Test::Unit::TestCase
 
   def assert_result_has_required_attributes(result)
     m = "Lookup #{Geocoder::Configuration.lookup} does not support %s attribute."
-    assert result.coordinates.is_a?(Array),   m % "coordinates"
-    assert result.latitude.is_a?(Float),      m % "latitude"
-    assert result.longitude.is_a?(Float),     m % "longitude"
-    assert result.city.is_a?(String),         m % "city"
-    assert result.postal_code.is_a?(String),  m % "postal_code"
-    assert result.country.is_a?(String),      m % "country"
-    assert result.country_code.is_a?(String), m % "country_code"
-    assert_not_nil result.address,            m % "address"
+    assert result.coordinates.is_a?(Array),    m % "coordinates"
+    assert result.latitude.is_a?(Float),       m % "latitude"
+    assert result.longitude.is_a?(Float),      m % "longitude"
+    assert result.city.is_a?(String),          m % "city"
+    assert result.state.is_a?(String),         m % "state"
+    assert result.state_code.is_a?(String),    m % "state_code"
+    assert result.province.is_a?(String),      m % "province"
+    assert result.province_code.is_a?(String), m % "province_code"
+    assert result.postal_code.is_a?(String),   m % "postal_code"
+    assert result.country.is_a?(String),       m % "country"
+    assert result.country_code.is_a?(String),  m % "country_code"
+    assert_not_nil result.address,             m % "address"
   end
 end

data/test/test_helper.rb

@@ -75,11 +75,27 @@ module Geocoder
       private #-----------------------------------------------------------------
       def fetch_raw_data(query, reverse = false)
         raise TimeoutError if query == "timeout"
-        file = query == "no results" ? :no_results : :madison_square_garden
+        file = case query
+          when "no results";  :no_results
+          else                :madison_square_garden
+        end
         read_fixture "yahoo_#{file}.json"
       end
     end
 
+    class Yandex < Base
+      private #-----------------------------------------------------------------
+      def fetch_raw_data(query, reverse = false)
+        raise TimeoutError if query == "timeout"
+        file = case query
+          when "no results";  :no_results
+          when "invalid key"; :invalid_key
+          else                :kremlin
+        end
+        read_fixture "yandex_#{file}.json"
+      end
+    end
+
     class GeocoderCa < Base
       private #-----------------------------------------------------------------
       def fetch_raw_data(query, reverse = false)
@@ -87,7 +103,10 @@ module Geocoder
         if reverse
           read_fixture "geocoder_ca_reverse.json"
         else
-          file = query == "no results" ? :no_results : :madison_square_garden
+          file = case query
+            when "no results";  :no_results
+            else                :madison_square_garden
+          end
           read_fixture "geocoder_ca_#{file}.json"
         end
       end
@@ -100,6 +119,23 @@ module Geocoder
         read_fixture "freegeoip_74_200_247_59.json"
       end
     end
+
+    class Bing < Base
+      private #-----------------------------------------------------------------
+      def fetch_raw_data(query, reverse = false)
+        raise TimeoutError if query == "timeout"
+        if reverse
+          read_fixture "bing_reverse.json"
+        else
+          file = case query
+            when "no results";  :no_results
+            else                :madison_square_garden
+          end
+          read_fixture "bing_#{file}.json"
+        end
+      end
+    end
+
   end
 end
 
@@ -194,7 +230,7 @@ class Test::Unit::TestCase
   end
 
   def all_lookups
-    Geocoder.send(:valid_lookups)
+    Geocoder.valid_lookups
   end
 
   def street_lookups