@@ -1,3 +1,4 @@ .loadpath .project pkg +.idea .gitignore @@ -1,3 +1,6 @@ +=== 1.3.2 / 2009-05-27 +* Fixed blank address geocoding bug + === 1.3.1 / 2009-05-21 * Support for External geocoders file (thanks dreamcat4) * Support multiple ip geocoders, including new setting for ip_provider_order (thanks dreamcat4) History.txt @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = %q{geokit} - s.version = "1.3.1" + s.version = "1.3.2" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Andre Lewis and Bill Eisenhauer"] geokit.gemspec @@ -1,5 +1,5 @@ module Geokit - VERSION = '1.3.1' + VERSION = '1.3.2' # These defaults are used in Geokit::Mappable.distance_to and in acts_as_mappable @@default_units = :miles @@default_formula = :sphere lib/geokit.rb @@ -564,7 +564,7 @@ module Geokit # The failover approach is crucial for production-grade apps, but is rarely used. # 98% of your geocoding calls will be successful with the first call def self.do_geocode(address) - geocode_ip = !!/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?$/.match(address) + geocode_ip = /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/.match(address) provider_order = geocode_ip ? Geokit::Geocoders::ip_provider_order : Geokit::Geocoders::provider_order provider_order.each do |provider| lib/geokit/geocoders.rb @@ -41,4 +41,14 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all Geokit::Geocoders.provider_order = temp end + def test_blank_address + t1, t2 = Geokit::Geocoders.provider_order, Geokit::Geocoders.ip_provider_order # will need to reset after + Geokit::Geocoders.provider_order = [:google] + Geokit::Geocoders.ip_provider_order = [:geo_plugin] + Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with("").returns(@failure) + Geokit::Geocoders::GeoPluginGeocoder.expects(:geocode).never + assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode("") + Geokit::Geocoders.provider_order, Geokit::Geocoders.ip_provider_order = t1, t2 # reset to orig values + end + end \ No newline at end of file test/test_multi_geocoder.rb 4271f870b15092e1d0c0444538194d4ba3a54bbe Andre Lewis andre@highgroove.com http://github.com/andre/geokit-gem/commit/2fb064d7df55a23a851fcf9df46b2838c18839b2 2fb064d7df55a23a851fcf9df46b2838c18839b2 2009-05-27T09:24:28-07:00 2009-05-27T09:24:28-07:00 fixed blank address regex 138e9b2aedb86e972fef0f985104daefc6f7f6a5 Andre Lewis andre@highgroove.com