steveh-geokit 1.6.0 → 1.6.1

data/lib/geokit/version.rb

@@ -1,3 +1,3 @@
 module Geokit
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/test/test_google_geocoder.rb

@@ -42,7 +42,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_google_full_address
     response = MockSuccess.new
     response.expects(:body).returns(GOOGLE_FULL)
-    url = "http://maps.google.com/maps/geo?q=#{Geokit::Inflector.url_escape(@address)}&output=xml&key=Google&oe=utf-8"
+    url = "http://maps.google.com/maps/geo?key=Google&oe=utf-8&output=xml&q=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res=Geokit::Geocoders::GoogleGeocoder.geocode(@address)
     assert_equal "CA", res.state
@@ -56,7 +56,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_google_full_address_with_geo_loc
     response = MockSuccess.new
     response.expects(:body).returns(GOOGLE_FULL)
-    url = "http://maps.google.com/maps/geo?q=#{Geokit::Inflector.url_escape(@full_address_short_zip)}&output=xml&key=Google&oe=utf-8"
+    url = "http://maps.google.com/maps/geo?key=Google&oe=utf-8&output=xml&q=#{Geokit::Inflector.url_escape(@full_address_short_zip)}"
     Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res=Geokit::Geocoders::GoogleGeocoder.geocode(@google_full_loc)
     assert_equal "CA", res.state
@@ -70,7 +70,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_google_full_address_accuracy
     response = MockSuccess.new
     response.expects(:body).returns(GOOGLE_FULL)
-    url = "http://maps.google.com/maps/geo?q=#{Geokit::Inflector.url_escape(@full_address_short_zip)}&output=xml&key=Google&oe=utf-8"
+    url = "http://maps.google.com/maps/geo?key=Google&oe=utf-8&output=xml&q=#{Geokit::Inflector.url_escape(@full_address_short_zip)}"
     Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res=Geokit::Geocoders::GoogleGeocoder.geocode(@google_full_loc)
     assert_equal 8, res.accuracy
@@ -79,7 +79,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_google_city
     response = MockSuccess.new
     response.expects(:body).returns(GOOGLE_CITY)
-    url = "http://maps.google.com/maps/geo?q=#{Geokit::Inflector.url_escape(@address)}&output=xml&key=Google&oe=utf-8"
+    url = "http://maps.google.com/maps/geo?key=Google&oe=utf-8&output=xml&q=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res=Geokit::Geocoders::GoogleGeocoder.geocode(@address)
     assert_equal "CA", res.state
@@ -94,7 +94,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_google_city_accuracy
     response = MockSuccess.new
     response.expects(:body).returns(GOOGLE_CITY)
-    url = "http://maps.google.com/maps/geo?q=#{Geokit::Inflector.url_escape(@address)}&output=xml&key=Google&oe=utf-8"
+    url = "http://maps.google.com/maps/geo?key=Google&oe=utf-8&output=xml&q=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res=Geokit::Geocoders::GoogleGeocoder.geocode(@address)
     assert_equal 4, res.accuracy
@@ -103,7 +103,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_google_city_with_geo_loc
     response = MockSuccess.new
     response.expects(:body).returns(GOOGLE_CITY)
-    url = "http://maps.google.com/maps/geo?q=#{Geokit::Inflector.url_escape(@address)}&output=xml&key=Google&oe=utf-8"
+    url = "http://maps.google.com/maps/geo?key=Google&oe=utf-8&output=xml&q=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res=Geokit::Geocoders::GoogleGeocoder.geocode(@google_city_loc)
     assert_equal "CA", res.state
@@ -118,7 +118,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_google_suggested_bounds
     response = MockSuccess.new
     response.expects(:body).returns(GOOGLE_RESULT_WITH_SUGGESTED_BOUNDS)
-    url = "http://maps.google.com/maps/geo?q=#{Geokit::Inflector.url_escape(@full_address_short_zip)}&output=xml&key=Google&oe=utf-8"
+    url = "http://maps.google.com/maps/geo?key=Google&oe=utf-8&output=xml&q=#{Geokit::Inflector.url_escape(@full_address_short_zip)}"
     Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res = Geokit::Geocoders::GoogleGeocoder.geocode(@google_full_loc)
 
@@ -128,7 +128,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_service_unavailable
     response = MockFailure.new
-    url = "http://maps.google.com/maps/geo?q=#{Geokit::Inflector.url_escape(@address)}&output=xml&key=Google&oe=utf-8"
+    url = "http://maps.google.com/maps/geo?key=Google&oe=utf-8&output=xml&q=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     assert !Geokit::Geocoders::GoogleGeocoder.geocode(@google_city_loc).success
   end
