geocoder_plus 0.1.1 → 0.2.0

data/README

@@ -23,4 +23,3 @@ Geokit::Geocoders::GoogleV3Geocoder.geocode('701 First Avenue Sunnyvale, Califor
 
 Copyright (c) 2011 Fajar A B. See LICENSE.txt for
 further details.
-

data/README.rdoc

@@ -1,6 +1,13 @@
 = geocoder_plus
 
-Description goes here.
+This gem has two additional geocoders for geokit gem, Yahoo! PlaceFinder and Google V3.
+Google V3 code is taken from https://github.com/tello/google-v3-geocoder.
+
+Example:
+
+Geokit::Geocoders::YahooPlaceFinderGeocoder.geocode('701 First Avenue Sunnyvale, California 94089')
+Geokit::Geocoders::GoogleV3Geocoder.geocode('701 First Avenue Sunnyvale, California 94089')
+
 
 == Contributing to geocoder_plus
  
@@ -15,5 +22,4 @@ Description goes here.
 == Copyright
 
 Copyright (c) 2011 Fajar A B. See LICENSE.txt for
-further details.
-
+further details.

data/lib/geocoder.rb

@@ -0,0 +1,55 @@
+module Geokit
+  module Geocoders
+    
+    @@cache = nil
+    @@hydra = nil
+    __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
+      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
+          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
+      
+      # 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
+          Geokit::Geocoders::hydra.queue(req)
+          Geokit::Geocoders::hydra.run
+          return req.response
+        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,
+                  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
+        end
+      end
+    end
+    
+  end  
+end

data/lib/geocoder_plus.rb

@@ -1,5 +1,28 @@
 require 'geokit'
 require 'geokit/geocoders.rb'
+require 'geocoder'
 require 'yajl'
 require 'geocoders/yahoo_place_finder_geocoder'
-require 'geocoders/google_v3_geocoder'
+require 'geocoders/google_v3_geocoder'
+
+
+
+# finally, set up the http service Koala methods used to make requests
+# you can use your own (for HTTParty, etc.) by calling Koala.http_service = YourModule
+# def self.http_service=(service)
+#   self.send(:include, service)
+# end
+
+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)
+  begin
+    require 'typhoeus'
+  rescue LoadError
+    puts "Typhoeus is not installed, using Net:HTTP. Install typhoeus to enable query caching."
+  end
+end

data/lib/geocoders/google_v3_geocoder.rb

@@ -10,7 +10,7 @@ module Geokit
         logger.debug "Making Geocode request to:  #{geo_url}"
         res = self.call_geocoder_service(geo_url)
 
-        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
+        # 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)

data/lib/geocoders/yahoo_place_finder_geocoder.rb

@@ -23,7 +23,7 @@ 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))
-        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
+        # 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))

data/test/test_yahoo_place_finder_geocoder.rb

@@ -2,6 +2,7 @@ require 'helper'
 
 class TestYahooPlaceFinderGeocoder < Test::Unit::TestCase
     
+  # TODO do test with mock result
   # default is true
   MOCK = false
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geocoder_plus
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Fajar A B
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +07:00
+date: 2011-04-09 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -135,6 +135,7 @@ extra_rdoc_files:
 - README
 - README.rdoc
 files: 
+- lib/geocoder.rb
 - lib/geocoder_plus.rb
 - lib/geocoders/google_v3_geocoder.rb
 - lib/geocoders/yahoo_place_finder_geocoder.rb