darrell-geokit 1.2.4.1 → 1.4.1.1

data/test/test_ipgeocoder.rb

@@ -0,0 +1,88 @@
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), 'test_base_geocoder')
+
+class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
+    
+  IP_FAILURE=<<-EOF
+    Country: (Private Address) (XX)
+    City: (Private Address)
+    Latitude: 
+    Longitude:
+    EOF
+    
+  IP_SUCCESS=<<-EOF
+    Country: UNITED STATES (US)
+    City: Sugar Grove, IL
+    Latitude: 41.7696
+    Longitude: -88.4588
+    EOF
+    
+  IP_UNICODED=<<-EOF
+    Country: SWEDEN (SE)
+    City: Borås
+    Latitude: 57.7167
+    Longitude: 12.9167
+    EOF
+    
+    def setup
+      super
+      @success.provider = "hostip"
+    end    
+  
+  def test_successful_lookup
+    success = MockSuccess.new
+    success.expects(:body).returns(IP_SUCCESS)
+    url = 'http://api.hostip.info/get_html.php?ip=12.215.42.19&position=true'
+    GeoKit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(success)
+    location = GeoKit::Geocoders::IpGeocoder.geocode('12.215.42.19')
+    assert_not_nil location
+    assert_equal 41.7696, location.lat
+    assert_equal(-88.4588, location.lng)
+    assert_equal "Sugar Grove", location.city
+    assert_equal "IL", location.state
+    assert_equal "US", location.country_code
+    assert_equal "hostip", location.provider
+    assert location.success?
+  end
+  
+  def test_unicoded_lookup
+    success = MockSuccess.new
+    success.expects(:body).returns(IP_UNICODED)
+    url = 'http://api.hostip.info/get_html.php?ip=12.215.42.19&position=true'
+    GeoKit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(success)
+    location = GeoKit::Geocoders::IpGeocoder.geocode('12.215.42.19')
+    assert_not_nil location
+    assert_equal 57.7167, location.lat
+    assert_equal 12.9167, location.lng
+    assert_equal "Bor\303\245s", location.city
+    assert_nil location.state
+    assert_equal "SE", location.country_code
+    assert_equal "hostip", location.provider
+    assert location.success?
+  end
+  
+  def test_failed_lookup
+    failure = MockSuccess.new
+    failure.expects(:body).returns(IP_FAILURE)
+    url = 'http://api.hostip.info/get_html.php?ip=10.10.10.10&position=true'
+    GeoKit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(failure)
+    location = GeoKit::Geocoders::IpGeocoder.geocode("10.10.10.10")
+    assert_not_nil location
+    assert !location.success?
+  end
+  
+  def test_invalid_ip
+    location = GeoKit::Geocoders::IpGeocoder.geocode("blah")
+    assert_not_nil location
+    assert !location.success?
+  end
+  
+  def test_service_unavailable
+    failure = MockFailure.new
+    url = 'http://api.hostip.info/get_html.php?ip=10.10.10.10&position=true'
+    GeoKit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(failure)
+    location = GeoKit::Geocoders::IpGeocoder.geocode("10.10.10.10")
+    assert_not_nil location
+    assert !location.success?
+  end  
+end

data/test/test_latlng.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'lib/geokit'
+require 'mocha'
 
 class LatLngTest < Test::Unit::TestCase #:nodoc: all
   
@@ -9,6 +10,25 @@ class LatLngTest < Test::Unit::TestCase #:nodoc: all
     @point = Geokit::LatLng.new(@loc_a.lat, @loc_a.lng)
   end
   
+  def valid_reverse_geocoding_result
+    location = Geokit::GeoLoc.new({
+      :city => "Essen",
+      :country_code => "DE",
+      :lat => 51.4578329,
+      :lng => 7.0166848,
+      :provider => "google",
+      :state => "Nordrhein-Westfalen",
+      :street_address => "Porscheplatz 1",
+      :zip => "45127"
+    })
+    
+    location.full_address = "Porscheplatz 1, 45127 Essen, Deutschland"
+    location.precision = 'address'
+    location.provider = 'google'
+    location.success = true
+    location
+  end
+  
   def test_distance_between_same_using_defaults
     assert_equal 0, Geokit::LatLng.distance_between(@loc_a, @loc_a)
     assert_equal 0, @loc_a.distance_to(@loc_a)
@@ -128,5 +148,62 @@ class LatLngTest < Test::Unit::TestCase #:nodoc: all
     res=Geokit::LatLng.normalize([lat,lng])
     assert_equal res,Geokit::LatLng.new(lat,lng)
   end
