geocoder_plus 0.2.0 → 0.2.3

data/lib/geocoder.rb

@@ -3,6 +3,8 @@ module Geokit
     
     @@cache = nil
     @@hydra = nil
+    @@typhoeus_timeout = 30000
+    @@typhoeus_cache_timeout = 604800
     __define_accessors
 
     # The Geocoder base class which defines the interface to be used by all
@@ -16,9 +18,9 @@ module Geokit
       end
       
       # Set hydra and memcache if defined in configuration file
-      def self.initialize_cache        
-        if (Geokit::Geocoders::cache && Geokit::Geocoders::hydra)
-          @cache = Geokit::Geocoders::cache
+      def self.initialize_cache
+        if (Geokit::Geocoders::cache && Geokit::Geocoders::hydra && self.respond_to?(:success_response?))
+          @cache = Geokit::Geocoders::cache          
           Geokit::Geocoders::hydra.cache_setter do |request|
             @cache.set(request.cache_key, request.response, request.cache_timeout)
           end
@@ -28,18 +30,21 @@ module Geokit
           end
           return true
         end
-      end
+      end      
       
       # Wraps the geocoder call around a proxy if necessary.
       # Use typhoeus and memcache if defined
       def self.do_get(url)
         uri = URI.parse(url)
         if (cache_query)
-          req = Typhoeus::Request.new(url, :cache_timeout => 604800) # cache response for 1 week
+          req = Typhoeus::Request.new(url,
+                  :timeout       => Geokit::Geocoders::typhoeus_timeout,  # milliseconds
+                  :cache_timeout => Geokit::Geocoders::typhoeus_cache_timeout)
+                  # :headers => {"Authorization" => "Basic #{Base64.b64encode("#{uri.user}:#{uri.password}")}"}) 
           Geokit::Geocoders::hydra.queue(req)
           Geokit::Geocoders::hydra.run
           return req.response
