geocoder 0.9.8 → 0.9.9

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geocoder
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: false
   segments: 
   - 0
   - 9
-  - 8
-  version: 0.9.8
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - Alex Reisner
@@ -15,11 +15,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -05:00
+date: 2011-03-09 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
-description: Geocoder adds object geocoding and distance calculations to ActiveRecord models. It does not rely on proprietary database functions so finding geocoded objects in a given area is easily done using out-of-the-box MySQL, PostgreSQL, or SQLite.
+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
+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
 executables: []
@@ -29,20 +44,38 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
+- CHANGELOG.rdoc
+- LICENSE
+- README.rdoc
+- Rakefile
+- VERSION
 - lib/geocoder.rb
-- lib/geocoder/lookup.rb
 - lib/geocoder/calculations.rb
-- lib/geocoder/railtie.rb
-- lib/geocoder/result.rb
 - lib/geocoder/configuration.rb
-- lib/geocoder/active_record.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/test_helper.rb
+- 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
-- CHANGELOG.rdoc
-- Rakefile
-- README.rdoc
-- LICENSE
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/alexreisner/geocoder
 licenses: []
@@ -76,6 +109,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Simple, database-agnostic geocoding and distance calculations for Rails.
+summary: Complete geocoding solution for Ruby.
 test_files: []
 

data/lib/geocoder/lookup.rb

@@ -1,90 +0,0 @@
-require 'net/http'
-
-module Geocoder
-  module Lookup
-    extend self
-
-    ##
-    # Query Google for the coordinates of the given address.
-    #
-    def coordinates(address)
-      if (results = search(address)).size > 0
-        place = results.first.geometry['location']
-        ['lat', 'lng'].map{ |i| place[i] }
-      end
-    end
-
-    ##
-    # Query Google for the address of the given coordinates.
-    #
-    def address(latitude, longitude)
-      if (results = search(latitude, longitude)).size > 0
-        results.first.formatted_address
-      end
-    end
-
-    ##
-    # Takes a search string (eg: "Mississippi Coast Coliseumf, Biloxi, MS") for
-    # geocoding, or coordinates (latitude, longitude) for reverse geocoding.
-    # Returns an array of Geocoder::Result objects,
-    # or nil if not found or if network error.
-    #
-    def search(*args)
-      return nil if args[0].blank?
-      doc = parsed_response(args.join(","), args.size == 2)
-      [].tap do |results|
-        if doc
-          doc['results'].each{ |r| results << Result.new(r) }
-        end
-      end
-    end
-
-
-    private # ---------------------------------------------------------------
-
-    ##
-    # Returns a parsed Google geocoder search result (hash).
-    # Returns nil if non-200 HTTP response, timeout, or other error.
-    #
-    def parsed_response(query, reverse = false)
-      begin
-        doc = ActiveSupport::JSON.decode(fetch_data(query, reverse))
-      rescue SocketError
-        warn "Google Geocoding API connection cannot be established."
-      rescue TimeoutError
-        warn "Google Geocoding API not responding fast enough " +
-          "(see Geocoder::Configuration.timeout to set limit)."
-      end
-
-      case doc['status']; when "OK"
-        doc
-      when "OVER_QUERY_LIMIT"
-        warn "Google Geocoding API error: over query limit."
-      when "REQUEST_DENIED"
-        warn "Google Geocoding API error: request denied."
-      when "INVALID_REQUEST"
-        warn "Google Geocoding API error: invalid request."
-      end
-    end
-
-    ##
-    # Fetches a raw Google geocoder search result (JSON string).
-    #
-    def fetch_data(query, reverse = false)
-      return nil if query.blank?
-      url = query_url(query, reverse)
-      timeout(Geocoder::Configuration.timeout) do
-        Net::HTTP.get_response(URI.parse(url)).body
-      end
-    end
-
-    def query_url(query, reverse = false)
-      params = {
-        (reverse ? :latlng : :address) => query,
-        :sensor => "false"
-      }
-      "http://maps.google.com/maps/api/geocode/json?" + params.to_query
-    end
-  end
-end
-