faraday-excon 2.2.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23faaabde9dd0295b342f883abf13b0ff8ffd8ace6f9e1d288dcb181082aa0b7
-  data.tar.gz: 5ac3b89d1d55411f972f0d10f5c53d5c24fc612010083768aa9d137d2b79fb85
+  metadata.gz: 73929aac6bc0fcf47ec852b326cbd6b9069028fb5c20c8a3744e2a4023be0f6c
+  data.tar.gz: b2434d370c485a6d23690acf3140d1f9099d6c4abb41b4e33798923fff00d002
 SHA512:
-  metadata.gz: a2e4059411905358fc26a4e79688b3ff2d20ccad73b84f0e650172dda17c86582918d4e0ab348386122b25403a30b278cff134ba8863948aaee92903c640fb18
-  data.tar.gz: ee24c87fc472d04bf595c2b12bc4c34d2a14dbc533b416e0174fe884f150359aa6e04a6bd995b594e279f54eb247eebfbb498fa6dc62acceaaec03cd18736af9
+  metadata.gz: 4ac1fc9d8592643820591f584cc10af0815b208928df7640b89716eb0044360b571f8da6cb9a3fb4c30009e82d877e42a947c381bbd4dd8c6da204175f171baa
+  data.tar.gz: 0ae26c632ed1c85145373faa55452cd895004ab495b3fa39367bdcc9b339f5b1e8a6d40e12edc3d01e02361fbb86b74aa5d89ee470e04f8428efd9d37a9a5e42

data/lib/faraday/adapter/excon.rb

@@ -4,15 +4,25 @@ module Faraday
   class Adapter
     # Excon adapter.
     class Excon < Faraday::Adapter
+      OPTS_KEYS = [
+        %i[ciphers ciphers],
+        %i[client_cert client_cert],
+        %i[client_key client_key],
+        %i[certificate certificate],
+        %i[private_key private_key],
+        %i[ssl_ca_path ca_path],
+        %i[ssl_ca_file ca_file],
+        %i[ssl_version version],
+        %i[ssl_min_version min_version],
+        %i[ssl_max_version max_version]
+      ].freeze
+
       def build_connection(env)
-        if @connection_options[:persistent] && defined?(@connection)
-          return @connection
-        end
+        return @connection if @connection_options[:persistent] && defined?(@connection)
 
         opts = opts_from_env(env)
 
-        # remove path & query when creating connection
-        # because if it is persistent, it can re-use the conn
+        # remove path & query, because persistent can re-use connection
         url = env[:url].dup
         url.path = ''
         url.query = nil
@@ -32,16 +42,21 @@ module Faraday
         }
 
         req = env[:request]
-        if req&.stream_response?
+        yielded = false
+        if env.stream_response?
           total = 0
           req_opts[:response_block] = lambda do |chunk, _remain, _total|
-            req.on_data.call(chunk, total += chunk.size)
+            yielded = true
+            req.on_data.call(chunk, total += chunk.bytesize, env)
           end
         end
 
         resp = connect_and_request(env, req_opts)
-        save_response(env, resp.status.to_i, resp.body, resp.headers,
-                      resp.reason_phrase)
+
+        # duplicate env.stream_response helper behavior for empty streams
+        req.on_data.call(+'', 0, env) if req&.stream_response? && !yielded
+
+        save_response(env, resp.status.to_i, resp.body, resp.headers, resp.reason_phrase)
 
         @app.call(env)
       end
@@ -81,19 +96,6 @@ module Faraday
         env[:url].scheme == 'https' && env[:ssl]
       end
 
-      OPTS_KEYS = [
-        %i[ciphers ciphers],
-        %i[client_cert client_cert],
-        %i[client_key client_key],
-        %i[certificate certificate],
-        %i[private_key private_key],
-        %i[ssl_ca_path ca_path],
-        %i[ssl_ca_file ca_file],
-        %i[ssl_version version],
-        %i[ssl_min_version min_version],
-        %i[ssl_max_version max_version]
-      ].freeze
-
       def amend_opts_with_ssl!(opts, ssl)
         opts[:ssl_verify_peer] = !!ssl.fetch(:verify, true)
         # https://github.com/geemus/excon/issues/106

data/lib/faraday/excon/version.rb

@@ -2,6 +2,6 @@
 
 module Faraday
   module Excon
-    VERSION = '2.2.0'
+    VERSION = '2.4.0'
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: faraday-excon
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.4.0
 platform: ruby
 authors:
 - "@geemus"
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.109.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.109.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -63,8 +62,8 @@ metadata:
   homepage_uri: https://github.com/excon/faraday-excon
   rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/excon/faraday-excon
-  changelog_uri: https://github.com/excon/faraday-excon/releases/tag/v2.2.0
-post_install_message:
+  changelog_uri: https://github.com/excon/faraday-excon/releases/tag/v2.4.0
+  funding_uri: https://github.com/sponsors/geemus
 rdoc_options: []
 require_paths:
 - lib
@@ -79,8 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Faraday adapter for Excon
 test_files: []