+  
+  def test_hash
+    lat=37.7690
+    lng=-122.443
+    first = Geokit::LatLng.new(lat,lng)
+    second = Geokit::LatLng.new(lat,lng)
+    assert_equal first.hash, second.hash
+  end
+  
+  def test_eql?
+    lat=37.7690
+    lng=-122.443
+    first = Geokit::LatLng.new(lat,lng)
+    second = Geokit::LatLng.new(lat,lng)
+    assert first.eql?(second)
+    assert second.eql?(first)
+  end
+  
+  def test_reverse_geocode
+    point = Geokit::LatLng.new(51.4578329, 7.0166848)
+    Geokit::Geocoders::MultiGeocoder.expects(:reverse_geocode).with(point).returns(valid_reverse_geocoding_result)
+    res = point.reverse_geocode
     
+    assert_equal "Nordrhein-Westfalen", res.state
+    assert_equal "Essen", res.city 
+    assert_equal "45127", res.zip
+    assert_equal "51.4578329,7.0166848", res.ll # slightly dif from yahoo
+    assert res.is_us? == false
+    assert_equal "Porscheplatz 1, 45127 Essen, Deutschland", res.full_address #slightly different from yahoo
+  end
+  
+  def test_reverse_geocoding_using_specific_geocoder
+    point = Geokit::LatLng.new(51.4578329, 7.0166848)
+    Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(point).returns(valid_reverse_geocoding_result)
+    res = point.reverse_geocode(:using => Geokit::Geocoders::GoogleGeocoder)
+
+    assert_equal "Nordrhein-Westfalen", res.state
+    assert_equal "Essen", res.city 
+    assert_equal "45127", res.zip
+    assert_equal "51.4578329,7.0166848", res.ll # slightly dif from yahoo
+    assert res.is_us? == false
+    assert_equal "Porscheplatz 1, 45127 Essen, Deutschland", res.full_address #slightly different from yahoo
+    assert_equal "google", res.provider
+  end
+  
+  def test_reverse_geocoding_using_specific_geocoder_short_syntax
+    point = Geokit::LatLng.new(51.4578329, 7.0166848)
+    Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(point).returns(valid_reverse_geocoding_result)
+    res = point.reverse_geocode(:using => :google)
+
+    assert_equal "Nordrhein-Westfalen", res.state
+    assert_equal "Essen", res.city 
+    assert_equal "45127", res.zip
+    assert_equal "51.4578329,7.0166848", res.ll # slightly dif from yahoo
+    assert res.is_us? == false
+    assert_equal "Porscheplatz 1, 45127 Essen, Deutschland", res.full_address #slightly different from yahoo
+    assert_equal "google", res.provider
+  end
 end

data/test/test_multi_geocoder.rb

@@ -10,27 +10,27 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
   end
   
   def test_successful_first
-    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address).returns(@success)
+    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address, {}).returns(@success)
     assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address)
   end
   
   def test_failover
-    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address).returns(@failure)
-    Geokit::Geocoders::YahooGeocoder.expects(:geocode).with(@address).returns(@success)
+    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
+    Geokit::Geocoders::YahooGeocoder.expects(:geocode).with(@address, {}).returns(@success)
     assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address)    
   end
   
   def test_double_failover
-    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address).returns(@failure)
-    Geokit::Geocoders::YahooGeocoder.expects(:geocode).with(@address).returns(@failure)
-    Geokit::Geocoders::UsGeocoder.expects(:geocode).with(@address).returns(@success)
+    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
+    Geokit::Geocoders::YahooGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
+    Geokit::Geocoders::UsGeocoder.expects(:geocode).with(@address, {}).returns(@success)
     assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address)    
   end
   
   def test_failure
-    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address).returns(@failure)
-    Geokit::Geocoders::YahooGeocoder.expects(:geocode).with(@address).returns(@failure)
-    Geokit::Geocoders::UsGeocoder.expects(:geocode).with(@address).returns(@failure)
+    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
+    Geokit::Geocoders::YahooGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
+    Geokit::Geocoders::UsGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
     assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode(@address)    
   end
 
@@ -41,4 +41,53 @@ 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
+
+  def test_reverse_geocode_successful_first
+    Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(@latlng).returns(@success)
+    assert_equal @success, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)
+  end
+  
+  def test_reverse_geocode_failover
+    Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
+    Geokit::Geocoders::YahooGeocoder.expects(:reverse_geocode).with(@latlng).returns(@success)
+    assert_equal @success, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)    
+  end
+  
+  def test_reverse_geocode_double_failover
+    Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
+    Geokit::Geocoders::YahooGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
+    Geokit::Geocoders::UsGeocoder.expects(:reverse_geocode).with(@latlng).returns(@success)
+    assert_equal @success, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)    
+  end
+  
+  def test_reverse_geocode_failure
+    Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
+    Geokit::Geocoders::YahooGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
+    Geokit::Geocoders::UsGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
+    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)    
+  end
+
+  def test_reverse_geocode_with_invalid_provider
+    temp = Geokit::Geocoders::provider_order
+    Geokit::Geocoders.provider_order = [:bogus]
+    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)    
+    Geokit::Geocoders.provider_order = temp
+  end
+
+  def test_reverse_geocode_with_blank_latlng
+    t1 = Geokit::Geocoders.provider_order # will need to reset after
+    Geokit::Geocoders.provider_order = [:google]
+    Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with("").returns(@failure)
+    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.reverse_geocode("")
+    Geokit::Geocoders.provider_order = t1 # reset to orig values
+  end
 end

