hubspot-ruby 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bf3e6e8fbd83defe0525c7d692eb797d2650eeb6919ffdc5c55505345da233e
-  data.tar.gz: 7880ed3f94d9ce4784668a20eb254635e72484e2d0dfba9cb2b988cfc5846756
+  metadata.gz: b7ccc908caacf0397188a0feed3bc1475d35123af86e79f5030bdf77e28353cf
+  data.tar.gz: 29f5fd9a6852e3478e6c893bfdb33450d124dad8b6b5a64aa125f2218d8522bc
 SHA512:
-  metadata.gz: 14385b0ece499e0092dd3de5de1de3b6fcb89c5acc90407a597c0a06658489302e9f7199def1ccb4dc58c118371fe4481e142060ad319c52cee99f55d4bf16ea
-  data.tar.gz: ce08579ea8415650d1599fff9cc31e6c14da1bbd90eea8974a9ef16c961b803de838bd0d5fd8a97e559140ce0b9e21cdf0b6fd3bb0769e09402272a5227799ac
+  metadata.gz: 3ea051ba6010fc36d8af599cee489690beb08c605b91a4b371ed14800098d40eefcb7cd9268e9e5c1944cb8866defd3798300bc5600861360e0b44eb8c977c1b
+  data.tar.gz: d151b777a26d072b15cf721e01460787ed141fda91af3322dc6d5034c5139c88eb9d55316fbc0d9f727f149e7374b43da936ac373a8e3033d829c1cebd18b6d6

data/hubspot-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "hubspot-ruby"
-  s.version = "0.6.1"
+  s.version = "0.7.0"
   s.require_paths = ["lib"]
   s.authors = ["Andrew DiMichele", "Chris Bisnett"]
   s.description = "hubspot-ruby is a wrapper for the HubSpot REST API"
@@ -10,6 +10,9 @@ Gem::Specification.new do |s|
   s.files += Dir["spec/**/*.rb"]
   s.homepage = "http://github.com/adimichele/hubspot-ruby"
   s.summary = "hubspot-ruby is a wrapper for the HubSpot REST API"
+  s.metadata = {
+    "changelog_uri" => "https://github.com/adimichele/hubspot-ruby/blob/master/History.md"
+  }
 
   # Add runtime dependencies here
   s.add_runtime_dependency "activesupport", ">=3.0.0"

data/lib/hubspot/config.rb

@@ -6,7 +6,7 @@ module Hubspot
 
     CONFIG_KEYS = [
       :hapikey, :base_url, :portal_id, :logger, :access_token, :client_id,
-      :client_secret, :redirect_uri
+      :client_secret, :redirect_uri, :read_timeout, :open_timeout
     ]
     DEFAULT_LOGGER = Logger.new(nil)
 
@@ -23,6 +23,8 @@ module Hubspot
         @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?
+        @read_timeout = config['read_timeout'] || config['timeout']
+        @open_timeout = config['open_timeout'] || config['timeout']
 
         unless access_token.present? ^ hapikey.present?
           Hubspot::ConfigurationError.new("You must provide either an access_token or an hapikey")

data/lib/hubspot/connection.rb

@@ -5,7 +5,7 @@ module Hubspot
     class << self
       def get_json(path, opts)
         url = generate_url(path, opts)
-        response = get(url, format: :json)
+        response = get(url, format: :json, read_timeout: read_timeout(opts), open_timeout: open_timeout(opts))
         log_request_and_response url, response
         raise(Hubspot::RequestError.new(response)) unless response.success?
         response.parsed_response
@@ -15,24 +15,32 @@ module Hubspot
         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)
+        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?
 
         no_parse ? response : response.parsed_response
       end
 
-      def put_json(path, opts)
-        url = generate_url(path, opts[:params])
-        response = put(url, body: opts[:body].to_json, headers: { 'Content-Type' => 'application/json' }, format: :json)
-        log_request_and_response url, response, opts[:body]
-        raise(Hubspot::RequestError.new(response)) unless response.success?
-        response.parsed_response
+      def put_json(path, options)
+        url = generate_url(path, options[:params])
+
+        response = put(
+          url,
+          body: options[:body].to_json,
+          headers: { "Content-Type" => "application/json" },
+          format: :json,
+          read_timeout: read_timeout(options),
+          open_timeout: open_timeout(options),
+        )
+
+        log_request_and_response(url, response, options[:body])
+        handle_response(response)
       end
 
       def delete_json(path, opts)
         url = generate_url(path, opts)
-        response = delete(url, format: :json)
+        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
@@ -40,6 +48,22 @@ module Hubspot
 
       protected
 
+      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)
+        if response.success?
+          response.parsed_response
+        else
+          raise(Hubspot::RequestError.new(response))
+        end
+      end
+
       def log_request_and_response(uri, response, body=nil)
         Hubspot::Config.logger.info "Hubspot: #{uri}.\nBody: #{body}.\nResponse: #{response.code} #{response.body}"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubspot-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Andrew DiMichele
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -260,7 +260,8 @@ files:
 - spec/support/vcr.rb
 homepage: http://github.com/adimichele/hubspot-ruby
 licenses: []
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/adimichele/hubspot-ruby/blob/master/History.md
 post_install_message: 
 rdoc_options: []
 require_paths: