diff --git a/lib/geocoder/lookup.rb b/lib/geocoder/lookup.rb index b173cbb2365e74c8fb0d965f0451ffed2d7d9c58..fd2ae65fcf8ac0127644e51873e863a8954c0ccb 100644 --- a/lib/geocoder/lookup.rb +++ b/lib/geocoder/lookup.rb @@ -10,7 +10,7 @@ module Geocoder # def coordinates(address) return nil if address.blank? - return nil unless doc = fetch_parsed_response(address, false) + return nil unless doc = parsed_response(address, false) # blindly use first result (assume it is most accurate) place = doc['results'].first['geometry']['location'] ['lat', 'lng'].map{ |i| place[i] } @@ -22,7 +22,7 @@ module Geocoder # def address(latitude, longitude) return nil if latitude.blank? || longitude.blank? - return nil unless doc = fetch_parsed_response("#{latitude},#{longitude}", true) + return nil unless doc = parsed_response("#{latitude},#{longitude}", true) # blindly use first result (assume it is most accurate) doc['results'].first['formatted_address'] end @@ -42,8 +42,8 @@ module Geocoder # Returns a parsed Google geocoder search result (hash). # Returns nil if non-200 HTTP response, timeout, or other error. # - def fetch_parsed_response(query, reverse = false) - if doc = fetch_raw_response(query, reverse) + def parsed_response(query, reverse = false) + if doc = raw_response(query, reverse) doc = ActiveSupport::JSON.decode(doc) doc && doc['status'] == "OK" ? doc : nil end @@ -52,7 +52,7 @@ module Geocoder ## # Returns a raw Google geocoder search result (JSON). # - def fetch_raw_response(query, reverse = false) + def raw_response(query, reverse = false) return nil if query.blank? # name parameter based on forward/reverse geocoding diff --git a/test/test_helper.rb b/test/test_helper.rb index 559855e2e2fa26aae9069f409edb33a79e9d6cc2..8c24d887d3e9898d2c399eca7734117f9b888175 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -39,7 +39,9 @@ require 'geocoder' # module Geocoder module Lookup - def self.fetch_raw_response(query, reverse = false) + extend self + private #----------------------------------------------------------------- + def raw_response(query, reverse = false) File.read(File.join("test", "fixtures", "madison_square_garden.json")) end end