geocoder_plus 0.1.0

data/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Fajar A B
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README

@@ -0,0 +1,26 @@
+= geocoder_plus
+
+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
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+== Copyright
+
+Copyright (c) 2011 Fajar A B. See LICENSE.txt for
+further details.
+

data/README.rdoc

@@ -0,0 +1,19 @@
+= geocoder_plus
+
+Description goes here.
+
+== Contributing to geocoder_plus
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+== Copyright
+
+Copyright (c) 2011 Fajar A B. See LICENSE.txt for
+further details.
+

data/lib/geocoder_plus.rb

@@ -0,0 +1,5 @@
+require 'geokit'
+require 'geokit/geocoders.rb'
+require 'yajl'
+require 'geocoders/yahoo_place_finder_geocoder'
+require 'geocoders/google_v3_geocoder'

data/lib/geocoders/google_v3_geocoder.rb

@@ -0,0 +1,123 @@
+# this code is taken from https://github.com/tello/google-v3-geocoder
+
+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)
+      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}"
+          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'
+            logger.info "Found no results from google v3"
+            return GeoLoc.new
+          end
+          logger.error "Got an error from google, response: #{json}"
+          # Otherwise, we don't know what to do
+          return GeoLoc.new
+        end
+
+        begin
+          results = data['results']
+          geoloc = nil
+          results.each do |result|
+            extracted_geoloc = self.extract_location(result)
+            if geoloc.nil?
+              geoloc = extracted_geoloc
+            else
+              geoloc.all.push(extracted_geoloc)
+            end
+          end
+        rescue Exception => e
+          logger.error "Encountered unexpected exception during google geocoding: #{e.inspect}"
+          return GeoLoc.new
+        end
+
+        return geoloc
+      end
+  
+      def self.extract_location(result)
+        res = GeoLoc.new
+        res.provider = 'google_v3'
+    
+        res.lat = result['geometry']['location']['lat']
+        res.lng = result['geometry']['location']['lng']
+
+        res.full_address = result['formatted_address']
+
+        street_number = nil
+        street_name = nil
+
+        result['address_components'].each do |component|
+          types = component['types']
+
+          if types.include?('street_number')
+            street_number = component['long_name']
+          end
+
+          if types.include?('route')
+            street_name = component['long_name']
+          end
+
+          if types.include?('country')
+            res.country = component['long_name']
+            res.country_code = component['short_name']
+          end
+
+          if types.include?('administrative_area_level_1')
+            res.state = component['short_name']
+          end
+
+          if types.include?('postal_code')
+            res.zip = component['long_name']
+          end
+
+          if types.include?('locality')
+            res.city = component['long_name']
+          end
+
+          if types.include?('postal_code')
+            res.zip = component['long_name']
+          end
+      
+        end
+        res.street_address = [street_number, street_name].reject{|x| x.nil?}.join(" ")
+
+        # Set the bounds from the viewport
+        bounds = result['geometry']['viewport']
+        res.suggested_bounds = Bounds.normalize(
+          [bounds['southwest']['lat'], bounds['southwest']['lng']],
+          [bounds['northeast']['lat'], bounds['northeast']['lng']]
+        )
+
+        res.success = true
+        return res
+      end
+    end
+  end
+end

data/lib/geocoders/yahoo_place_finder_geocoder.rb

