lib/geocoder/lookups/base.rb in geocoder-0.9.10 vs lib/geocoder/lookups/base.rb in geocoder-0.9.11

@@ -1,8 +1,9 @@
 require 'net/http'
 unless defined?(ActiveSupport::JSON)
   begin
+    require 'rubygems' # for Ruby 1.8
     require 'json'
   rescue LoadError
     raise LoadError, "Please install the 'json' or 'json_pure' gem to parse geocoder results."
   end
 end
@@ -15,25 +16,24 @@
       # Query the geocoding API and return a Geocoder::Result object.
       # Returns +nil+ on timeout or error.
       #
       # Takes a search string (eg: "Mississippi Coast Coliseumf, Biloxi, MS",
       # "205.128.54.202") for geocoding, or coordinates (latitude, longitude)
-      # for reverse geocoding.
+      # for reverse geocoding. Returns an array of <tt>Geocoder::Result</tt>s.
       #
       def search(*args)
-        if res = result(args.join(","), args.size == 2)
-          result_class.new(res)
-        end
+        reverse = (args.size == 2) || coordinates?(args.first)
+        results(args.join(","), reverse).map{ |r| result_class.new(r) }
       end
 
 
       private # -------------------------------------------------------------
 
       ##
       # Geocoder::Result object or nil on timeout or other error.
       #
-      def result(query, reverse = false)
+      def results(query, reverse = false)
         fail
       end
 
       ##
       # URL to use for querying the geocoding engine.
@@ -58,12 +58,12 @@
         rescue SocketError
           warn "Geocoding API connection cannot be established."
         rescue TimeoutError
           warn "Geocoding API not responding fast enough " +
             "(see Geocoder::Configuration.timeout to set limit)."
-        end
       end
+      end
 
       ##
       # Parses a raw search result (returns hash or array).
       #
       def parse_raw_data(raw_data)
@@ -77,31 +77,62 @@
           end
         end
       end
 
       ##
+      # Protocol to use for communication with geocoding services.
+      # Set in configuration but not available for every service.
+      #
+      def protocol
+        "http" + (Geocoder::Configuration.use_https ? "s" : "")
+      end
+
+      ##
       # Fetches a raw search result (JSON string).
       #
       def fetch_raw_data(query, reverse = false)
-        url = query_url(query, reverse)
         timeout(Geocoder::Configuration.timeout) do
-          Net::HTTP.get_response(URI.parse(url)).body
+          url = query_url(query, reverse)
+          unless cache and response = cache[url]
+            response = Net::HTTP.get_response(URI.parse(url)).body
+            if cache
+              cache[url] = response
+            end
+          end
+          response
         end
       end
 
       ##
+      # The working Cache object.
+      #
+      def cache
+        Geocoder.cache
+      end
+
+      ##
       # Is the given string a loopback IP address?
       #
       def loopback_address?(ip)
         !!(ip == "0.0.0.0" or ip.match(/^127/))
       end
 
       ##
+      # Does the given string look like latitude/longitude coordinates?
+      #
+      def coordinates?(value)
+        !!value.to_s.match(/^[0-9\.\-]+, ?[0-9\.\-]+$/)
+      end
+
+      ##
       # Simulate ActiveSupport's Object#to_query.
+      # Removes any keys with nil value.
       #
       def hash_to_query(hash)
         require 'cgi' unless defined?(CGI) && defined?(CGI.escape)
-        hash.collect{ |p| p.map{ |i| CGI.escape i.to_s } * '=' }.sort * '&'
+        hash.collect{ |p|
+          p[1].nil? ? nil : p.map{ |i| CGI.escape i.to_s } * '='
+        }.compact.sort * '&'
       end
     end
   end
 end