Merge branch 'pr/889'

Conflicts:
	lib/geocoder/lookups/base.rb

lib/geocoder/exceptions.rb

@@ -29,4 +29,7 @@ module Geocoder
   class ServiceUnavailable < Error
   end
 
+  class LookupTimeout < ::Timeout::Error
+  end
+
 end

lib/geocoder/lookups/base.rb

@@ -271,20 +271,20 @@ module Geocoder
       # return the response object.
       #
       def make_api_request(query)
-        timeout(configuration.timeout) do
-          uri = URI.parse(query_url(query))
-          Geocoder.log(:debug, "Geocoder: HTTP request being made for #{uri.to_s}")
-          http_client.start(uri.host, uri.port, use_ssl: use_ssl?) do |client|
-            req = Net::HTTP::Get.new(uri.request_uri, configuration.http_headers)
-            if configuration.basic_auth[:user] and configuration.basic_auth[:password]
-              req.basic_auth(
-                configuration.basic_auth[:user],
-                configuration.basic_auth[:password]
-              )
-            end
-            client.request(req)
+        uri = URI.parse(query_url(query))
+        Geocoder.log(:debug, "Geocoder: HTTP request being made for #{uri.to_s}")
+        http_client.start(uri.host, uri.port, use_ssl: use_ssl?, open_timeout: configuration.timeout, read_timeout: configuration.timeout) do |client|
+          req = Net::HTTP::Get.new(uri.request_uri, configuration.http_headers)
+          if configuration.basic_auth[:user] and configuration.basic_auth[:password]
+            req.basic_auth(
+              configuration.basic_auth[:user],
+              configuration.basic_auth[:password]
+            )
           end
+          client.request(req)
         end
+      rescue Net::OpenTimeout, Net::ReadTimeout
+        raise Geocoder::LookupTimeout
       end
 
       def use_ssl?