@@ -0,0 +1,113 @@
+module Geokit
+  module Geocoders
+    class YahooPlaceFinderGeocoder < Geocoder
+      private
+      
+      def self.get_url(address, options={})        
+        if (options[:reverse])
+          latlng=LatLng.normalize(address)
+          yql = "select * from geo.placefinder where text='#{latlng}' and gflags='R'"
+        else
+          address_str = address.is_a?(GeoLoc) ? address.to_geocodeable_s : address
+          yql = "select * from geo.placefinder where text='#{address}'"
+        end
+        return "http://query.yahooapis.com/v1/public/yql?q=#{Geokit::Inflector::url_escape(yql)}&format=json"
+      end
+      
+      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))
+      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))
+      rescue 
+        logger.info "Caught an error during Yahoo PlaceFinder geocoding call: "+$!
+        return GeoLoc.new
+      end
+
+      def self.parse_body(body)
+        count = body['query']['count']
+        if (count == 1)
+          return extract_place(body['query']['results']['Result'])
+        elsif (count > 1)
+          results = body['query']['results']['Result']
+          geoloc = nil
+          results.each do |r|
+            extracted_geoloc = extract_place(r)
+            if geoloc.nil? 
+              # first time through, geoloc is still nil, so we make it the geoloc we just extracted
+              geoloc = extracted_geoloc 
+            else
+              # second (and subsequent) iterations, we push additional 
+              # geoloc onto "geoloc.all" 
+              geoloc.all.push(extracted_geoloc) 
+            end  
+          end
+          return geoloc
+        else
+          return GeoLoc.new
+        end
+      end
+      
+      def self.extract_place(result)
+        geoloc = GeoLoc.new
+
+        # basics
+        geoloc.lat            = result['latitude']
+        geoloc.lng            = result['longitude']
+        geoloc.country_code   = result['countrycode']
+        geoloc.provider       = 'Yahoo! PlaceFinder'
+
+        # extended -- false if not not available
+        geoloc.street_address = result['line1']
+        geoloc.city           = result['city']
+        # geoloc.neighborhood   = result['neighborhood']        
+        # geoloc.county         = result['county']      
+        geoloc.zip            = result['postal']
+        geoloc.country        = result['country']    
+        # geoloc.quality        = result['quality']        
+        # geoloc.woeid          = result['woeid']        
+        # geoloc.woetype        = result['woetype']        
+        if geoloc.is_us?
+          geoloc.state = result['statecode']
+        else
+          geoloc.state = result['state']
+        end
+        case result['quality'].to_i
+          when 9,10        then geoloc.precision = 'country'
+          when 19..30      then geoloc.precision = 'state'
+          when 39,40       then geoloc.precision = 'city'
+          when 49,50       then geoloc.precision = 'neighborhood'
+          when 59,60,64    then geoloc.precision = 'zip'
+          when 74,75       then geoloc.precision = 'zip+4'
+          when 70..72      then geoloc.precision = 'street'
+          when 80..87      then geoloc.precision = 'address'
+          when 62,63,90,99 then geoloc.precision = 'building'
+          else 'unknown'
+        end
+        
+        geoloc.accuracy = %w{unknown country state state city zip zip+4 street address building}.index(geoloc.precision)
+        # geoloc.full_address = "#{geoloc.street_address}, #{result['line2']}, #{geoloc.country}" if (geoloc.street_address && result['line2'])
+
+        # google returns a set of suggested boundaries for the geocoded result
+        # if suggested_bounds = doc.elements['//LatLonBox']  
+        #   res.suggested_bounds = Bounds.normalize(
+        #                           [suggested_bounds.attributes['south'], suggested_bounds.attributes['west']], 
+        #                           [suggested_bounds.attributes['north'], suggested_bounds.attributes['east']])
+        # end
+
+        geoloc.success = true
+
+        return geoloc
+      end
+      
+    end  
+  end
+end

data/test/helper.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'test/unit'
+require 'shoulda'
+require 'mocha'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'geocoder_plus'
+
+class Test::Unit::TestCase
+end

data/test/test_geocoder_plus.rb

@@ -0,0 +1,7 @@
+require 'helper'
+
+class TestGeocoderPlus < Test::Unit::TestCase
+  should "probably rename this file and start testing for real" do
+    flunk "hey buddy, you should probably rename this file and start testing for real"
+  end
+end

data/test/test_google_v3_geocoder.rb