@@ -137,7 +137,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
     #Geokit::Geocoders::GoogleGeocoder.do_geocode('via Sandro Pertini 8, Ossona, MI')
     response = MockSuccess.new
     response.expects(:body).returns(GOOGLE_MULTI)
-    url = "http://maps.google.com/maps/geo?q=#{Geokit::Inflector.url_escape('via Sandro Pertini 8, Ossona, MI')}&output=xml&key=Google&oe=utf-8"
+    url = "http://maps.google.com/maps/geo?key=Google&oe=utf-8&output=xml&q=#{Geokit::Inflector.url_escape('via Sandro Pertini 8, Ossona, MI')}"
     Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res=Geokit::Geocoders::GoogleGeocoder.geocode('via Sandro Pertini 8, Ossona, MI')
     assert_equal "Lombardy", res.state
@@ -165,7 +165,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
     madrid.lat, madrid.lng = "40.4167413", "-3.7032498"
     response = MockSuccess.new
     response.expects(:body).returns(GOOGLE_REVERSE_MADRID)
-    url = "http://maps.google.com/maps/geo?ll=#{Geokit::Inflector::url_escape(madrid.ll)}&output=xml&key=#{Geokit::Geocoders::google}&oe=utf-8"
+    url = "http://maps.google.com/maps/geo?key=#{Geokit::Geocoders::google}&ll=#{Geokit::Inflector::url_escape(madrid.ll)}&oe=utf-8&output=xml"
     Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).
       returns(response)
     res=Geokit::Geocoders::GoogleGeocoder.do_reverse_geocode(madrid.ll)
@@ -191,7 +191,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
     response = MockSuccess.new
     response.expects(:body).returns(GOOGLE_COUNTRY_CODE_BIASED_RESULT)
 
-    url = "http://maps.google.com/maps/geo?q=Syracuse&output=xml&gl=it&key=Google&oe=utf-8"
+    url = "http://maps.google.com/maps/geo?gl=it&key=Google&oe=utf-8&output=xml&q=Syracuse"
     Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     biased_result = Geokit::Geocoders::GoogleGeocoder.geocode('Syracuse', :bias => 'it')
 
@@ -203,7 +203,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
     response = MockSuccess.new
     response.expects(:body).returns(GOOGLE_BOUNDS_BIASED_RESULT)
 
-    url = "http://maps.google.com/maps/geo?q=Winnetka&output=xml&ll=34.19769320884902,-118.54716002778494&spn=0.2470479999999995,0.29491400000000567&key=Google&oe=utf-8"
+    url = "http://maps.google.com/maps/geo?key=Google&ll=34.19769320884902%2C-118.54716002778494&oe=utf-8&output=xml&q=Winnetka&spn=0.2470479999999995%2C0.29491400000000567"
     Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
 
     bounds = Geokit::Bounds.normalize([34.074081, -118.694401], [34.321129, -118.399487])
@@ -216,7 +216,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_too_many_queries
     response = MockSuccess.new
     response.expects(:body).returns(GOOGLE_TOO_MANY)
-    url = "http://maps.google.com/maps/geo?q=#{Geokit::Inflector.url_escape(@address)}&output=xml&key=Google&oe=utf-8"
+    url = "http://maps.google.com/maps/geo?key=Google&oe=utf-8&output=xml&q=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     assert_raise Geokit::TooManyQueriesError do
       res=Geokit::Geocoders::GoogleGeocoder.geocode(@address)

data/test/test_google_premier_geocoder.rb

