rails-geocoder 0.9.10 → 0.9.11

data/test/test_helper.rb

@@ -38,6 +38,10 @@ module ActiveRecord
   end
 end
 
+# simulate Rails module so Railtie gets loaded
+module Rails
+end
+
 # Require Geocoder after ActiveRecord simulator.
 require 'geocoder'
 require "geocoder/lookups/base"
@@ -47,26 +51,53 @@ require "geocoder/lookups/base"
 #
 module Geocoder
   module Lookup
+    class Base
+      private #-----------------------------------------------------------------
+      def read_fixture(file)
+        File.read(File.join("test", "fixtures", file)).strip.gsub(/\n\s*/, "")
+      end
+    end
+
     class Google < Base
       private #-----------------------------------------------------------------
       def fetch_raw_data(query, reverse = false)
-        file = query == "no results" ? :no_results : :madison_square_garden
-        File.read(File.join("test", "fixtures", "google_#{file}.json"))
+        raise TimeoutError if query == "timeout"
+        file = case query
+          when "no results";  :no_results
+          when "no locality"; :no_locality
+          else                :madison_square_garden
+        end
+        read_fixture "google_#{file}.json"
       end
     end
 
     class Yahoo < Base
       private #-----------------------------------------------------------------
       def fetch_raw_data(query, reverse = false)
+        raise TimeoutError if query == "timeout"
         file = query == "no results" ? :no_results : :madison_square_garden
-        File.read(File.join("test", "fixtures", "yahoo_#{file}.json"))
+        read_fixture "yahoo_#{file}.json"
+      end
+    end
+
+    class GeocoderCa < Base
+      private #-----------------------------------------------------------------
+      def fetch_raw_data(query, reverse = false)
+        raise TimeoutError if query == "timeout"
+        if reverse
+          read_fixture "geocoder_ca_reverse.json"
+        else
+          file = query == "no results" ? :no_results : :madison_square_garden
+          read_fixture "geocoder_ca_#{file}.json"
+        end
       end
     end
 
     class Freegeoip < Base
       private #-----------------------------------------------------------------
       def fetch_raw_data(query, reverse = false)
-        File.read(File.join("test", "fixtures", "freegeoip_74_200_247_59.json"))
+        raise TimeoutError if query == "timeout"
+        read_fixture "freegeoip_74_200_247_59.json"
       end
     end
   end
@@ -103,9 +134,9 @@ end
 # Geocoded model with block.
 #
 class Event < ActiveRecord::Base
-  geocoded_by :address do |obj,result|
-    if result
-      obj.coordinates = "#{result.latitude},#{result.longitude}"
+  geocoded_by :address do |obj,results|
+    if result = results.first
+      obj.coords_string = "#{result.latitude},#{result.longitude}"
     end
   end
 
@@ -120,8 +151,8 @@ end
 # Reverse geocoded model with block.
 #
 class Party < ActiveRecord::Base
-  reverse_geocoded_by :latitude, :longitude do |obj,result|
-    if result
+  reverse_geocoded_by :latitude, :longitude do |obj,results|
+    if result = results.first
       obj.country = result.country_code
     end
   end
@@ -161,4 +192,12 @@ class Test::Unit::TestCase
       :msg => ["Madison Square Garden", 40.750354, -73.993371]
     }[abbrev]
   end
+
+  def all_lookups
+    Geocoder.send(:valid_lookups)
+  end
+
+  def street_lookups
+    all_lookups - [:freegeoip]
+  end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rails-geocoder
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 9
-    - 10
-  version: 0.9.10
+  prerelease: 
+  version: 0.9.11
 platform: ruby
 authors: 
   - Alex Reisner
@@ -14,11 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -05:00
+date: 2011-03-25 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 calculations for geocoded objects. Designed for Rails but works with other frameworks too.
+description: "THIS GEM HAS BEEN RENAMED: please use 'geocoder' instead. Provides object geocoding (by street or IP address), reverse geocoding (coordinates to street address), and distance calculations. Designed for Rails but works with other frameworks too."
 email: 
   - alex@alexreisner.com
 executables: []
@@ -35,10 +31,12 @@ files:
   - 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/orms/active_record.rb
@@ -48,13 +46,17 @@ files:
   - 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/tasks/geocoder.rake
-  - rails-geocoder.gemspec
   - 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
@@ -62,7 +64,7 @@ files:
   - test/geocoder_test.rb
   - test/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/alexreisner/geocoder
+homepage: http://www.rubygeocoder.com
 licenses: []
 
 post_install_message: 
@@ -71,23 +73,21 @@ rdoc_options: []
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Complete geocoding solution for Ruby.

data/rails-geocoder.gemspec

@@ -1,14 +0,0 @@
-# -*- encoding: utf-8 -*-
-Gem::Specification.new do |s|
-  s.name        = "rails-geocoder"
-  s.version     = File.read(File.join(File.dirname(__FILE__), 'VERSION'))
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Alex Reisner"]
-  s.email       = ["alex@alexreisner.com"]
-  s.homepage    = "http://github.com/alexreisner/geocoder"
-  s.date        = Date.today.to_s
-  s.summary     = "Complete geocoding solution for Ruby."
-  s.description = "Provides object geocoding (by street or IP address), reverse geocoding (coordinates to street address), and distance calculations for geocoded objects. Designed for Rails but works with other frameworks too."
-  s.files       = `git ls-files`.split("\n") - %w[geocoder.gemspec Gemfile init.rb]
-  s.require_paths = ["lib"]
-end