-        else     
+        else      
           req = Net::HTTP::Get.new(url)
           req.basic_auth(uri.user, uri.password) if uri.userinfo
           res = Net::HTTP::Proxy(GeoKit::Geocoders::proxy_addr,

data/lib/geocoders/google_v3_geocoder.rb

@@ -3,47 +3,54 @@
 module Geokit
   module Geocoders
     class GoogleV3Geocoder < Geocoder
-      private
-
-      def self.do_geocode(address, options = {})
-        geo_url = self.get_url(address, options)
-        logger.debug "Making Geocode request to:  #{geo_url}"
-        res = self.call_geocoder_service(geo_url)
 
-        # return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
-        json = res.body
-        logger.debug "Google V3 geocoding. Address: #{address}. Result: #{json}"
-        return self.convert_json_to_geoloc(json)
+      private
+      
+      def self.success_response?(res)
+        if (defined?(Typhoeus) && res.is_a?(Typhoeus::Response))
+          return res.success?
+        else
+          return res.is_a?(Net::HTTPSuccess)
+        end
       end
-
+      
       def self.get_url(address, options={})
         bias = options[:bias] || ''
         address_str = address.is_a?(GeoLoc) ? address.to_geocodeable_s : address
         return "http://maps.googleapis.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(address_str)}&region=#{bias.to_s.downcase}"
       end
 
-      def self.convert_json_to_geoloc(json)
-        begin
-          data = Yajl::Parser.parse(json)
-        rescue
-          logger.error "Could not parse JSON from Google: #{json}"
+      def self.do_geocode(address, options = {})
+        geo_url = self.get_url(address, options)
+        logger.debug "Making Geocode request to:  #{geo_url}"
+        res = self.call_geocoder_service(geo_url)        
+        logger.debug "Google V3 geocoding. Address: #{address}. Result: #{res}"
+        
+        if success_response?(res)
+          return self.parse_body(Yajl::Parser.parse(res.body))
+        else
           return GeoLoc.new
         end
-    
-        if data['status'] != "OK"
-          if data['status' ] == 'OVER_QUERY_LIMIT'
-            raise Geokit::TooManyQueriesError "Google returned OVER_QUERY_LIMIT: #{json}"
-          elsif data['status'] == 'ZERO_RESULTS'
+      rescue Exception => e
+        logger.info "Caught an error during Google V3 geocoding call: #{e.inspect}"
+        return GeoLoc.new
+      end
+
+      def self.parse_body(body)    
+        if body['status'] != "OK"
+          if body['status' ] == 'OVER_QUERY_LIMIT'
+            raise Geokit::TooManyQueriesError "Google returned OVER_QUERY_LIMIT: #{body}"
+          elsif body['status'] == 'ZERO_RESULTS'
             logger.info "Found no results from google v3"
             return GeoLoc.new
           end
-          logger.error "Got an error from google, response: #{json}"
+          logger.error "Got an error from google, response: #{body}"
           # Otherwise, we don't know what to do
           return GeoLoc.new
         end
 
         begin
-          results = data['results']
+          results = body['results']
           geoloc = nil
           results.each do |result|
             extracted_geoloc = self.extract_location(result)

data/lib/geocoders/yahoo_place_finder_geocoder.rb

@@ -1,8 +1,17 @@
 module Geokit
   module Geocoders
     class YahooPlaceFinderGeocoder < Geocoder
+      
       private
       
+      def self.success_response?(res)
+        if (defined?(Typhoeus) && res.is_a?(Typhoeus::Response))
+          return res.success?
+        else
+          return res.is_a?(Net::HTTPSuccess)
+        end
+      end
+      
       def self.get_url(address, options={})        
         if (options[:reverse])
           latlng=LatLng.normalize(address)
@@ -17,16 +26,24 @@ module Geokit
       def self.do_reverse_geocode(latlng) 
         res = self.call_geocoder_service(self.get_url(latlng, :reverse => true))
         logger.debug "Yahoo PlaceFinder reverse-geocoding. LL: #{latlng}. Result: #{res}"
-        return self.parse_body(Yajl::Parser.parse(res.body))
+        
+        if success_response?(res)
+          return self.parse_body(Yajl::Parser.parse(res.body))
+        else
+          return GeoLoc.new
+        end
       end
       
       def self.do_geocode(address, options={})
         address_str = address.is_a?(GeoLoc) ? address.to_geocodeable_s : address
         res = self.call_geocoder_service(self.get_url(address, options))
-        # return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
         logger.debug "Yahoo PlaceFinder geocoding. Address: #{address}. Result: #{res}"
         
-        return self.parse_body(Yajl::Parser.parse(res.body))
+        if success_response?(res)
+          return self.parse_body(Yajl::Parser.parse(res.body))
+        else
+          return GeoLoc.new
+        end
       rescue 
         logger.info "Caught an error during Yahoo PlaceFinder geocoding call: "+$!
         return GeoLoc.new
@@ -63,7 +80,7 @@ module Geokit
         geoloc.lat            = result['latitude']
         geoloc.lng            = result['longitude']
         geoloc.country_code   = result['countrycode']
-        geoloc.provider       = 'Yahoo! PlaceFinder'
+        geoloc.provider       = 'yahoo_place_finder'
 
         # extended -- false if not not available
         geoloc.street_address = result['line1']

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: geocoder_plus
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors: 
 - Fajar A B
@@ -15,115 +10,86 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-09 00:00:00 +07:00
+date: 2011-04-13 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: geokit
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
         version: 1.5.0
-  version_requirements: *id001
-  name: geokit
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: yajl-ruby
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 8
-        - 2
         version: 0.8.2
-  version_requirements: *id002
-  name: yajl-ruby
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: shoulda
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  version_requirements: *id003
-  name: shoulda
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: mocha
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  version_requirements: *id004
-  name: mocha
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: bundler
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  version_requirements: *id005
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: jeweler
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
-  version_requirements: *id006
-  name: jeweler
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: rcov
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  version_requirements: *id007
-  name: rcov
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id007
 description: This gem consists two additional geocoders for geokit, Yahoo! PlaceFinder and Google V3
 email: fajar.ab@gmail.com
 executables: []
@@ -160,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -4398613690650561579
       segments: 
       - 0
       version: "0"
@@ -169,9 +135,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []