Use external httpclient adapter (#1289)

lostisland · Jul 4, 2021 · 274f5fa · 274f5fa
1 parent 8ca6a7e
commit 274f5fa
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 156 deletions.
diff --git a/faraday.gemspec b/faraday.gemspec
@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday-em_http', '~> 1.0'
   spec.add_dependency 'faraday-em_synchrony', '~> 1.0'
   spec.add_dependency 'faraday-excon', '~> 1.1'
+  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 'multipart-post', '>= 1.2', '< 3'

diff --git a/lib/faraday.rb b/lib/faraday.rb
@@ -30,6 +30,7 @@
 require 'faraday/em_http'
 require 'faraday/em_synchrony'
 require 'faraday/excon'
+require 'faraday/httpclient'
 require 'faraday/net_http'
 require 'faraday/net_http_persistent'
 

diff --git a/lib/faraday/adapter.rb b/lib/faraday/adapter.rb
@@ -13,8 +13,7 @@ class Adapter
                         test: [:Test, 'test'],
                         typhoeus: [:Typhoeus, 'typhoeus'],
                         patron: [:Patron, 'patron'],
-                        rack: [:Rack, 'rack'],
-                        httpclient: [:HTTPClient, 'httpclient']
+                        rack: [:Rack, 'rack']
 
     # This module marks an Adapter as supporting parallel requests.
     module Parallelism

diff --git a/lib/faraday/adapter/httpclient.rb b/lib/faraday/adapter/httpclient.rb
diff --git a/lib/faraday/autoload.rb b/lib/faraday/autoload.rb
@@ -61,8 +61,7 @@ class Adapter
                  Typhoeus: 'typhoeus',
                  Patron: 'patron',
                  Test: 'test',
-                 Rack: 'rack',
-                 HTTPClient: 'httpclient'
+                 Rack: 'rack'
   end
 
   # Request represents a single HTTP request for a Faraday adapter to make.