faraday-excon 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c003d4288f7c9b83abb71ff8fcf34858f049c2b6fc531f53720ff6eec888dd7d
-  data.tar.gz: adb5e1c19a317597e293e2f67e5dc9eb9c5c984381078f5b8f587bba6dda862f
+  metadata.gz: 48cc25dbe1f1b2758a18d7b632862a0b925c41dcf60b85017571af0b1ae9e5c8
+  data.tar.gz: 31f11d707f4d986908b2a0d92203843c563a40c49c0b363f02180747f8b85c4c
 SHA512:
-  metadata.gz: 91ace0a8a95b318c587c023197833fa4a1df61ebc7deaddb733a8a638f6c0abc1bda669ad9b0c94b9053b46baf27ef1ca0d2e29b103b9d28fb57e8770c225968
-  data.tar.gz: fa06ea79333d4a0cc662dfc142a594de4319a82a8e5601140c2af2676795bc8c8e165827e285e3a2008b03ef6c0a3c1124b6f6a924c560486015ee4ad65c6f39
+  metadata.gz: cd71d9c447b9fa17960250bba74842d173491be820aa1c2713fa28cc78a3558d11d5362549e2a7593132b353a1aca9d40dcc1864ac2bc41acdf0b798e6f86e39
+  data.tar.gz: 983de5b151300ac67cd7ed09df531353bea392e49c740087e4810444cbe6aa7799ef43c679b25c1db681ca8b7e8d381e6fd232c1af3f9cf15ae9588c07e70e99

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.

data/lib/faraday/adapter/excon.rb

@@ -5,14 +5,26 @@ module Faraday
     # Excon adapter.
     class Excon < Faraday::Adapter
       def build_connection(env)
+        if @connection_options[:persistent]
+          return @connection if defined? @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 +38,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 +64,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)

data/lib/faraday/excon/version.rb

@@ -2,6 +2,6 @@
 
 module Faraday
   module Excon
-    VERSION = '2.0.0'
+    VERSION = '2.1.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.1.0
 platform: ruby
 authors:
 - "@iMacTia"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha.pre.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha.pre.2
+        version: '2.0'
 description: Faraday adapter for Excon
 email:
 - giuffrida.mattia@gmail.com
@@ -56,7 +56,7 @@ licenses:
 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
+  changelog_uri: https://github.com/lostisland/faraday-excon/releases/tag/v2.1.0
 post_install_message: 
 rdoc_options: []
 require_paths: