Separates read_timeout and open_timeout (#186)

* Bumps up version so the timeout param can be used.

* Separates read_timeout and open_timeout.

* Revert gemspec change

Author: dquimper

README.md

@@ -34,7 +34,8 @@ Hubspot.configure({
   client_id: <CLIENT_ID>,
   client_secret: <CLIENT_SECRET>,
   redirect_uri: <REDIRECT_URI>,
-  timeout: nil,
+  read_timeout: nil, # or :timeout to set read_timeout and open_timeout
+  open_timeout: nil,
 })
 ```
 

lib/hubspot/config.rb

@@ -5,7 +5,7 @@ module Hubspot
   class Config
     CONFIG_KEYS = [
       :hapikey, :base_url, :portal_id, :logger, :access_token, :client_id,
-      :client_secret, :redirect_uri, :timeout
+      :client_secret, :redirect_uri, :read_timeout, :open_timeout
     ]
     DEFAULT_LOGGER = Logger.new(nil)
     DEFAULT_BASE_URL = "https://api.hubapi.com".freeze
@@ -23,7 +23,8 @@ def configure(config)
         @client_id = config["client_id"] if config["client_id"].present?
         @client_secret = config["client_secret"] if config["client_secret"].present?
         @redirect_uri = config["redirect_uri"] if config["redirect_uri"].present?
-        @timeout = config['timeout']
+        @read_timeout = config['read_timeout'] || config['timeout']
+        @open_timeout = config['open_timeout'] || config['timeout']
 
         unless authentication_uncertain?
           raise Hubspot::ConfigurationError.new("You must provide either an access_token or an hapikey")

lib/hubspot/connection.rb

@@ -5,7 +5,7 @@ class Connection
     class << self
       def get_json(path, opts)
         url = generate_url(path, opts)
-        response = get(url, format: :json, timeout: timeout(opts))
+        response = get(url, format: :json, read_timeout: read_timeout(opts), open_timeout: open_timeout(opts))
         log_request_and_response url, response
         handle_response(response)
       end
@@ -14,7 +14,7 @@ def post_json(path, opts)
         no_parse = opts[:params].delete(:no_parse) { false }
 
         url = generate_url(path, opts[:params])
-        response = post(url, body: opts[:body].to_json, headers: { 'Content-Type' => 'application/json' }, format: :json, timeout: timeout(opts))
+        response = post(url, { body: opts[:body].to_json, headers: { 'Content-Type' => 'application/json' }, format: :json, read_timeout: read_timeout(opts), open_timeout: open_timeout(opts) })
         log_request_and_response url, response, opts[:body]
         raise(Hubspot::RequestError.new(response)) unless response.success?
 
@@ -29,7 +29,8 @@ def put_json(path, options)
           body: options[:body].to_json,
           headers: { "Content-Type" => "application/json" },
           format: :json,
-          timeout: timeout(options)
+          read_timeout: read_timeout(options),
+          open_timeout: open_timeout(options),
         )
 
         log_request_and_response(url, response, options[:body])
@@ -38,16 +39,20 @@ def put_json(path, options)
 
       def delete_json(path, opts)
         url = generate_url(path, opts)
-        response = delete(url, format: :json, timeout: timeout(opts))
+        response = delete(url, format: :json, read_timeout: read_timeout(opts), open_timeout: open_timeout(opts))
         log_request_and_response url, response, opts[:body]
         raise(Hubspot::RequestError.new(response)) unless response.success?
         response
       end
 
       protected
 
-      def timeout(opts = {})
-        opts.delete(:timeout) || Hubspot::Config.timeout
+      def read_timeout(opts = {})
+        opts.delete(:read_timeout) || Hubspot::Config.read_timeout
+      end
+
+      def open_timeout(opts = {})
+        opts.delete(:open_timeout) || Hubspot::Config.open_timeout
       end
 
       def handle_response(response)