Merge pull request #864 from matthewrudy/supported-protocols

Add `supported_protocols` to lookups.

lib/geocoder/lookups/baidu.rb

@@ -16,6 +16,11 @@ module Geocoder::Lookup
       "http://api.map.baidu.com/geocoder/v2/?" + url_query_string(query)
     end
 
+    # HTTP only
+    def supported_protocols
+      [:http]
+    end
+
     private # ---------------------------------------------------------------
 
     def results(query, reverse = false)
@@ -52,4 +57,3 @@ module Geocoder::Lookup
 
   end
 end
-

lib/geocoder/lookups/baidu_ip.rb

@@ -16,6 +16,11 @@ module Geocoder::Lookup
       "http://api.map.baidu.com/location/ip?" + url_query_string(query)
     end
 
+    # HTTP only
+    def supported_protocols
+      [:http]
+    end
+
     private # ---------------------------------------------------------------
 
     def results(query, reverse = false)

lib/geocoder/lookups/base.rb

@@ -86,6 +86,15 @@ module Geocoder
         @cache
       end
 
+      ##
+      # Array containing the protocols supported by the api.
+      # Should be set to [:http] if only HTTP is supported
+      # or [:https] if only HTTPS is supported.
+      #
+      def supported_protocols
+        [:http, :https]
+      end
+
       private # -------------------------------------------------------------
 
       ##
@@ -279,6 +288,9 @@ module Geocoder
       end
 
       def use_ssl?
+        return true if supported_protocols == [:https]
+        return false if supported_protocols == [:http]
+
         configuration.use_https
       end
 

lib/geocoder/lookups/google_places_details.rb

@@ -12,8 +12,8 @@ module Geocoder
         ["key"]
       end
 
-      def use_ssl?
-        true
+      def supported_protocols
+        [:https]
       end
 
       def query_url(query)

lib/geocoder/lookups/maxmind_geoip2.rb

@@ -8,10 +8,10 @@ module Geocoder::Lookup
       "MaxMind GeoIP2"
     end
 
-    def use_ssl?
-      # Maxmind's GeoIP2 Precision Services only supports HTTPS,
-      # otherwise a `404 Not Found` HTTP response will be returned
-      true
+    # Maxmind's GeoIP2 Precision Services only supports HTTPS,
+    # otherwise a `404 Not Found` HTTP response will be returned
+    def supported_protocols
+      [:https]
     end
 
     def query_url(query)

lib/geocoder/lookups/smarty_streets.rb

@@ -16,12 +16,13 @@ module Geocoder::Lookup
       "#{protocol}://api.smartystreets.com/#{path}?#{url_query_string(query)}"
     end
 
-    private # ---------------------------------------------------------------
-
-    def protocol
-      "https" # required by API as of 26 March 2015
+    # required by API as of 26 March 2015
+    def supported_protocols
+      [:https]
     end
 
+    private # ---------------------------------------------------------------
+
     def zipcode_only?(query)
       !query.text.is_a?(Array) and query.to_s.strip =~ /\A\d{5}(-\d{4})?\Z/
     end

lib/geocoder/lookups/telize.rb

@@ -9,16 +9,16 @@ module Geocoder::Lookup
     end
 
     def query_url(query)
-      #currently doesn't support HTTPS
       "http://www.telize.com/geoip/#{query.sanitized_text}"
     end
 
-    private # ---------------------------------------------------------------
-
-    def use_ssl?
-      false
+    # currently doesn't support HTTPS
+    def supported_protocols
+      [:http]
     end
 
+    private # ---------------------------------------------------------------
+
     def results(query)
       # don't look up a loopback address, just return the stored result
       return [reserved_result(query.text)] if query.loopback_ip_address?