faraday-excon 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c003d4288f7c9b83abb71ff8fcf34858f049c2b6fc531f53720ff6eec888dd7d
-  data.tar.gz: adb5e1c19a317597e293e2f67e5dc9eb9c5c984381078f5b8f587bba6dda862f
+  metadata.gz: 23faaabde9dd0295b342f883abf13b0ff8ffd8ace6f9e1d288dcb181082aa0b7
+  data.tar.gz: 5ac3b89d1d55411f972f0d10f5c53d5c24fc612010083768aa9d137d2b79fb85
 SHA512:
-  metadata.gz: 91ace0a8a95b318c587c023197833fa4a1df61ebc7deaddb733a8a638f6c0abc1bda669ad9b0c94b9053b46baf27ef1ca0d2e29b103b9d28fb57e8770c225968
-  data.tar.gz: fa06ea79333d4a0cc662dfc142a594de4319a82a8e5601140c2af2676795bc8c8e165827e285e3a2008b03ef6c0a3c1124b6f6a924c560486015ee4ad65c6f39
+  metadata.gz: a2e4059411905358fc26a4e79688b3ff2d20ccad73b84f0e650172dda17c86582918d4e0ab348386122b25403a30b278cff134ba8863948aaee92903c640fb18
+  data.tar.gz: ee24c87fc472d04bf595c2b12bc4c34d2a14dbc533b416e0174fe884f150359aa6e04a6bd995b594e279f54eb247eebfbb498fa6dc62acceaaec03cd18736af9

data/README.md

@@ -29,6 +29,14 @@ conn = Faraday.new(...) do |f|
 end
 ```
 
+Passing connection options:
+```ruby
+conn = Faraday.new(...) do |f|
+  # Will keep the connection memoized within the adapter, and rely that flag to excon
+  f.adapter :excon, persistent: true
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -47,10 +55,10 @@ The gem is available as open source under the terms of the [license][license].
 
 Everyone interacting in the Faraday Excon adapter project's codebase, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct][code-of-conduct].
 
-[faraday]: https://github.com/lostisland/faraday
+[faraday]: https://github.com/excon/faraday
 [faraday-website]: https://lostisland.github.io/faraday
 [excon]: https://github.com/excon/excon
 [rubygems]: https://rubygems.org
-[repo]: https://github.com/lostisland/faraday-excon
-[license]: https://github.com/lostisland/faraday-excon/blob/main/LICENSE.md
-[code-of-conduct]: https://github.com/lostisland/faraday-excon/blob/main/CODE_OF_CONDUCT.md
+[repo]: https://github.com/excon/faraday-excon
+[license]: https://github.com/excon/faraday-excon/blob/main/LICENSE.md
+[code-of-conduct]: https://github.com/excon/faraday-excon/blob/main/CODE_OF_CONDUCT.md

data/lib/faraday/adapter/excon.rb

@@ -5,14 +5,27 @@ module Faraday
     # Excon adapter.
     class Excon < Faraday::Adapter
       def build_connection(env)
+        if @connection_options[:persistent] && defined?(@connection)
+          return @connection
+        end
+
         opts = opts_from_env(env)
-        ::Excon.new(env[:url].to_s, opts.merge(@connection_options))
+
+        # remove path & query when creating connection
+        # because if it is persistent, it can re-use the conn
+        url = env[:url].dup
+        url.path = ''
+        url.query = nil
+
+        @connection = ::Excon.new(url.to_s, opts.merge(@connection_options))
       end
 
       def call(env)
         super
 
         req_opts = {
+          path: env[:url].path,
+          query: env[:url].query,
           method: env[:method].to_s.upcase,
           headers: env[:request_headers],
           body: read_body(env)
@@ -26,11 +39,22 @@ module Faraday
           end
         end
 
-        resp = connection(env) { |http| http.request(req_opts) }
+        resp = connect_and_request(env, req_opts)
         save_response(env, resp.status.to_i, resp.body, resp.headers,
                       resp.reason_phrase)
 
         @app.call(env)
+      end
+
+      # TODO: support streaming requests
+      def read_body(env)
+        env[:body].respond_to?(:read) ? env[:body].read : env[:body]
+      end
+
+      private
+
+      def connect_and_request(env, req_opts)
+        connection(env) { |http| http.request(req_opts) }
       rescue ::Excon::Errors::SocketError => e
         raise Faraday::TimeoutError, e if e.message.match?(/\btimeout\b/)
 
@@ -41,13 +65,6 @@ module Faraday
         raise Faraday::TimeoutError, e
       end
 
-      # TODO: support streaming requests
-      def read_body(env)
-        env[:body].respond_to?(:read) ? env[:body].read : env[:body]
-      end
-
-      private
-
       def opts_from_env(env)
         opts = {}
         amend_opts_with_ssl!(opts, env[:ssl]) if needs_ssl_settings?(env)
@@ -65,6 +82,7 @@ module Faraday
       end
 
       OPTS_KEYS = [
+        %i[ciphers ciphers],
         %i[client_cert client_cert],
         %i[client_key client_key],
         %i[certificate certificate],

data/lib/faraday/excon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-excon
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
-- "@iMacTia"
-autorequire: 
+- "@geemus"
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2024-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -16,31 +16,37 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.109.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.109.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha.pre.2
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha.pre.2
+        version: '3'
 description: Faraday adapter for Excon
 email:
-- giuffrida.mattia@gmail.com
+- geemus@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -50,14 +56,15 @@ files:
 - lib/faraday/adapter/excon.rb
 - lib/faraday/excon.rb
 - lib/faraday/excon/version.rb
-homepage: https://github.com/lostisland/faraday-excon
+homepage: https://github.com/excon/faraday-excon
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/lostisland/faraday-excon
-  source_code_uri: https://github.com/lostisland/faraday-excon
-  changelog_uri: https://github.com/lostisland/faraday-excon/releases/tag/v2.0.0
-post_install_message: 
+  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:
 rdoc_options: []
 require_paths:
 - lib
@@ -65,15 +72,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.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
-signing_key: 
+rubygems_version: 3.5.18
+signing_key:
 specification_version: 4
 summary: Faraday adapter for Excon
 test_files: []