Added Google's api key back in. Apparently it is still need on higher…

… traffic sites
collectiveidea · Oct 22, 2009 · 9ed97db · 9ed97db
1 parent eaa5475
commit 9ed97db
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/lib/graticule/geocoder/google.rb b/lib/graticule/geocoder/google.rb
@@ -1,7 +1,10 @@
 module Graticule #:nodoc:
   module Geocoder #:nodoc:
 
-    #   gg = Graticule.service(:google).new
+    # First you need a Google Maps API key.  You can register for one here:
+    # http://www.google.com/apis/maps/signup.html
+    # 
+    #   gg = Graticule.service(:google).new(MAPS_API_KEY)
     #   location = gg.locate '1600 Amphitheater Pkwy, Mountain View, CA'
     #   p location.coordinates
     #   #=> [37.423111, -122.081783
@@ -23,7 +26,8 @@ class Google < Base
         9 => :premise       # Premise (building name, property name, shopping center, etc.) level accuracy.
       }
 
-      def initialize
+      def initialize(key)
+        @key = key
         @url = URI.parse 'http://maps.google.com/maps/geo'
       end
 
@@ -116,7 +120,7 @@ def check_error(response) #:nodoc:
       # Creates a URL from the Hash +params+.
       # sets the output type to 'xml'.
       def make_url(params) #:nodoc:
-        super params.merge(:oe => 'utf8', :output => 'xml', :sensor => false)
+        super params.merge(:key => @key, :oe => 'utf8', :output => 'xml', :sensor => false)
       end
     end
   end

diff --git a/test/config.yml.default b/test/config.yml.default
@@ -1,9 +1,11 @@
 google:
+  key: PUT YOUR KEY HERE
   responses:
-    success.xml: "http://maps.google.com/maps/geo?q=1600+amphitheatre+mtn+view+ca&output=xml"
-    missing_address.xml: "http://maps.google.com/maps/geo?output=xml"
-    unknown_address.xml: "http://maps.google.com/maps/geo?q=xxxxx&output=xml"
-    partial.xml: "http://maps.google.com/maps/geo?q=sf+ca&output=xml"
+    success.xml: "http://maps.google.com/maps/geo?q=1600+amphitheatre+mtn+view+ca&output=xml&key=:key"
+    badkey.xml: http://maps.google.com/maps/geo?q=1600+amphitheatre+mtn+view+ca&output=xml&key=this_is_a_bad_key
+    missing_address.xml: "http://maps.google.com/maps/geo?output=xml&key=:key"
+    unknown_address.xml: "http://maps.google.com/maps/geo?q=xxxxx&output=xml&key=:key"
+    partial.xml: "http://maps.google.com/maps/geo?q=sf+ca&output=xml&key=:key"
     #unavailable.xml: no way to reproduce this
     #limit.xml: no way to reproduce this  
     #server_error.xml: no way to reproduce this

diff --git a/test/fixtures/responses/google/badkey.xml b/test/fixtures/responses/google/badkey.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><kml xmlns="http://earth.google.com/kml/2.1"><Response><name>1600 amphitheatre mtn view ca</name><Status><code>610</code><request>geocode</request></Status></Response></kml>
diff --git a/test/graticule/geocoder/google_test.rb b/test/graticule/geocoder/google_test.rb
@@ -6,7 +6,7 @@ class GoogleTest < Test::Unit::TestCase
       def setup
         URI::HTTP.responses = []
         URI::HTTP.uris = []
-        @geocoder = Google.new
+        @geocoder = Google.new('APP_ID')
       end
 
       def test_success
@@ -90,6 +90,11 @@ def test_locate_unknown_address
         return unless prepare_response(:unknown_address)
         assert_raises(AddressError) { @geocoder.locate 'x' }
       end
+
+      def test_bad_key
+        return unless prepare_response(:badkey)
+        assert_raises(CredentialsError) { @geocoder.locate('x') }
+      end
 
     protected