geocoder 0.9.12 → 1.0.0

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

metadata

@@ -2,71 +2,82 @@
 name: geocoder
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.12
+  version: 1.0.0
 platform: ruby
 authors: 
-- Alex Reisner
+  - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -04:00
+date: 2011-05-09 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: Provides object geocoding (by street or IP address), reverse geocoding (coordinates to street address), and distance queries for ActiveRecord and Mongoid. Designed for Rails but works with other Rack frameworks too.
+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: []
-
+  - alex@alexreisner.com
+executables: 
+  - geocode
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-- .gitignore
-- CHANGELOG.rdoc
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- lib/geocoder.rb
-- lib/geocoder/cache.rb
-- lib/geocoder/calculations.rb
-- lib/geocoder/configuration.rb
-- lib/geocoder/lookups/base.rb
-- lib/geocoder/lookups/freegeoip.rb
-- lib/geocoder/lookups/geocoder_ca.rb
-- lib/geocoder/lookups/google.rb
-- lib/geocoder/lookups/yahoo.rb
-- lib/geocoder/models/active_record.rb
-- lib/geocoder/models/base.rb
-- lib/geocoder/models/mongoid.rb
-- lib/geocoder/railtie.rb
-- lib/geocoder/request.rb
-- lib/geocoder/results/base.rb
-- lib/geocoder/results/freegeoip.rb
-- lib/geocoder/results/geocoder_ca.rb
-- lib/geocoder/results/google.rb
-- lib/geocoder/results/yahoo.rb
-- lib/geocoder/stores/active_record.rb
-- lib/geocoder/stores/active_record_legacy.rb
-- lib/geocoder/stores/base.rb
-- lib/geocoder/stores/mongoid.rb
-- lib/tasks/geocoder.rake
-- test/fixtures/freegeoip_74_200_247_59.json
-- test/fixtures/geocoder_ca_madison_square_garden.json
-- test/fixtures/geocoder_ca_no_results.json
-- test/fixtures/geocoder_ca_reverse.json
-- test/fixtures/google_garbage.json
-- test/fixtures/google_madison_square_garden.json
-- test/fixtures/google_no_locality.json
-- test/fixtures/google_no_results.json
-- test/fixtures/yahoo_garbage.json
-- test/fixtures/yahoo_madison_square_garden.json
-- test/fixtures/yahoo_no_results.json
-- test/geocoder_test.rb
-- test/test_helper.rb
+  - .gitignore
+  - CHANGELOG.rdoc
+  - LICENSE
+  - README.rdoc
+  - Rakefile
+  - bin/geocode
+  - lib/geocoder.rb
+  - lib/geocoder/cache.rb
+  - lib/geocoder/calculations.rb
+  - lib/geocoder/cli.rb
+  - lib/geocoder/configuration.rb
+  - lib/geocoder/lookups/base.rb
+  - lib/geocoder/lookups/bing.rb
+  - lib/geocoder/lookups/freegeoip.rb
+  - lib/geocoder/lookups/geocoder_ca.rb
+  - lib/geocoder/lookups/google.rb
+  - lib/geocoder/lookups/yahoo.rb
+  - lib/geocoder/lookups/yandex.rb
+  - lib/geocoder/models/active_record.rb
+  - lib/geocoder/models/base.rb
+  - lib/geocoder/models/mongoid.rb
+  - lib/geocoder/railtie.rb
+  - lib/geocoder/request.rb
+  - lib/geocoder/results/base.rb
+  - lib/geocoder/results/bing.rb
+  - lib/geocoder/results/freegeoip.rb
+  - lib/geocoder/results/geocoder_ca.rb
+  - lib/geocoder/results/google.rb
+  - lib/geocoder/results/yahoo.rb
+  - lib/geocoder/results/yandex.rb
+  - lib/geocoder/stores/active_record.rb
+  - lib/geocoder/stores/base.rb
+  - lib/geocoder/stores/mongoid.rb
+  - lib/geocoder/version.rb
+  - lib/tasks/geocoder.rake
+  - test/fixtures/bing_madison_square_garden.json
+  - test/fixtures/bing_no_results.json
+  - test/fixtures/bing_reverse.json
+  - test/fixtures/freegeoip_74_200_247_59.json
+  - test/fixtures/geocoder_ca_madison_square_garden.json
+  - test/fixtures/geocoder_ca_no_results.json
+  - test/fixtures/geocoder_ca_reverse.json
+  - test/fixtures/google_garbage.json
+  - test/fixtures/google_madison_square_garden.json
+  - test/fixtures/google_no_locality.json
+  - test/fixtures/google_no_results.json
+  - test/fixtures/yahoo_garbage.json
+  - test/fixtures/yahoo_madison_square_garden.json
+  - test/fixtures/yahoo_no_results.json
+  - test/fixtures/yandex_invalid_key.json
+  - test/fixtures/yandex_kremlin.json
+  - test/fixtures/yandex_no_results.json
+  - test/geocoder_test.rb
+  - test/test_helper.rb
 has_rdoc: true
 homepage: http://www.rubygeocoder.com
 licenses: []