data/test/test_multi_ip_geocoder.rb

@@ -0,0 +1,38 @@
+require File.join(File.dirname(__FILE__), 'test_base_geocoder')
+
+Geokit::Geocoders::ip_provider_order=[:geo_plugin,:ip]
+
+class MultiIpGeocoderTest < BaseGeocoderTest #:nodoc: all
+  
+  def setup
+    @ip_address = '10.10.10.10'
+    @success = Geokit::GeoLoc.new({:city=>"SAN FRANCISCO", :state=>"CA", :country_code=>"US", :lat=>37.7742, :lng=>-122.417068})
+    @success.success = true
+    @failure = Geokit::GeoLoc.new
+  end
+  
+  def test_successful_first
+    Geokit::Geocoders::GeoPluginGeocoder.expects(:geocode).with(@ip_address, {}).returns(@success)
+    assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@ip_address)
+  end
+  
+  def test_failover
+    Geokit::Geocoders::GeoPluginGeocoder.expects(:geocode).with(@ip_address, {}).returns(@failure)
+    Geokit::Geocoders::IpGeocoder.expects(:geocode).with(@ip_address, {}).returns(@success)
+    assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@ip_address)
+  end
+  
+  def test_failure
+    Geokit::Geocoders::GeoPluginGeocoder.expects(:geocode).with(@ip_address, {}).returns(@failure)
+    Geokit::Geocoders::IpGeocoder.expects(:geocode).with(@ip_address, {}).returns(@failure)
+    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode(@ip_address)
+  end
+  
+  def test_invalid_provider
+    temp = Geokit::Geocoders::ip_provider_order
+    Geokit::Geocoders.ip_provider_order = [:bogus]
+    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode(@ip_address)
+    Geokit::Geocoders.ip_provider_order = temp
+  end
+
+end

data/test/test_yahoo_geocoder.rb

@@ -32,6 +32,15 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
     do_full_address_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@address))
   end 
   
+  def test_yahoo_full_address_accuracy
+    response = MockSuccess.new
+    response.expects(:body).returns(YAHOO_FULL)
+    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@address)}"
+    Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    res = Geokit::Geocoders::YahooGeocoder.geocode(@address)
+    assert_equal 8, res.accuracy
+  end
+  
   def test_yahoo_full_address_with_geo_loc
     response = MockSuccess.new
     response.expects(:body).returns(YAHOO_FULL)
@@ -48,6 +57,15 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
     do_city_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@address))
   end
   
+  def test_yahoo_city_accuracy
+    response = MockSuccess.new
+    response.expects(:body).returns(YAHOO_CITY)
+    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@address)}"
+    Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    res = Geokit::Geocoders::YahooGeocoder.geocode(@address)
+    assert_equal 4, res.accuracy
+  end
+  
   def test_yahoo_city_with_geo_loc
     response = MockSuccess.new
     response.expects(:body).returns(YAHOO_CITY)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: darrell-geokit
 version: !ruby/object:Gem::Version 
-  version: 1.2.4.1
+  version: 1.4.1.1
 platform: ruby
 authors: 
 - Andre Lewis and Bill Eisenhauer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-09 00:00:00 -08:00
+date: 2009-06-15 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -41,6 +41,7 @@ files:
 - test/test_yahoo_geocoder.rb
 has_rdoc: true
 homepage: http://geokit.rubyforge.org
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -62,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: geokit
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: none
@@ -71,8 +72,13 @@ test_files:
 - test/test_bounds.rb
 - test/test_ca_geocoder.rb
 - test/test_geoloc.rb
+- test/test_geoplugin_geocoder.rb
 - test/test_google_geocoder.rb
+- test/test_google_reverse_geocoder.rb
+- test/test_inflector.rb
+- test/test_ipgeocoder.rb
 - test/test_latlng.rb
 - test/test_multi_geocoder.rb
+- test/test_multi_ip_geocoder.rb
 - test/test_us_geocoder.rb
 - test/test_yahoo_geocoder.rb