@@ -0,0 +1,280 @@
+# this code is taken from https://github.com/tello/google-v3-geocoder
+
+require 'helper'
+
+class GoogleV3GeocoderTest < Test::Unit::TestCase
+  include Geokit
+  
+  GOOD_JSON = <<-JSON
+{
+  "status": "OK",
+  "results": [ {
+    "types": [ "street_address" ],
+    "formatted_address": "1288 E Hillsdale Blvd, Foster City, CA 94404, USA",
+    "address_components": [ {
+      "long_name": "1288",
+      "short_name": "1288",
+      "types": [ "street_number" ]
+    }, {
+      "long_name": "E Hillsdale Blvd",
+      "short_name": "E Hillsdale Blvd",
+      "types": [ "route" ]
+    }, {
+      "long_name": "Foster City",
+      "short_name": "Foster City",
+      "types": [ "locality", "political" ]
+    }, {
+      "long_name": "San Mateo",
+      "short_name": "San Mateo",
+      "types": [ "administrative_area_level_3", "political" ]
+    }, {
+      "long_name": "San Mateo",
+      "short_name": "San Mateo",
+      "types": [ "administrative_area_level_2", "political" ]
+    }, {
+      "long_name": "California",
+      "short_name": "CA",
+      "types": [ "administrative_area_level_1", "political" ]
+    }, {
+      "long_name": "United States",
+      "short_name": "US",
+      "types": [ "country", "political" ]
+    }, {
+      "long_name": "94404",
+      "short_name": "94404",
+      "types": [ "postal_code" ]
+    } ],
+    "geometry": {
+      "location": {
+        "lat": 37.5684570,
+        "lng": -122.2660670
+      },
+      "location_type": "ROOFTOP",
+      "viewport": {
+        "southwest": {
+          "lat": 37.5653094,
+          "lng": -122.2692146
+        },
+        "northeast": {
+          "lat": 37.5716046,
+          "lng": -122.2629194
+        }
+      }
+    }
+  } ]
+}
+  JSON
+
+  def test_get_url_adds_bias_if_set
+    bias = 'thefreakingus'
+    result = Geokit::Geocoders::GoogleV3Geocoder.send :get_url, 'address', :bias => bias
+    assert_match /&region=#{bias}/, result
+  end
+
+  def test_get_url_escapes_address
+    address = '123 hotel street'
+    result = Geokit::Geocoders::GoogleV3Geocoder.send :get_url, address
+    assert_match /&address=#{Regexp.escape(Geokit::Inflector::url_escape(address))}/, result
+  end
+  
+  def test_convert_json_to_geoloc_extracts_result_from_json
+    result = Geokit::Geocoders::GoogleV3Geocoder.send :convert_json_to_geoloc, GOOD_JSON
+    assert result.success
+    assert_equal 1, result.all.size
+    assert_equal '1288 E Hillsdale Blvd, Foster City, CA 94404, USA', result.full_address
+  end
+
+  def test_convert_json_to_geoloc_handles_empty_result_set
+    empty_json = '{"status": "ZERO_RESULTS","results": [ ]}'
+    result = Geokit::Geocoders::GoogleV3Geocoder.send :convert_json_to_geoloc, empty_json
+    assert !result.success
+    assert_equal 1, result.all.size
+    assert_nil result.lat
+    assert_nil result.lng
+  end
+
+  def test_convert_json_to_geoloc_calls_extract_location
+    expected_geoloc = GeoLoc.new
+    expected_geoloc.city = "SOME City"
+    Geokit::Geocoders::GoogleV3Geocoder.expects(:extract_location).returns expected_geoloc
+
+    result = Geokit::Geocoders::GoogleV3Geocoder.send :convert_json_to_geoloc, GOOD_JSON
+    assert_equal result, expected_geoloc
+  end
+
+  def test_convert_json_to_handles_multiple_results
+    address1 = 'add1'
+    address2 = 'add2'
+    
+    input_data = {
+      "status" => "OK",
+      "results" =>
+        [
+        {
+          "types" => [ "street_address" ],
+          "formatted_address" => address1,
+          "address_components" => [],
+          "geometry" => {
+            "location"=> {
+              "lat"=>  35.58032,
+              "lng"=> -122.2660670
+            },
+            "location_type"=> "ROOFTOP",
+            "viewport"=> {
+              "southwest"=> {
+                "lat"=> 37.5653094,
+                "lng"=> -122.2692146,
+              },
+              "northeast"=> {
+                "lat"=> 37.5716046,
+                "lng"=> -122.2629194
+              }
+            },
+          },
+        },
+        {
+          "types" => [ "street_address" ],
+          "formatted_address" => address2,
+          "address_components" => [],
+          "geometry" => {
+            "location"=> {
+              "lat"=>  35.58032,
+              "lng"=> -122.2660670
+            },
+            "location_type"=> "ROOFTOP",
+            "viewport"=> {
+              "southwest"=> {
+                "lat"=> 37.5653094,
+                "lng"=> -122.2692146,
+              },
+              "northeast"=> {
+                "lat"=> 37.5716046,
+                "lng"=> -122.2629194
+              }
+            },
+          },
+        }
+      ]
+    }
+    result = Geokit::Geocoders::GoogleV3Geocoder.send :convert_json_to_geoloc, Yajl::Encoder.encode(input_data)
+    assert result.success
+    assert_equal 2, result.all.size
+    assert_equal address1, result.all[0].full_address
+    assert_equal address2, result.all[1].full_address
+  end
+
+  def test_extract_location_extracts_result_from_json
+    data = Yajl::Parser.parse(GOOD_JSON)['results'][0]
+    result = Geokit::Geocoders::GoogleV3Geocoder.send :extract_location, data
+    assert_equal 'Foster City', result.city
+    assert_equal 'CA', result.state
+    assert_equal '94404', result.zip
+    assert_equal 'United States', result.country
+    assert_equal 'US', result.country_code
+    assert_equal '1288 E Hillsdale Blvd', result.street_address
+    assert_equal '1288 E Hillsdale Blvd, Foster City, CA 94404, USA', result.full_address
+    assert_equal 37.5653094, result.suggested_bounds.sw.lat
+    assert_equal -122.2692146, result.suggested_bounds.sw.lng
+    assert_equal 37.5716046, result.suggested_bounds.ne.lat
+    assert_equal -122.2629194, result.suggested_bounds.ne.lng
+  end
+
+  def test_extract_joins_street_address_with_no_number
+    route_name = 'Foo'
+    data =
+      {
+      "types" => [ "street_address" ],
+      "formatted_address" => 'address1',
+      "address_components" => [
+        {'types' => ['route'], 'long_name' => route_name, 'short_name' => route_name}
+      ],
+      "geometry" => {
+        "location"=> {
+          "lat"=>  35.58032,
+          "lng"=> -122.2660670
+        },
+        "location_type"=> "ROOFTOP",
+        "viewport"=> {
+          "southwest"=> {
+            "lat"=> 37.5653094,
+            "lng"=> -122.2692146,
+          },
+          "northeast"=> {
+            "lat"=> 37.5716046,
+            "lng"=> -122.2629194
+          }
+        },
+      },
+    }
+    
+    result = Geokit::Geocoders::GoogleV3Geocoder.send :extract_location, data
+    assert_equal route_name, result.street_address
+  end
+
+  def test_extract_joins_street_address_with_no_route
+    number = '358'
+    data =
+      {
+      "types" => [ "street_address" ],
+      "formatted_address" => 'address1',
+      "address_components" => [
+        {'types' => ['street_number'], 'long_name' => number, 'short_name' => number},
+      ],
+      "geometry" => {
+        "location"=> {
+          "lat"=>  35.58032,
+          "lng"=> -122.2660670
+        },
+        "location_type"=> "ROOFTOP",
+        "viewport"=> {
+          "southwest"=> {
+            "lat"=> 37.5653094,
+            "lng"=> -122.2692146,
+          },
+          "northeast"=> {
+            "lat"=> 37.5716046,
+            "lng"=> -122.2629194
+          }
+        },
+      },
+    }
+
+    result = Geokit::Geocoders::GoogleV3Geocoder.send :extract_location, data
+    assert_equal number, result.street_address
+  end
+
+  def test_extract_joins_street_address_with_number_and_route
+    route_name = 'Foo'
+    number = '3854'
+    data =
+      {
+      "types" => [ "street_address" ],
+      "formatted_address" => 'address1',
+      "address_components" => [
+        {'types' => ['route'], 'long_name' => route_name, 'short_name' => route_name},
+        {'types' => ['street_number'], 'long_name' => number, 'short_name' => number}
+      ],
+      "geometry" => {
+        "location"=> {
+          "lat"=>  35.58032,
+          "lng"=> -122.2660670
+        },
+        "location_type"=> "ROOFTOP",
+        "viewport"=> {
+          "southwest"=> {
+            "lat"=> 37.5653094,
+            "lng"=> -122.2692146,
+          },
+          "northeast"=> {
+            "lat"=> 37.5716046,
+            "lng"=> -122.2629194
+          }
+        },
+      },
+    }
+
+    result = Geokit::Geocoders::GoogleV3Geocoder.send :extract_location, data
+    assert_equal number + ' ' + route_name, result.street_address
+  end
+
+end