@@ -75,23 +86,23 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Complete geocoding solution for Ruby.

data/VERSION

@@ -1 +0,0 @@
-0.9.12

data/lib/geocoder/stores/active_record_legacy.rb

@@ -1,62 +0,0 @@
-module Geocoder::Store::ActiveRecord
-  module Legacy
-
-    ##
-    # Fetch coordinates and update (save) +latitude+ and +longitude+ data.
-    #
-    def fetch_coordinates!
-      warn "DEPRECATION WARNING: The 'fetch_coordinates!' method is deprecated and will be removed in geocoder v1.0. " +
-        "Please use 'geocode' instead and then save your objects manually."
-      do_lookup(false) do |o,rs|
-        r = rs.first
-        unless r.latitude.nil? or r.longitude.nil?
-          o.send :update_attribute, self.class.geocoder_options[:latitude],  r.latitude
-          o.send :update_attribute, self.class.geocoder_options[:longitude], r.longitude
-        end
-        r.coordinates
-      end
-    end
-
-    def fetch_coordinates(*args)
-      warn "DEPRECATION WARNING: The 'fetch_coordinates' method will cease taking " +
-        "an argument in geocoder v1.0. Please save your objects manually." if args.size > 0
-      do_lookup(false) do |o,rs|
-        r = rs.first
-        unless r.latitude.nil? or r.longitude.nil?
-          method = ((args.size > 0 && args.first) ? "update" : "write" ) + "_attribute"
-          o.send method, self.class.geocoder_options[:latitude],  r.latitude
-          o.send method, self.class.geocoder_options[:longitude], r.longitude
-        end
-        r.coordinates
-      end
-    end
-
-    ##
-    # Fetch address and update (save) +address+ data.
-    #
-    def fetch_address!
-      warn "DEPRECATION WARNING: The 'fetch_address!' method is deprecated and will be removed in geocoder v1.0. " +
-        "Please use 'reverse_geocode' instead and then save your objects manually."
-      do_lookup(true) do |o,rs|
-        r = rs.first
-        unless r.address.nil?
-          o.send :update_attribute, self.class.geocoder_options[:fetched_address], r.address
-        end
-        r.address
-      end
-    end
-
-    def fetch_address(*args)
-      warn "DEPRECATION WARNING: The 'fetch_address' method will cease taking " +
-        "an argument in geocoder v1.0. Please save your objects manually." if args.size > 0
-      do_lookup(true) do |o,rs|
-        r = rs.first
-        unless r.latitude.nil? or r.longitude.nil?
-          method = ((args.size > 0 && args.first) ? "update" : "write" ) + "_attribute"
-          o.send method, self.class.geocoder_options[:fetched_address], r.address
-        end
-        r.address
-      end
-    end
-  end
-end