@@ -0,0 +1,88 @@
+Geokit::Geocoders::google = '0xdeadbeef'
+Geokit::Geocoders::google_client = 'gme-acme'
+Geokit::Geocoders::google_channel = 'marketing'
+
+class GooglePremierGeocoderTest < BaseGeocoderTest #:nodoc: all
+
+  GOOGLE_PREMIER_FULL=<<-EOF
+{
+  "status": "OK",
+  "results": [ {
+    "types": [ "street_address" ],
+    "formatted_address": "65 Upper Queen St, Auckland 1010, New Zealand",
+    "address_components": [ {
+      "long_name": "65",
+      "short_name": "65",
+      "types": [ "street_number" ]
+    }, {
+      "long_name": "Upper Queen St",
+      "short_name": "Upper Queen St",
+      "types": [ "route" ]
+    }, {
+      "long_name": "Auckland",
+      "short_name": "Auckland",
+      "types": [ "locality", "political" ]
+    }, {
+      "long_name": "Auckland",
+      "short_name": "Auckland",
+      "types": [ "administrative_area_level_3", "political" ]
+    }, {
+      "long_name": "Auckland",
+      "short_name": "Auckland",
+      "types": [ "administrative_area_level_1", "political" ]
+    }, {
+      "long_name": "New Zealand",
+      "short_name": "NZ",
+      "types": [ "country", "political" ]
+    }, {
+      "long_name": "1010",
+      "short_name": "1010",
+      "types": [ "postal_code" ]
+    } ],
+    "geometry": {
+      "location": {
+        "lat": -36.8624475,
+        "lng": 174.7589730
+      },
+      "location_type": "RANGE_INTERPOLATED",
+      "viewport": {
+        "southwest": {
+          "lat": -36.8656001,
+          "lng": 174.7558353
+        },
+        "northeast": {
+          "lat": -36.8593048,
+          "lng": 174.7621306
+        }
+      },
+      "bounds": {
+        "southwest": {
+          "lat": -36.8624574,
+          "lng": 174.7589730
+        },
+        "northeast": {
+          "lat": -36.8624475,
+          "lng": 174.7589929
+        }
+      }
+    }
+  } ]
+}
+  EOF
+
+  def setup
+    @address = "65 Upper Queen Street, Auckland"
+  end
+
+  def test_google_full_address
+    response = MockSuccess.new
+    response.expects(:body).returns(GOOGLE_PREMIER_FULL)
+    url = "http://maps.googleapis.com/maps/api/geocode/json?address=65+Upper+Queen+Street%2C+Auckland&channel=marketing&client=gme-acme&sensor=false&signature=AO3Ppgjdr7SoQBUcwSdvXFjwN5M="
+    Geokit::Geocoders::GooglePremierGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    res = Geokit::Geocoders::GooglePremierGeocoder.geocode(@address)
+
+    assert_equal "Auckland", res.city
+    assert_equal 174.7589730, res.lng
+  end
+
+end

data/test/test_google_reverse_geocoder.rb

@@ -31,7 +31,7 @@ class GoogleReverseGeocoderTest < BaseGeocoderTest #:nodoc: all
 
     @latlng = "51.4578329,7.0166848"
 
-    url = "http://maps.google.com/maps/geo?ll=#{Geokit::Inflector.url_escape(@latlng)}&output=xml&key=Google&oe=utf-8"
+    url = "http://maps.google.com/maps/geo?key=Google&ll=#{Geokit::Inflector.url_escape(@latlng)}&oe=utf-8&output=xml"
     Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res=Geokit::Geocoders::GoogleGeocoder.reverse_geocode(@latlng)
     assert_equal "Nordrhein-Westfalen", res.state

metadata

@@ -2,7 +2,7 @@
 name: steveh-geokit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors: 
 - Andre Lewis
@@ -12,20 +12,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 +13:00
+date: 2011-02-15 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "3"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "0.9"
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 description: 
 email: 
 - andre@earthcode.com
@@ -48,6 +59,8 @@ files:
 - Rakefile
 - geokit.gemspec
 - lib/geokit.rb
+- lib/geokit/bounds.rb
+- lib/geokit/geo_loc.rb
 - lib/geokit/geocoders.rb
 - lib/geokit/geocoders/ca_geocoder.rb
 - lib/geokit/geocoders/geo_plugin_geocoder.rb
@@ -55,11 +68,13 @@ files:
 - lib/geokit/geocoders/geocoder.rb
 - lib/geokit/geocoders/geonames_geocoder.rb
 - lib/geokit/geocoders/google_geocoder.rb
+- lib/geokit/geocoders/google_premier_geocoder.rb
 - lib/geokit/geocoders/ip_geocoder.rb
 - lib/geokit/geocoders/multi_geocoder.rb
 - lib/geokit/geocoders/us_geocoder.rb
 - lib/geokit/geocoders/yahoo_geocoder.rb
 - lib/geokit/inflector.rb
+- lib/geokit/lat_lng.rb
 - lib/geokit/mappable.rb
 - lib/geokit/too_many_queries_error.rb
 - lib/geokit/version.rb
@@ -69,6 +84,7 @@ files:
 - test/test_geoloc.rb
 - test/test_geoplugin_geocoder.rb
 - test/test_google_geocoder.rb
+- test/test_google_premier_geocoder.rb
 - test/test_google_reverse_geocoder.rb
 - test/test_inflector.rb
 - test/test_ipgeocoder.rb
@@ -112,6 +128,7 @@ test_files:
 - test/test_geoloc.rb
 - test/test_geoplugin_geocoder.rb
 - test/test_google_geocoder.rb
+- test/test_google_premier_geocoder.rb
 - test/test_google_reverse_geocoder.rb
 - test/test_inflector.rb
 - test/test_ipgeocoder.rb