data/test/test_yahoo_place_finder_geocoder.rb

@@ -0,0 +1,139 @@
+require 'helper'
+
+class TestYahooPlaceFinderGeocoder < Test::Unit::TestCase
+    
+  # default is true
+  MOCK = false
+  
+  US_FULL_ADDRESS=<<-EOF.strip
+    {"query":{"count":1,"created":"2011-04-03T01:20:47Z","lang":"en-US","results":{"Result":{"quality":"87","latitude":"37.792418","longitude":"-122.393913","offsetlat":"37.792332","offsetlon":"-122.394027","radius":"500","name":null,"line1":"100 Spear St","line2":"San Francisco, CA  94105-1578","line3":null,"line4":"United States","house":"100","street":"Spear St","xstreet":null,"unittype":null,"unit":null,"postal":"94105-1578","neighborhood":null,"city":"San Francisco","county":"San Francisco County","state":"California","country":"United States","countrycode":"US","statecode":"CA","countycode":null,"uzip":"94105","hash":"0FA06819B5F53E75","woeid":"12797156","woetype":"11"}}}}
+  EOF
+  
+  US_CITY=<<-EOF.strip
+    {"query":{"count":1,"created":"2011-04-04T15:10:42Z","lang":"en-US","results":{"Result":{"quality":"40","latitude":"37.777125","longitude":"-122.419644","offsetlat":"37.777125","offsetlon":"-122.419644","radius":"10700","name":null,"line1":null,"line2":"San Francisco, CA","line3":null,"line4":"United States","house":null,"street":null,"xstreet":null,"unittype":null,"unit":null,"postal":null,"neighborhood":null,"city":"San Francisco","county":"San Francisco County","state":"California","country":"United States","countrycode":"US","statecode":"CA","countycode":null,"uzip":"94102","hash":null,"woeid":"2487956","woetype":"7"}}}}
+  EOF
+  
+  context "given a US full address" do
+    setup do
+      full_address = '100 Spear St, San Francisco, CA, 94105-1522, US'
+      if MOCK
+        response = Typhoeus::Response.new(@success_response.merge(:body => US_FULL_ADDRESS))
+        Geokit::Geocoders::YahooPlaceFinderGeocoder.expects(:make_request).with('get', :params => {:q => "select * from geo.placefinder where text='#{full_address}'", :format => 'json'}).returns(response)
+      end
+      @pf = Geokit::Geocoders::YahooPlaceFinderGeocoder.geocode(full_address)
+    end
+    
+    should "return correct geo location" do
+      do_full_address_assertions(@pf)
+      assert @pf.is_us?
+    end
+    
+    should "have 'address' accuracy" do
+      assert_equal 'address', @pf.precision
+    end    
+  end
+  
+  context "given a US city" do
+    setup do
+      city = 'San Francisco, CA'
+      if MOCK
+        response = Typhoeus::Response.new(@success_response.merge(:body => US_CITY))
+        Geokit::Geocoders::YahooPlaceFinderGeocoder.expects(:make_request).with('get', :params => {:q => "select * from geo.placefinder where text='#{city}'", :format => 'json'}).returns(response)
+      end
+      @pf = Geokit::Geocoders::YahooPlaceFinderGeocoder.geocode(city)
+    end
+    
+    should "return correct geo location" do
+      do_city_assertions(@pf)
+      assert @pf.is_us?
+    end
+    
+    should "have 'address' accuracy" do
+      assert_equal 'city', @pf.precision
+    end    
+  end
+  
+  context "given a non-US street" do
+    setup do
+      full_address = 'Jalan Gandaria Tengah, Jakarta 12140, Indonesia'
+      if MOCK
+        response = Typhoeus::Response.new(@success_response.merge(:body => US_FULL_ADDRESS))
+        Geokit::Geocoders::YahooPlaceFinderGeocoder.expects(:make_request).with('get', :params => {:q => "select * from geo.placefinder where text='#{full_address}'", :format => 'json'}).returns(response)
+      end
+      @pf = Geokit::Geocoders::YahooPlaceFinderGeocoder.geocode(full_address)
+    end
+    
+    should "return correct geo location" do
+      do_non_us_street_assertions(@pf)
+    end
+    
+    should "have 'address' accuracy" do
+      assert_equal 'street', @pf.precision
+    end    
+  end
+  
+  context "given a non-US city" do
+    setup do
+      city = 'Jakarta, Indonesia'
+      if MOCK
+        response = Typhoeus::Response.new(@success_response.merge(:body => US_CITY))
+        Geokit::Geocoders::YahooPlaceFinderGeocoder.expects(:make_request).with('get', :params => {:q => "select * from geo.placefinder where text='#{city}'", :format => 'json'}).returns(response)
+      end
+      @pf = Geokit::Geocoders::YahooPlaceFinderGeocoder.geocode(city)
+    end
+    
+    should "return correct geo location" do
+      do_non_us_city_assertions(@pf)
+    end
+    
+    should "have 'address' accuracy" do
+      assert_equal 'city', @pf.precision
+    end    
+  end
+  
+  
+  
+  
+  
+  private
+  
+  # next two methods do the assertions for both address-level and city-level lookups
+  def do_full_address_assertions(resp)
+    assert_equal "CA", resp.state
+    assert_equal "San Francisco", resp.city
+    assert_equal "37.792418,-122.393913", resp.ll
+    assert resp.is_us?
+    assert_equal "100 Spear St, San Francisco, CA, 94105-1578, US", resp.full_address
+    assert_equal "Yahoo! PlaceFinder", resp.provider
+  end
+  
+  def do_city_assertions(resp)
+    assert_equal "CA", resp.state
+    assert_equal "San Francisco", resp.city 
+    assert_equal "37.777125,-122.419644", resp.ll
+    assert resp.is_us?
+    assert_equal "San Francisco, CA, US", resp.full_address 
+    assert_nil resp.street_address
+    assert_equal "Yahoo! PlaceFinder", resp.provider
+  end
+  
+  def do_non_us_street_assertions(resp)
+    assert_equal "D K I Jakarta", resp.state
+    assert_equal "Kebayoran Baru", resp.city
+    assert_equal "-6.246406,106.789707", resp.ll
+    assert_equal false, resp.is_us?
+    assert_equal "Jalan Gandaria Tengah 3, Kebayoran Baru, D K I Jakarta, 12140, ID", resp.full_address
+    assert_equal "Yahoo! PlaceFinder", resp.provider
+  end
+  
+  def do_non_us_city_assertions(resp)
+    assert_equal "DKI Jakarta", resp.state
+    assert_equal "Jakarta", resp.city 
+    assert_equal "-6.17144,106.82782", resp.ll
+    assert_equal false, resp.is_us?
+    assert_equal "Jakarta, DKI Jakarta, ID", resp.full_address 
+    assert_nil resp.street_address
+    assert_equal "Yahoo! PlaceFinder", resp.provider
+  end
+
+end

