Replacing Net::HTTP::Persistent with faraday-net_http_persistent (#1250)

lostisland · Mar 26, 2021 · 14d0dd7 · 14d0dd7
1 parent 850155e
commit 14d0dd7
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 151 deletions.
diff --git a/Gemfile b/Gemfile
@@ -24,9 +24,6 @@ group :test, :development do
   gem 'excon', '>= 0.27.4'
   gem 'httpclient', '>= 2.2'
   gem 'multipart-parser'
-  # TODO: remove this once v4 is released
-  options = (RUBY_VERSION.start_with?('3') ? { github: 'grosser/net-http-persistent', branch: 'grosser/spec' } : {})
-  gem 'net-http-persistent', '>= 3.0', **options
   gem 'patron', '>= 0.4.2', platforms: :ruby
   gem 'rack-test', '>= 0.6', require: 'rack/test'
   gem 'rspec', '~> 3.7'

diff --git a/faraday.gemspec b/faraday.gemspec
@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.4'
 
   spec.add_dependency 'faraday-net_http', '~> 1.0'
+  spec.add_dependency 'faraday-net_http_persistent', '~> 1.0'
   spec.add_dependency 'multipart-post', '>= 1.2', '< 3'
   spec.add_dependency 'ruby2_keywords', '>= 0.0.4'
 

diff --git a/lib/faraday/adapter/net_http_persistent.rb b/lib/faraday/adapter/net_http_persistent.rb
diff --git a/spec/faraday/adapter/net_http_persistent_spec.rb b/spec/faraday/adapter/net_http_persistent_spec.rb