faraday-excon 1.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b78b8cf1e6b7dfecc1beb94c545a64be9c7c29f2dc71b88ddf52a954154f99d2
-  data.tar.gz: d6f22b96924c1221e19d62250a2250cdb3990f7da1d6bdfdd524ee7d969d5f9d
+  metadata.gz: 48cc25dbe1f1b2758a18d7b632862a0b925c41dcf60b85017571af0b1ae9e5c8
+  data.tar.gz: 31f11d707f4d986908b2a0d92203843c563a40c49c0b363f02180747f8b85c4c
 SHA512:
-  metadata.gz: 4db552b4e3b61fa66dd169405cb113f6b0de62f75f07b822c91b7152d01de96b761ba5528b9b8c9c09889c070d2e4788b31441216b75af1a188e67a7779915ec
-  data.tar.gz: 0a82f49683023ff4c9099820fe70fdb2f2c446dd2abcfeff30e180546ddc40eec6f39f1ea946cf94cae267a0cbc1d9ffdbe68c62f3147439a917da20a446958e
+  metadata.gz: cd71d9c447b9fa17960250bba74842d173491be820aa1c2713fa28cc78a3558d11d5362549e2a7593132b353a1aca9d40dcc1864ac2bc41acdf0b798e6f86e39
+  data.tar.gz: 983de5b151300ac67cd7ed09df531353bea392e49c740087e4810444cbe6aa7799ef43c679b25c1db681ca8b7e8d381e6fd232c1af3f9cf15ae9588c07e70e99

data/README.md

@@ -6,7 +6,7 @@ Every adapter is defined into its own gem. This gem defines the adapter for Exco
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add these lines to your application's Gemfile:
 
 ```ruby
 gem 'faraday-excon'
@@ -16,21 +16,26 @@ And then execute:
 
     $ bundle install
 
-Or install it yourself as:
+Or install them yourself as:
 
     $ gem install faraday-excon
 
 ## Usage
 
-Configure your Faraday connection to use this adapter like this:
-
 ```ruby
-connection = Faraday.new(url, conn_options) do |conn|
-  conn.adapter(:excon)
+conn = Faraday.new(...) do |f|
+  # no custom options available
+  f.adapter :excon
 end
 ```
 
-For more information on how to setup your Faraday connection and adapters usage, please refer to the [Faraday Website][faraday-website].
+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
 

data/lib/faraday/adapter/excon.rb

@@ -4,17 +4,27 @@ module Faraday
   class Adapter
     # Excon adapter.
     class Excon < Faraday::Adapter
-      dependency 'excon'
-
       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)
@@ -28,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/)
 
@@ -43,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 = '1.0.0'
+    VERSION = '2.1.0'
   end
 end

data/lib/faraday/excon.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'excon'
+require 'faraday'
 require_relative 'adapter/excon'
 require_relative 'excon/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-excon
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.1.0
 platform: ruby
 authors:
-- Mattia Giuffrida
+- "@iMacTia"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -25,145 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.27.4
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.19.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.19.0
-- !ruby/object:Gem::Dependency
-  name: multipart-parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.91.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.91.1
-- !ruby/object:Gem::Dependency
-  name: rubocop-packaging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Faraday adapter for Excon
 email:
 - giuffrida.mattia@gmail.com
@@ -182,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
+  changelog_uri: https://github.com/lostisland/faraday-excon/releases/tag/v2.1.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -191,14 +65,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Faraday adapter for Excon