Use external patron adapter (#1290)

iMacTia · web-flow · commit bc4eb877c9f8 · 2021-07-04T19:50:59.000+01:00
diff --git a/faraday.gemspec b/faraday.gemspec
@@ -2,7 +2,7 @@
 
 require_relative 'lib/faraday/version'
 
-Gem::Specification.new do |spec|
+Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.name    = 'faraday'
   spec.version = Faraday::VERSION
 
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday-httpclient', '~> 1.0.1'
   spec.add_dependency 'faraday-net_http', '~> 1.0'
   spec.add_dependency 'faraday-net_http_persistent', '~> 1.1'
+  spec.add_dependency 'faraday-patron', '~> 1.0'
   spec.add_dependency 'multipart-post', '>= 1.2', '< 3'
   spec.add_dependency 'ruby2_keywords', '>= 0.0.4'
 
diff --git a/lib/faraday.rb b/lib/faraday.rb
@@ -33,6 +33,7 @@
 require 'faraday/httpclient'
 require 'faraday/net_http'
 require 'faraday/net_http_persistent'
+require 'faraday/patron'
 
 # This is the main namespace for Faraday.
 #
diff --git a/lib/faraday/adapter.rb b/lib/faraday/adapter.rb
@@ -12,7 +12,6 @@ class Adapter
     register_middleware File.expand_path('adapter', __dir__),
                         test: [:Test, 'test'],
                         typhoeus: [:Typhoeus, 'typhoeus'],
-                        patron: [:Patron, 'patron'],
                         rack: [:Rack, 'rack']
 
     # This module marks an Adapter as supporting parallel requests.
diff --git a/lib/faraday/adapter/patron.rb b/lib/faraday/adapter/patron.rb
diff --git a/lib/faraday/autoload.rb b/lib/faraday/autoload.rb
@@ -59,7 +59,6 @@ class Adapter
     extend AutoloadHelper
     autoload_all 'faraday/adapter',
                  Typhoeus: 'typhoeus',
-                 Patron: 'patron',
                  Test: 'test',
                  Rack: 'rack'
   end

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`require 'faraday/httpclient'`
`34`	`34`	`require 'faraday/net_http'`
`35`	`35`	`require 'faraday/net_http_persistent'`
	`36`	`+require 'faraday/patron'`
`36`	`37`
`37`	`38`	`# This is the main namespace for Faraday.`
`38`	`39`	`#`