faraday 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42be55b00611d618997b1a7ce9224433de94d05a3d8c58eded72c747169f03c2
-  data.tar.gz: e1c9762524844227534b3a3fa29280675c4f6d9c08aa38fe3778b868b6ee0fdd
+  metadata.gz: 852fb909df9a9f6e729b77257fdde96a8f5f83dd382fa7476b6cf95927d86cde
+  data.tar.gz: 941d453ea5d0b52ceece2b961a3ff1a684e823d658db5fb205fa26745e1ed6e6
 SHA512:
-  metadata.gz: 3d07058fb83243451c60d69a93fc45b4415da74b3daa6554140a6c0f2908cb50d29efc6d2573890fed8d72f4a7c92c14b4aa62ce2ec64a3b26569a8711902dcf
-  data.tar.gz: 975c1fe201ee8772a954dd734a37f4dc7401ea278b4dbd21e17ddc11a5e87d7ad0a6141e73f18ec63255feb181f8be252ad7dad6b115cfb4362f970bcc339580
+  metadata.gz: e05cfb7ae7e6867dc06c0609098a86dd50197bb97ac67a4e91ed87cfbfa60b671f2886605737908aa5be7a15bffc0cb8063da2689eaf6deacbc03e7fa686d076
+  data.tar.gz: f3cd848e833cdb38fc2fc9d2587627fa12973c57b71c1574d4872c56abc90f4b05a9a4f7af659ae7bd6da1ccc7c3ef1f226c0153b14be8af2ed88f457c356d11

data/lib/faraday.rb

@@ -14,7 +14,7 @@ require 'forwardable'
 #   conn.get '/'
 #
 module Faraday
-  VERSION = "0.15.2"
+  VERSION = "0.15.3"
 
   class << self
     # Public: Gets or sets the root path that Faraday is being loaded from.

data/lib/faraday/adapter/net_http.rb

@@ -116,10 +116,15 @@ module Faraday
       end
 
       def configure_request(http, req)
-        http.read_timeout = http.open_timeout = req[:timeout] if req[:timeout]
-        http.open_timeout = req[:open_timeout]                if req[:open_timeout]
-        # Only set if Net::Http supports it, since Ruby 2.5.
-        http.max_retries  = 0                                 if http.respond_to?(:max_retries=)
+        if req[:timeout]
+          http.read_timeout  = req[:timeout]
+          http.open_timeout  = req[:timeout]
+          http.write_timeout = req[:timeout] if http.respond_to?(:write_timeout=)
+        end
+        http.open_timeout  = req[:open_timeout]  if req[:open_timeout]
+        http.write_timeout = req[:write_timeout] if req[:write_timeout] && http.respond_to?(:write_timeout=)
+          # Only set if Net::Http supports it, since Ruby 2.5.
+        http.max_retries  = 0                    if http.respond_to?(:max_retries=)
 
         @config_block.call(http) if @config_block
       end

data/lib/faraday/options.rb

@@ -202,7 +202,7 @@ module Faraday
   end
 
   class RequestOptions < Options.new(:params_encoder, :proxy, :bind,
-    :timeout, :open_timeout, :boundary, :oauth, :context)
+    :timeout, :open_timeout, :write_timeout, :boundary, :oauth, :context)
 
     def []=(key, value)
       if key && key.to_sym == :proxy

data/lib/faraday/request.rb

@@ -69,6 +69,26 @@ module Faraday
       headers[key] = value
     end
 
+    def marshal_dump
+      {
+        :method  => method,
+        :body    => body,
+        :headers => headers,
+        :path    => path,
+        :params  => params,
+        :options => options
+      }
+    end
+
+    def marshal_load(serialised)
+      self.method  = serialised[:method]
+      self.body    = serialised[:body]
+      self.headers = serialised[:headers]
+      self.path    = serialised[:path]
+      self.params  = serialised[:params]
+      self.options = serialised[:options]
+    end
+
     # ENV Keys
     # :method - a symbolized request method (:get, :post)
     # :body   - the request body that will eventually be converted to a string.

data/lib/faraday/request/retry.rb

@@ -20,6 +20,7 @@ module Faraday
   #
   class Request::Retry < Faraday::Middleware
 
+    DEFAULT_EXCEPTIONS = [Errno::ETIMEDOUT, 'Timeout::Error', Error::TimeoutError, Faraday::Error::RetriableResponse].freeze
     IDEMPOTENT_METHODS = [:delete, :get, :head, :options, :put]
 
     class Options < Faraday::Options.new(:max, :interval, :max_interval, :interval_randomness,
@@ -57,9 +58,7 @@ module Faraday
       end
 
       def exceptions
-        Array(self[:exceptions] ||= [Errno::ETIMEDOUT, 'Timeout::Error',
-                                     Error::TimeoutError,
-                                     Faraday::Error::RetriableResponse])
+        Array(self[:exceptions] ||= DEFAULT_EXCEPTIONS)
       end
 
       def methods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post