faraday-net_http 2.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ef9f1370ac9c7ce8698f1101dd8bc2abe3127a3499c346af6b59bd46f0091f0
-  data.tar.gz: 012e6c8f79e2bb6a8ae7f22878d01ee7a5565f7eb5450bff25f7a49ea04760d3
+  metadata.gz: 2d9a033eff57867fb6f0d7ef439a1a218ce10dcfad224979f1af82f96e8fa201
+  data.tar.gz: bce85e35b8871f4ec9ba42410043bd74608ce577ea5221f4397ee0929b2be03b
 SHA512:
-  metadata.gz: 2d386a528dc585efe0bc2cc539009bb8d5a39188632db3fac071115d7da70fa39b52e5fe259cb9d1e028c7ed07bd841098f1f82ec16a07c0a3cc5bb7275efb50
-  data.tar.gz: c2676a71f09277c68c62c2224609c07853062c353ac47f865d58d00d675cd52694730f660f4d0fb915fb4d20d06e6eca5f05749c7c2ce98e59fb21b691a54afb
+  metadata.gz: 733173b97da6b8f8043dec130ddabb32f7f5e94673a095029d5d52b9b74326f34dee5fd2a6fcbcb91908d6168bce08ae22b2997d1c8e2124de3680f5c9e60bc4
+  data.tar.gz: e845d5bd38188d95f680a42b3ab78c06e8c485dcb27a6768ad4f4366208ca176b24db1ef657bfd3cb5c72c9b32440b4d536910bba36a454bfea52214a68f08a1

data/lib/faraday/adapter/net_http.rb

@@ -62,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
@@ -102,53 +93,37 @@ 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)
+          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_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)
-        end
-      end
-
-      def request_via_get_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|
-          opened_http.get env[:url].request_uri, env[:request_headers], &block
+          opened_http.request create_request(env) do |response|
+            save_http_response(env, response)
+
+            response.read_body(&block) if block_given?
+          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
@@ -167,6 +142,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)
@@ -192,26 +168,24 @@ module Faraday
       def ssl_cert_store(ssl)
         return ssl[:cert_store] if ssl[:cert_store]
 
-        @ssl_cert_store ||= begin
-                              # Use the default cert store by default, i.e. system ca certs
-                              OpenSSL::X509::Store.new.tap(&:set_default_paths)
-                            end
+        # Use the default cert store by default, i.e. system ca certs
+        @ssl_cert_store ||= OpenSSL::X509::Store.new.tap(&:set_default_paths)
       end
 
       def ssl_verify_mode(ssl)
         ssl[:verify_mode] || begin
-                               if ssl.fetch(:verify, true)
-                                 OpenSSL::SSL::VERIFY_PEER
-                               else
-                                 OpenSSL::SSL::VERIFY_NONE
-                               end
-                             end
+          if ssl.fetch(:verify, true)
+            OpenSSL::SSL::VERIFY_PEER
+          else
+            OpenSSL::SSL::VERIFY_NONE
+          end
+        end
       end
 
       def encoded_body(http_response)
         body = http_response.body || +''
-        /\bcharset=\s*(.+?)\s*(;|$)/.match(http_response['Content-Type']) do |match|
-          content_charset = ::Encoding.find(match.captures.first)
+        /\bcharset=([^;]+)/.match(http_response['Content-Type']) do |match|
+          content_charset = ::Encoding.find(match[1].strip)
           body = body.dup if body.frozen?
           body.force_encoding(content_charset)
         rescue ArgumentError
@@ -219,6 +193,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.3'
+    VERSION = '3.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-net_http
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Jan van der Pas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,28 @@ 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'
+- !ruby/object:Gem::Dependency
+  name: net-http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Faraday adapter for Net::HTTP
 email:
 - janvanderpas@gmail.com
@@ -42,7 +56,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.3
+  changelog_uri: https://github.com/lostisland/faraday-net_http/releases/tag/v3.1.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -51,14 +65,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Faraday adapter for Net::HTTP