faraday-http 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5e6240a5e8de3e53c1a4c576a5cb97e8c06bbcdfa075e4e886ba714fcd1b238
-  data.tar.gz: 21b2432ff123359ba3c75e419240f99126edf36336053abc640e2baa61c6db58
+  metadata.gz: a05570eef6dd08482c54a0a61075c54d3d16be4593d74916455f0776b31363d3
+  data.tar.gz: 91b37ec14ae375e91dc93305b8f7ae5f8d143784458091617c53268e81dd3fa7
 SHA512:
-  metadata.gz: 7429a9e7a37252dd63ec86d5d8a994423ede3f4445b574f9a820eaa61736cadd2858e55d7348937719572f9719bb2106a3eb936cd1e8525dae5dc106623a4dd9
-  data.tar.gz: '088bbb6b273377487a279413fbd0281246d2d0f2e992d24c438314715a25290f3fd0b1f4b0e22c31909845895fc255df9adfed4f23f89cd75cedd764fbeb0ccd'
+  metadata.gz: e44331b34e0bb87f3232dfdab12aaa592df0cb3ec2498012b8a16fdc4dae28d06c7ce370e23de3e33a75591ce70875a2b70a217aa133c35a9313e82b9199764b
+  data.tar.gz: 18824e03bebea59b963c754210f5fc3e4904e44e07b0c9106987f383c4af4a87305e3562cea5ebdef015e0a368248bad3585d0ed3499139025c7f8c17f0b6ae6

data/lib/faraday/adapter/http.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
+require 'http'
+
 module Faraday
   class Adapter
     # HTTP.rb adapter.
     class HTTP < Faraday::Adapter
-      dependency 'http'
-
       # Takes the environment and performs the request.
       #
       # @param env [Faraday::Env] the request environment.
@@ -20,13 +20,22 @@ module Faraday
       private
 
       def perform_request(env)
-        conn = setup_connection(env)
+        connection = setup_connection(env)
 
-        resp = conn.request env[:method], env[:url],
-                            body: env[:body],
-                            ssl_context: ssl_context(env[:ssl])
+        response = connection.request env[:method], env[:url],
+                                      body: env[:body],
+                                      ssl_context: ssl_context(env[:ssl])
+
+        if env.stream_response?
+          env.stream_response do |&on_data|
+            request_with_wrapped_block(response, env, &on_data)
+          end
+          body = ''
+        else
+          body = response.body.to_s
+        end
 
-        save_response(env, resp.code, resp.body.to_s, resp.headers, resp.status.reason)
+        save_response(env, response.code, body, response.headers, response.status.reason)
       rescue ::HTTP::TimeoutError
         raise Faraday::TimeoutError, $ERROR_INFO
       rescue ::HTTP::ConnectionError
@@ -37,6 +46,14 @@ module Faraday
         raise
       end
 
+      def request_with_wrapped_block(response, env)
+        return unless block_given?
+
+        while (chunk = response.body.readpartial)
+          yield(chunk, env)
+        end
+      end
+
       def setup_connection(env)
         conn = ::HTTP
 
@@ -46,7 +63,7 @@ module Faraday
 
       def request_config(conn, config)
         if (timeout = config[:timeout])
-          conn = conn.timeout(connect: timeout, read: timeout, write: timeout)
+          conn = conn.timeout(timeout)
         end
 
         if (timeout = config[:open_timeout])
@@ -97,27 +114,19 @@ module Faraday
       end
 
       def ssl_client_cert(cert)
-        case cert
-        when NilClass then nil
-        when String
-          OpenSSL::X509::Certificate.new(File.read(cert))
-        when OpenSSL::X509::Certificate
-          cert
-        else
-          raise Faraday::Error, "invalid ssl.client_cert: #{cert.inspect}"
-        end
+        return nil if cert.nil?
+        return OpenSSL::X509::Certificate.new(File.read(cert)) if cert.is_a(String)
+        return cert if cert.is_a?(OpenSSL::X509::Certificate)
+
+        raise Faraday::Error, "invalid ssl.client_cert: #{cert.inspect}"
       end
 
       def ssl_client_key(cert)
-        case cert
-        when NilClass then nil
-        when String
-          OpenSSL::PKey::RSA.new(File.read(cert))
-        when OpenSSL::PKey::RSA, OpenSSL::PKey::DSA
-          cert
-        else
-          raise Faraday::Error, "invalid ssl.client_key: #{cert.inspect}"
-        end
+        return nil if cert.nil?
+        return OpenSSL::PKey::RSA.new(File.read(cert)) if cert.is_a(String)
+        return cert if cert.is_a?(OpenSSL::PKey::RSA, OpenSSL::PKey::DSA)
+
+        raise Faraday::Error, "invalid ssl.client_key: #{cert.inspect}"
       end
     end
   end

data/lib/faraday/http/version.rb

@@ -2,6 +2,6 @@
 
 module Faraday
   module Http
-    VERSION = '1.0.1'
+    VERSION = '2.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-http
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - iMacTia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2022-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,28 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +133,7 @@ metadata:
   homepage_uri: https://github.com/lostisland/faraday-http
   source_code_uri: https://github.com/lostisland/faraday-http
   changelog_uri: https://github.com/lostisland/faraday-http/releases
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -135,14 +142,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Faraday Adapter for HTTP.rb