curlyrest 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbb2f83698784b3cc1b3d3d8fad3299df4846ea6
-  data.tar.gz: 4373dfd5697dcda8e9ddd93f58a5d7435b93bdaf
+  metadata.gz: fe8cafed797554028aa33054fc6ab70ee8444213
+  data.tar.gz: ac83bb8b10ea414faaab71bc8bbe5f3df952fe49
 SHA512:
-  metadata.gz: d6ad630e9dca0fb33334eba4871a45115bb1e0858af4f8382e75d4b9b97c70f73582d53d8bd9ca8b3da31de89e8dc044c271bbed4fe9fb058962374309c5bae4
-  data.tar.gz: 1142de7a0f62631c9c276305f1feeb833249f229c7d4cd6f60f204575733b9971e590e21c5817f19269964defa21be13ab6916dab10609fd01f8f9df90db0e8c
+  metadata.gz: 10e642efb9f358a6a6c883a67267be0b1c733f333971b7779151d90a05b3751316bd939a3be1f21bb57fa0ff31e553b66bd1556150d3a74cec51ee9af3ba347d
+  data.tar.gz: f45f3cd7276b6296874a2007277329404b7bd499d019e19327be3bcb6bd6041f9aae8567aaab7791d2b4e22bd4fb54f290345313599b2f0232068330fd52bb6f

data/lib/curlyrest/version.rb

@@ -1,3 +1,3 @@
 module Curlyrest
-  VERSION = '0.1.24'.freeze
+  VERSION = '0.1.25'.freeze
 end

data/lib/curlyrest.rb

@@ -94,12 +94,11 @@ module Curlyrest
   # class for transmitting curl requests
   class CurlTransmitter
     attr_accessor :options, :headers, :line, :timeout
-    def initialize(uri, method, headers, payload, args)
+    def initialize(uri, method, headers, payload)
       @payload = payload
       @method = method
       @uri = uri
       @headers, @options = calc_options(headers)
-      @timeout = args[:timeout]
       @line = curl_command
     end
 
@@ -108,6 +107,8 @@ module Curlyrest
                         headers.delete(:use_curl)
       options[:proxy] = headers.delete('Use-Proxy') ||
                         headers.delete(:use_proxy)
+      options[:timeout] = headers.delete('Timeout') ||
+                        headers.delete(:timeout)
       headers.delete('No-Restclient-Headers') ||
         headers.delete(:no_restclient_headers)
       [headers, options]
@@ -122,8 +123,9 @@ module Curlyrest
     end
 
     def curl_start
+      timeout = options[:timeout]
       timeout_str = ''
-      timeout_str << " --max-time #{@timeout}" unless @timeout.nil?
+      timeout_str << " --max-time #{timeout}" unless timeout.nil?
       "curl -isS -X #{@method.upcase}#{timeout_str}"
     end
 
@@ -147,8 +149,8 @@ module Curlyrest
     end
   end
 
-  def curl_transmit(uri, method, headers, payload, args)
-    ct = CurlTransmitter.new(uri, method, headers, payload, args)
+  def curl_transmit(uri, method, headers, payload)
+    ct = CurlTransmitter.new(uri, method, headers, payload)
     r = ct.exec_curl
     CurlResponseParser.new(r).response
   end
@@ -179,8 +181,7 @@ module RestClient
           else
             processed_headers
           end
-      r = curl_transmit(uri, method, h, payload,
-                        timeout: open_timeout, &block)
+      r = curl_transmit(uri, method, h, payload, &block)
       RestClient::Response.create(r.body, r, self)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curlyrest
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Keith Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler