curlyrest 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6fc1f26bf94c57b4827be1b27c934d4db1306de
-  data.tar.gz: 19d79b1e3933a07560dadb0e2c838bb7858e404c
+  metadata.gz: bbb2f83698784b3cc1b3d3d8fad3299df4846ea6
+  data.tar.gz: 4373dfd5697dcda8e9ddd93f58a5d7435b93bdaf
 SHA512:
-  metadata.gz: d1007f46303555ce7833f64d4cfe80802da04c6ee417353dc50a6e8982d6e3cfda02cd77e2019668917d6af22f4007a8906d1088576927ae7b5426b2520f1eee
-  data.tar.gz: 9a4b370eec79d4c8edcbab5644586b1719cbd2c74bc78979031cac3072ddab2157524b4d377376cb0f89987d0266336c8112fd80c5120ba82b774df751a4e938
+  metadata.gz: d6ad630e9dca0fb33334eba4871a45115bb1e0858af4f8382e75d4b9b97c70f73582d53d8bd9ca8b3da31de89e8dc044c271bbed4fe9fb058962374309c5bae4
+  data.tar.gz: 1142de7a0f62631c9c276305f1feeb833249f229c7d4cd6f60f204575733b9971e590e21c5817f19269964defa21be13ab6916dab10609fd01f8f9df90db0e8c

data/lib/curlyrest/version.rb

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

data/lib/curlyrest.rb

@@ -93,12 +93,13 @@ module Curlyrest
 
   # class for transmitting curl requests
   class CurlTransmitter
-    attr_accessor :options, :headers, :line
-    def initialize(uri, method, headers, payload)
+    attr_accessor :options, :headers, :line, :timeout
+    def initialize(uri, method, headers, payload, args)
       @payload = payload
       @method = method
       @uri = uri
       @headers, @options = calc_options(headers)
+      @timeout = args[:timeout]
       @line = curl_command
     end
 
@@ -120,6 +121,12 @@ module Curlyrest
       option ? " -x #{option}" : ''
     end
 
+    def curl_start
+      timeout_str = ''
+      timeout_str << " --max-time #{@timeout}" unless @timeout.nil?
+      "curl -isS -X #{@method.upcase}#{timeout_str}"
+    end
+
     def curl_headers(headers)
       ret_headers = ' '
       headers.each { |k, v| ret_headers << "-H '#{k}: #{v}' " }
@@ -127,7 +134,7 @@ module Curlyrest
     end
 
     def curl_command
-      @line = "curl -isS -X #{@method.upcase}#{curl_proxy(@options[:proxy])}"\
+      @line = "#{curl_start}#{curl_proxy(@options[:proxy])}"\
               "#{curl_headers(@headers)}'#{@uri}' -d '#{curl_data(@payload)}'"
     end
 
@@ -140,8 +147,8 @@ module Curlyrest
     end
   end
 
-  def curl_transmit(uri, method, headers, payload)
-    ct = CurlTransmitter.new(uri, method, headers, payload)
+  def curl_transmit(uri, method, headers, payload, args)
+    ct = CurlTransmitter.new(uri, method, headers, payload, args)
     r = ct.exec_curl
     CurlResponseParser.new(r).response
   end
@@ -172,8 +179,61 @@ module RestClient
           else
             processed_headers
           end
-      r = curl_transmit(uri, method, h, payload, &block)
+      r = curl_transmit(uri, method, h, payload,
+                        timeout: open_timeout, &block)
       RestClient::Response.create(r.body, r, self)
     end
+
+    def process_cookie_args!(uri, headers, args)
+
+      # Avoid ambiguity in whether options from headers or options from
+      # Request#initialize should take precedence by raising ArgumentError when
+      # both are present. Prior versions of rest-client claimed to give
+      # precedence to init options, but actually gave precedence to headers.
+      # Avoid that mess by erroring out instead.
+      if headers[:cookies] && args[:cookies]
+        raise ArgumentError.new(
+          "Cannot pass :cookies in Request.new() and in headers hash")
+      end
+
+      cookies_data = headers.delete(:cookies) || args[:cookies]
+
+      # this method has problems if no cookies are in the request
+      return if cookies_data.nil?
+
+      # return copy of cookie jar as is
+      if cookies_data.is_a?(HTTP::CookieJar)
+        return cookies_data.dup
+      end
+
+      # convert cookies hash into a CookieJar
+      jar = HTTP::CookieJar.new
+
+      (cookies_data || []).each do |key, val|
+
+        # Support for Array<HTTP::Cookie> mode:
+        # If key is a cookie object, add it to the jar directly and assert that
+        # there is no separate val.
+        if key.is_a?(HTTP::Cookie)
+          if val
+            raise ArgumentError.new("extra cookie val: #{val.inspect}")
+          end
+
+          jar.add(key)
+          next
+        end
+
+        if key.is_a?(Symbol)
+          key = key.to_s
+        end
+
+        # assume implicit domain from the request URI, and set for_domain to
+        # permit subdomains
+        jar.add(HTTP::Cookie.new(key, val, domain: uri.hostname.downcase,
+                                 path: '/', for_domain: true))
+      end
+
+      jar
+    end
   end
 end

metadata

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