faraday-net_http 2.0.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd81d4fd0efd54bc9645740c95d58d1da812ea43be13b265f2a6031136b7d5d6
-  data.tar.gz: 6b53df4188f50693d8f4c7ebb2fea9ae9a5f8277e0894ba49be7f2ceb90f95e0
+  metadata.gz: 4efc5a5f90fde405f695b602850c1060a683bc2ae350f8244637895cf414a7b1
+  data.tar.gz: b24f51c181e5dfda23f6687347b012cbfd3d225f9c9a4310ea5b69c8277c2f3c
 SHA512:
-  metadata.gz: 8ac00145c8e0a0a9dbb53daf0a4da960d56143227293288b5b6c4754b302f3ad3123edebefdf987d4b4250f5473e2adf2c9267eb70f8c26e141c78f0c4a478d5
-  data.tar.gz: e059ac1f6872511c4095136fa3b6e52fc130b303258bb4bb0a755fd5fc53ba8218e17e54ab56d3df1c92e936c416f673c7bbc1e600158eb87c503b0cab7af349
+  metadata.gz: 828b85c9ec2c8d81f48749802a572af232574a124b16d245e903ecba162327a8b7107a046ea1f136105e6aa382a612efda5afb9dd49442d73b8f4884875f3a3e
+  data.tar.gz: d4cac854ff1631ee53acadf70efb2fa29608c4454e3b6a87b291c45152761cbe5ab99b98d929cc95256498631a456e677ac43be3b400b74a7a315bdedf0c9001

data/README.md

@@ -24,7 +24,6 @@ Or install it yourself as:
 conn = Faraday.new(...) do |f|
   f.adapter :net_http do |http|
     # yields Net::HTTP
-    http.idle_timeout = 100
     http.verify_callback = lambda do |preverify, cert_store|
       # do something here...
     end

data/lib/faraday/adapter/net_http.rb

@@ -15,6 +15,7 @@ module Faraday
       exceptions = [
         IOError,
         Errno::EADDRNOTAVAIL,
+        Errno::EALREADY,
         Errno::ECONNABORTED,
         Errno::ECONNREFUSED,
         Errno::ECONNRESET,
@@ -61,22 +62,13 @@ module Faraday
 
       def call(env)
         super
-        http_response = connection(env) do |http|
+        connection(env) do |http|
           perform_request(http, env)
         rescue *NET_HTTP_EXCEPTIONS => e
           raise Faraday::SSLError, e if defined?(OpenSSL) && e.is_a?(OpenSSL::SSL::SSLError)
 
           raise Faraday::ConnectionFailed, e
         end
-
-        save_response(env, http_response.code.to_i,
-                      encoded_body(http_response), nil,
-                      http_response.message) do |response_headers|
-          http_response.each_header do |key, value|
-            response_headers[key] = value
-          end
-        end
-
         @app.call env
       rescue Timeout::Error, Errno::ETIMEDOUT => e
         raise Faraday::TimeoutError, e
@@ -101,53 +93,41 @@ module Faraday
       end
 
       def perform_request(http, env)
-        if env[:request].stream_response?
-          size = 0
-          yielded = false
-          http_response = request_with_wrapped_block(http, env) do |chunk|
-            if chunk.bytesize.positive? || size.positive?
-              yielded = true
-              size += chunk.bytesize
-              env[:request].on_data.call(chunk, size)
-            end
+        if env.stream_response?
+          http_response = env.stream_response do |&on_data|
+            request_with_wrapped_block(http, env, &on_data)
           end
-          env[:request].on_data.call(+'', 0) unless yielded
-          # Net::HTTP returns something,
-          # but it's not meaningful according to the docs.
           http_response.body = nil
-          http_response
-        else
-          request_with_wrapped_block(http, env)
-        end
-      end
-
-      def request_with_wrapped_block(http, env, &block)
-        if (env[:method] == :get) && !env[:body]
-          # prefer `get` to `request` because the former handles gzip (ruby 1.9)
-          request_via_get_method(http, env, &block)
         else
-          request_via_request_method(http, env, &block)
+          http_response = request_with_wrapped_block(http, env)
         end
+        env.response_body = encoded_body(http_response)
+        env.response.finish(env)
+        http_response
       end
 
-      def request_via_get_method(http, env, &block)
+      def request_with_wrapped_block(http, env)
         # Must use Net::HTTP#start and pass it a block otherwise the server's
         # TCP socket does not close correctly.
         http.start do |opened_http|
-          opened_http.get env[:url].request_uri, env[:request_headers], &block
+          opened_http.request create_request(env) do |response|
+            save_http_response(env, response)
+
+            if block_given?
+              response.read_body do |chunk|
+                yield(chunk)
+              end
+            end
+          end
         end
       end
 
-      def request_via_request_method(http, env, &block)
-        # Must use Net::HTTP#start and pass it a block otherwise the server's
-        # TCP socket does not close correctly.
-        http.start do |opened_http|
-          if block_given?
-            opened_http.request create_request(env) do |response|
-              response.read_body(&block)
-            end
-          else
-            opened_http.request create_request(env)
+      def save_http_response(env, http_response)
+        save_response(
+          env, http_response.code.to_i, nil, nil, http_response.message, finished: false
+        ) do |response_headers|
+          http_response.each_header do |key, value|
+            response_headers[key] = value
           end
         end
       end
@@ -166,6 +146,7 @@ module Faraday
         http.ssl_version = ssl[:version] if ssl[:version]
         http.min_version = ssl[:min_version] if ssl[:min_version]
         http.max_version = ssl[:max_version] if ssl[:max_version]
+        http.verify_hostname = ssl[:verify_hostname] if verify_hostname_enabled?(http, ssl)
       end
 
       def configure_request(http, req)
@@ -218,6 +199,10 @@ module Faraday
         end
         body
       end
+
+      def verify_hostname_enabled?(http, ssl)
+        http.respond_to?(:verify_hostname=) && ssl.key?(:verify_hostname)
+      end
     end
   end
 end

data/lib/faraday/net_http/version.rb

@@ -2,6 +2,6 @@
 
 module Faraday
   module NetHttp
-    VERSION = '2.0.2'
+    VERSION = '3.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-net_http
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Jan van der Pas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.5'
 description: Faraday adapter for Net::HTTP
 email:
 - janvanderpas@gmail.com
@@ -42,7 +42,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/lostisland/faraday-net_http
   source_code_uri: https://github.com/lostisland/faraday-net_http
-  changelog_uri: https://github.com/lostisland/faraday-net_http/releases/tag/v2.0.2
+  changelog_uri: https://github.com/lostisland/faraday-net_http/releases/tag/v3.0.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -51,7 +51,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="