faraday-net_http 2.1.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e471698764d66a8adfeafe9e3bad0472da1548fd4607ad5558b67cfce4932b02
-  data.tar.gz: 8cac9b619ce0ed8fbc861e5f4dfc46339dd61b066ec685bd6bda5deaa0c13456
+  metadata.gz: 6dceca36c2e49d9e2642dd7d6177df8ee20d799efb59a2ae661a2790f05244a9
+  data.tar.gz: c064e33f9fa0666b1b7402f5bb948401fd76c78205d627942b5e693b271fbaed
 SHA512:
-  metadata.gz: afd126506d6c8c2110cd71a561ae0923ae32946ec437ad2cc5acc04ee1b50c2a2a7ac4cb1cf0752b0f9afae4f1227fa7d0e5e7693dd1c478a5c9f03be5923d45
-  data.tar.gz: e9cbb0a9571ca1eefb2b30cbc02b45939272447dd976ff36f079b0f09d8adc2faaef0e0e918c552359e51ca85c69e1881616af516eaf30be96228b99b91ea2de
+  metadata.gz: 4b49ece078d46b76578f63b8efefeff9b10cade3eb71850583b5f1902f60aab105cbc4a81581718e33f0cb7a12357a07bf8f0440832aa85044adfbcd7a5cea2a
+  data.tar.gz: 365a1b68e1f2bde815155b9836a281705ba6806155363245cc3ca837d6a3bfb014c4b8f0bd46984c52783f73a1f7957c2dd8ab6f39b84c639e15b4beae7b9a56

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,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
@@ -211,8 +190,8 @@ module Faraday
 
       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.captures.first.split(';').first.strip)
           body = body.dup if body.frozen?
           body.force_encoding(content_charset)
         rescue ArgumentError

data/lib/faraday/net_http/version.rb

@@ -2,6 +2,6 @@
 
 module Faraday
   module NetHttp
-    VERSION = '2.1.0'
+    VERSION = '3.0.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-net_http
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Jan van der Pas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2022-10-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.1.0
+  changelog_uri: https://github.com/lostisland/faraday-net_http/releases/tag/v3.0.1
 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:
   - - ">="