geocoder 0.9.9 → 0.9.10

data/CHANGELOG.rdoc

@@ -2,6 +2,11 @@
 
 Per-release changes to Geocoder.
 
+== 0.9.10 (2011 Mar 9)
+
+* Fix broken scopes (github.com/mikepinde).
+* Fix broken Ruby 1.9 and JRuby compatibility (don't require json gem).
+
 == 0.9.9 (2011 Mar 9)
 
 * Add support for IP address geocoding via FreeGeoIp.net.

data/README.rdoc

@@ -5,6 +5,8 @@ Geocoder is a complete geocoding solution for Ruby. With Rails it adds object ge
 
 == Compatibility
 
+Geocoder has been successfully tested with Ruby (MRI) 1.8.7, 1.9.2, and JRuby 1.5.3.
+
 Geocoder is compatible with Rails 3. If you need to use it with Rails 2 please see the <tt>rails2</tt> branch (no longer maintained, limited feature set).
 
 

data/VERSION

@@ -1 +1 @@
-0.9.9
+0.9.10

data/lib/geocoder.rb

@@ -68,6 +68,10 @@ module Geocoder
       name = name.to_s
       require "geocoder/lookups/#{name}"
       eval("Geocoder::Lookup::#{name[0...1].upcase + name[1..-1]}.new")
+    else
+      valids = valid_lookups.map{ |l| ":#{l}" }.join(", ")
+      raise ConfigurationError, "Please specify a valid lookup for Geocoder " +
+        "(#{name.inspect} is not one of: #{valids})."
     end
   end
 

data/lib/geocoder/lookups/base.rb

@@ -1,9 +1,9 @@
 require 'net/http'
-unless defined? ActiveSupport::JSON
+unless defined?(ActiveSupport::JSON)
   begin
     require 'json'
   rescue LoadError
-    raise LoadError, "Please install the json gem to parse geocoder results."
+    raise LoadError, "Please install the 'json' or 'json_pure' gem to parse geocoder results."
   end
 end
 
@@ -67,17 +67,14 @@ module Geocoder
       # Parses a raw search result (returns hash or array).
       #
       def parse_raw_data(raw_data)
-        if defined?(JSON) and defined?(JSON.parse)
+        if defined?(ActiveSupport::JSON)
+          ActiveSupport::JSON.decode(raw_data)
+        else
           begin
             JSON.parse(raw_data)
           rescue
             warn "Geocoding API's response was not valid JSON."
           end
-        elsif defined?(ActiveSupport::JSON)
-          ActiveSupport::JSON.decode(raw_data)
-        else
-          raise Geocoder::Error, "No JSON-parsing library found. " +
-            "Please install either the 'json' or 'activesupport' gem."
         end
       end
 

data/lib/geocoder/orms/active_record.rb

@@ -17,14 +17,14 @@ module Geocoder::Orm
       base.class_eval do
 
         # scope: geocoded objects
-        scope :geocoded,
-          :conditions => "#{geocoder_options[:latitude]} IS NOT NULL " +
-            "AND #{geocoder_options[:longitude]} IS NOT NULL"
+        scope :geocoded, lambda {
+          {:conditions => "#{geocoder_options[:latitude]} IS NOT NULL " +
+            "AND #{geocoder_options[:longitude]} IS NOT NULL"}}
 
         # scope: not-geocoded objects
-        scope :not_geocoded,
-          :conditions => "#{geocoder_options[:latitude]} IS NULL " +
-            "OR #{geocoder_options[:longitude]} IS NULL"
+        scope :not_geocoded, lambda {
+          {:conditions => "#{geocoder_options[:latitude]} IS NULL " +
+            "OR #{geocoder_options[:longitude]} IS NULL"}}
 
         ##
         # Find all objects within a radius (in miles) of the given location

data/test/geocoder_test.rb

@@ -7,6 +7,16 @@ class GeocoderTest < Test::Unit::TestCase
   end
 
 
+  # --- configuration ---
+  #
+  def test_exception_raised_on_bad_lookup_config
+    Geocoder::Configuration.lookup = :stoopid
+    assert_raises Geocoder::ConfigurationError do
+      Geocoder.search "something dumb"
+    end
+  end
+
+
   # --- sanity checks ---
 
   def test_distance_between

metadata

@@ -1,42 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: geocoder
 version: !ruby/object:Gem::Version 
-  hash: 41
   prerelease: false
   segments: 
-  - 0
-  - 9
-  - 9
-  version: 0.9.9
+    - 0
+    - 9
+    - 10
+  version: 0.9.10
 platform: ruby
 authors: 
-- Alex Reisner
+  - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
 
 date: 2011-03-09 00:00:00 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :runtime
-  version_requirements: *id001
+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.
 email: 
-- alex@alexreisner.com
+  - alex@alexreisner.com
 executables: []
 
 extensions: []
@@ -44,38 +28,38 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gitignore
-- CHANGELOG.rdoc
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- lib/geocoder.rb
-- lib/geocoder/calculations.rb
-- lib/geocoder/configuration.rb
-- lib/geocoder/lookups/base.rb
-- lib/geocoder/lookups/freegeoip.rb
-- lib/geocoder/lookups/google.rb
-- lib/geocoder/lookups/yahoo.rb
-- lib/geocoder/orms/active_record.rb
-- lib/geocoder/orms/active_record_legacy.rb
-- lib/geocoder/orms/base.rb
-- lib/geocoder/railtie.rb
-- lib/geocoder/request.rb
-- lib/geocoder/results/base.rb
-- lib/geocoder/results/freegeoip.rb
-- lib/geocoder/results/google.rb
-- lib/geocoder/results/yahoo.rb
-- lib/tasks/geocoder.rake
-- test/fixtures/freegeoip_74_200_247_59.json
-- test/fixtures/google_garbage.json
-- test/fixtures/google_madison_square_garden.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
+  - VERSION
+  - lib/geocoder.rb
+  - lib/geocoder/calculations.rb
+  - lib/geocoder/configuration.rb
+  - lib/geocoder/lookups/base.rb
+  - lib/geocoder/lookups/freegeoip.rb
+  - lib/geocoder/lookups/google.rb
+  - lib/geocoder/lookups/yahoo.rb
+  - lib/geocoder/orms/active_record.rb
+  - lib/geocoder/orms/active_record_legacy.rb
+  - lib/geocoder/orms/base.rb
+  - lib/geocoder/railtie.rb
+  - lib/geocoder/request.rb
+  - lib/geocoder/results/base.rb
+  - lib/geocoder/results/freegeoip.rb
+  - lib/geocoder/results/google.rb
+  - lib/geocoder/results/yahoo.rb
+  - lib/tasks/geocoder.rake
+  - test/fixtures/freegeoip_74_200_247_59.json
+  - test/fixtures/google_garbage.json
+  - test/fixtures/google_madison_square_garden.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
 has_rdoc: true
 homepage: http://github.com/alexreisner/geocoder
 licenses: []
@@ -84,29 +68,25 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Complete geocoding solution for Ruby.