geocoder_plus 0.3.0 → 0.4.0

data/lib/geocoder.rb

@@ -1,58 +1,44 @@
 module Geokit
   module Geocoders
     
-    @@cache = nil
-    @@hydra = nil
-    @@typhoeus_timeout = 30000
-    @@typhoeus_cache_timeout = 604800
+    @@api_cache = nil
+    @@api_cache_valid = 86400
+    @@api_cache_timeout = 5
+
     __define_accessors
 
     # The Geocoder base class which defines the interface to be used by all
     # other geocoders.
     class Geocoder
       
-      private
-      
-      def self.cache_query
-        @_cache ||= initialize_cache
+      def self.normalize_address(addr)
+        addr.gsub(/\s*,\s*/, ',').strip
       end
       
-      # Set hydra and memcache if defined in configuration file
-      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
-
-          Geokit::Geocoders::hydra.cache_getter do |request|
-            @cache.get(request.cache_key) rescue nil
-          end
-          return true
-        end
-      end      
-      
+      private
+            
       # 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,
-                  :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      
+      def self.do_get(url)        
+        if (defined?(APICache) && Geokit::Geocoders::api_cache)
+          body = APICache.get(url, {
+                  :cache   => Geokit::Geocoders::api_cache,
+                  :valid   => Geokit::Geocoders::api_cache_valid,
+                  :timeout => Geokit::Geocoders::api_cache_timeout})
+          # fake Net::HTTPOK so that caching will work for all geocoders
+          res = Net::HTTPOK.new(1.0, 200, 'OK')
+          res.instance_variable_set(:@body, body)
+          res.instance_variable_set(:@read, true)          
+        else
+          uri = URI.parse(url)
           req = Net::HTTP::Get.new(url)
           req.basic_auth(uri.user, uri.password) if uri.userinfo
           res = Net::HTTP::Proxy(GeoKit::Geocoders::proxy_addr,
                   GeoKit::Geocoders::proxy_port,
                   GeoKit::Geocoders::proxy_user,
-                  GeoKit::Geocoders::proxy_pass).start(uri.host, uri.port) { |http| http.get(uri.path + "?" + uri.query) }
-          return res
+                  GeoKit::Geocoders::proxy_pass).start(uri.host, uri.port) { |http| http.get(uri.path + "?" + uri.query) }          
         end
+        return res
       end
     end
     

data/lib/geocoder_plus.rb

@@ -15,14 +15,10 @@ require 'geocoders/google_v3_geocoder'
 
 module GeocoderPlus
   
-  @use_typhoeus = true
-  
-  # by default, try requiring Typhoeus -- if that works, use it
-  # if you have Typheous and don't want to use it (or want another service),
-  # you can run Koala.http_service = NetHTTPService (or MyHTTPService)
+  # by default, try requiring api_cache -- if that works, use it
   begin
-    require 'typhoeus'
+    require 'api_cache'
   rescue LoadError
-    puts "Typhoeus is not installed, using Net:HTTP. Install typhoeus to enable query caching."
+    puts "APICache is not installed. Install it to enable query caching, gem install 'api_cache'"
   end
 end

data/lib/geocoders/google_v3_geocoder.rb

@@ -7,11 +7,7 @@ module Geokit
       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
+        res.is_a?(Net::HTTPSuccess) || res.is_a?(String)
       end
       
       def self.get_url(address, options={})
@@ -21,24 +17,33 @@ module Geokit
       end
 
       def self.do_geocode(address, options = {})
-        geo_url = self.get_url(address, options)
+        # debugger
+        geo_url = self.get_url(normalize_address(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
+        res = self.call_geocoder_service(geo_url)
+        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
+        logger.debug "Google V3 geocoding. Address: #{address}. Result: #{res}"       
+        # if success_response?(res)
+        #   return self.parse_body(res)
+        # else
+        #   return GeoLoc.new
+        # end
+        return self.parse_body(res)
       rescue Exception => e
         logger.info "Caught an error during Google V3 geocoding call: #{e.inspect}"
         return GeoLoc.new
       end
 
-      def self.parse_body(body)    
+      def self.parse_body(res)
+        # debugger
+        # if res.is_a?(String)
+        #   body = Yajl::Parser.parse(res)
+        # else
+          body = Yajl::Parser.parse(res.body)
+        # end
+
         if body['status'] != "OK"
-          if body['status' ] == 'OVER_QUERY_LIMIT'
+          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"

data/lib/geocoders/yahoo_place_finder_geocoder.rb

@@ -5,11 +5,7 @@ module Geokit
       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
+        res.is_a?(Net::HTTPSuccess) || res.is_a?(String)
       end
       
       def self.get_url(address, options={})        
@@ -28,7 +24,7 @@ module Geokit
         logger.debug "Yahoo PlaceFinder reverse-geocoding. LL: #{latlng}. Result: #{res}"
         
         if success_response?(res)
-          return self.parse_body(Yajl::Parser.parse(res.body))
+          return self.parse_body(Yajl::Parser.parse(res))
         else
           return GeoLoc.new
         end
@@ -36,20 +32,28 @@ module Geokit
       
       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))
+        res = self.call_geocoder_service(self.get_url(normalize_address(address), options))
+        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
         logger.debug "Yahoo PlaceFinder geocoding. Address: #{address}. Result: #{res}"
         
-        if success_response?(res)
-          return self.parse_body(Yajl::Parser.parse(res.body))
-        else
-          return GeoLoc.new
-        end
+        # if success_response?(res)
+        #   return self.parse_body(res)
+        # else
+        #   return GeoLoc.new
+        # end
+        return self.parse_body(res)
       rescue 
         logger.info "Caught an error during Yahoo PlaceFinder geocoding call: "+$!
         return GeoLoc.new
       end
 
-      def self.parse_body(body)
+      def self.parse_body(res)
+        # if res.is_a?(String)
+        #   body = Yajl::Parser.parse(res)
+        # else
+          body = Yajl::Parser.parse(res.body)
+        # end
+
         count = body['query']['count']
         if (count == 1)
           return extract_place(body['query']['results']['Result'])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geocoder_plus
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Fajar A B
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 +07:00
+date: 2011-04-24 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,7 +124,39 @@ dependencies:
   name: rcov
   prerelease: false
   type: :development
-description: This gem consists two additional geocoders for geokit, Yahoo! PlaceFinder and Google V3
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
+  version_requirements: *id008
+  name: api_cache
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  version_requirements: *id009
+  name: moneta
+  prerelease: false
+  type: :development
+description: This gem consists two additional geocoders for geokit, Yahoo! PlaceFinder and Google V3.  And add support for caching using api_caching gem.
 email: fajar.ab@gmail.com
 executables: []