Cache only properly geocoded data for google lookup

lib/geocoder/lookups/base.rb

@@ -192,6 +192,10 @@ module Geocoder
         "http" + (configuration.use_https ? "s" : "")
       end
 
+      def valid_response(response)
+        (200..399).include?(response.code.to_i)
+      end
+
       ##
       # Fetch a raw geocoding result (JSON string).
       # The result might or might not be cached.
@@ -204,7 +208,7 @@ module Geocoder
           check_api_key_configuration!(query)
           response = make_api_request(query)
           body = response.body
-          if cache and (200..399).include?(response.code.to_i)
+          if cache and valid_response(response)
             cache[key] = body
           end
           @cache_hit = false

lib/geocoder/lookups/google.rb

@@ -16,6 +16,10 @@ module Geocoder::Lookup
       "#{protocol}://maps.googleapis.com/maps/api/geocode/json?" + url_query_string(query)
     end
 
+    def valid_response(response)
+      super(response) && JSON.parse(response.body)["status"] == "OK"
+    end
+
     private # ---------------------------------------------------------------
 
     def results(query)

test/cache_test.rb

@@ -16,4 +16,20 @@ class CacheTest < Test::Unit::TestCase
         "Lookup #{l} did not return cached result."
     end
   end
+
+  def test_google_over_query_limit_does_not_hit_cache
+    Geocoder.configure(:cache => {})
+    Geocoder.configure(:lookup => :google)
+    set_api_key!(:google)
+    Geocoder.configure(:always_raise => :all)
+    assert_raises Geocoder::OverQueryLimitError do
+      Geocoder.search("over limit")
+    end
+    lookup = Geocoder::Lookup.get(:google)
+    assert_equal false, lookup.instance_variable_get(:@cache_hit)
+    assert_raises Geocoder::OverQueryLimitError do
+      Geocoder.search("over limit")
+    end
+    assert_equal false, lookup.instance_variable_get(:@cache_hit)
+  end
 end

test/fixtures/google_over_limit

+{
+  "status": "OVER_QUERY_LIMIT",
+  "results": [ ]
+}