From bb945237cf283ffa1cc305b9b4107072833be8e9 Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Mon, 27 Jul 2015 12:10:49 -0400
Subject: [PATCH] Support protocol options for all lookups.
---
lib/geocoder/lookups/baidu.rb | 2 +-
lib/geocoder/lookups/baidu_ip.rb | 2 +-
lib/geocoder/lookups/geocoder_us.rb | 8 ++++++--
lib/geocoder/lookups/telize.rb | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/lib/geocoder/lookups/baidu.rb b/lib/geocoder/lookups/baidu.rb
index f2d499a6..65d38da0 100644
--- a/lib/geocoder/lookups/baidu.rb
+++ b/lib/geocoder/lookups/baidu.rb
@@ -13,7 +13,7 @@ module Geocoder::Lookup
end
def query_url(query)
- "http://api.map.baidu.com/geocoder/v2/?" + url_query_string(query)
+ "#{protocol}://api.map.baidu.com/geocoder/v2/?" + url_query_string(query)
end
# HTTP only
diff --git a/lib/geocoder/lookups/baidu_ip.rb b/lib/geocoder/lookups/baidu_ip.rb
index 8ae9a527..cbdaa47b 100644
--- a/lib/geocoder/lookups/baidu_ip.rb
+++ b/lib/geocoder/lookups/baidu_ip.rb
@@ -13,7 +13,7 @@ module Geocoder::Lookup
end
def query_url(query)
- "http://api.map.baidu.com/location/ip?" + url_query_string(query)
+ "#{protocol}://api.map.baidu.com/location/ip?" + url_query_string(query)
end
# HTTP only
diff --git a/lib/geocoder/lookups/geocoder_us.rb b/lib/geocoder/lookups/geocoder_us.rb
index 60fd135d..dab787ab 100644
--- a/lib/geocoder/lookups/geocoder_us.rb
+++ b/lib/geocoder/lookups/geocoder_us.rb
@@ -8,11 +8,15 @@ module Geocoder::Lookup
"Geocoder.us"
end
+ def supported_protocols
+ [:http]
+ end
+
def query_url(query)
if configuration.api_key
- "http://#{configuration.api_key}@geocoder.us/member/service/csv/geocode?" + url_query_string(query)
+ "#{protocol}://#{configuration.api_key}@geocoder.us/member/service/csv/geocode?" + url_query_string(query)
else
- "http://geocoder.us/service/csv/geocode?" + url_query_string(query)
+ "#{protocol}://geocoder.us/service/csv/geocode?" + url_query_string(query)
end
end
diff --git a/lib/geocoder/lookups/telize.rb b/lib/geocoder/lookups/telize.rb
index 85fb668d..7ee025fb 100644
--- a/lib/geocoder/lookups/telize.rb
+++ b/lib/geocoder/lookups/telize.rb
@@ -9,7 +9,7 @@ module Geocoder::Lookup
end
def query_url(query)
- "http://www.telize.com/geoip/#{query.sanitized_text}"
+ "#{protocol}://www.telize.com/geoip/#{query.sanitized_text}"
end
# currently doesn't support HTTPS
--
GitLab