metadata

@@ -0,0 +1,246 @@
+--- !ruby/object:Gem::Specification 
+name: geocoder_plus
+version: !ruby/object:Gem::Version 
+  hash: 27
+  prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
+platform: ruby
+authors: 
+- Fajar A B
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2011-04-06 00:00:00 +07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  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
+- !ruby/object:Gem::Dependency 
+  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
+- !ruby/object:Gem::Dependency 
+  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
+- !ruby/object:Gem::Dependency 
+  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
+- !ruby/object:Gem::Dependency 
+  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
+- !ruby/object:Gem::Dependency 
+  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
+- !ruby/object:Gem::Dependency 
+  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
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
+        version: 1.5.0
+  version_requirements: *id008
+  name: geokit
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 8
+        - 2
+        version: 0.8.2
+  version_requirements: *id009
+  name: yajl-ruby
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id010
+  name: shoulda
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id011
+  name: mocha
+  prerelease: false
+  type: :development
+description: This gem consists two additional geocoders for geokit, Yahoo! PlaceFinder and Google V3
+email: fajar.ab@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- LICENSE.txt
+- README
+- README.rdoc
+files: 
+- lib/geocoder_plus.rb
+- lib/geocoders/google_v3_geocoder.rb
+- lib/geocoders/yahoo_place_finder_geocoder.rb
+- LICENSE.txt
+- README
+- README.rdoc
+- test/helper.rb
+- test/test_geocoder_plus.rb
+- test/test_google_v3_geocoder.rb
+- test/test_yahoo_place_finder_geocoder.rb
+has_rdoc: true
+homepage: http://github.com/fajarb/geocoder_plus
+licenses: 
+- MIT
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.6.1
+signing_key: 
+specification_version: 3
+summary: Additional geocoders for geokit gem
+test_files: 
+- test/helper.rb
+- test/test_geocoder_plus.rb
+- test/test_google_v3_geocoder.rb
+- test/test_yahoo_place_finder_geocoder.rb