Adapter support for Net::HTTP::Persistent v3.0.0 (#619)

Author: olleolleolle

.travis.yml

@@ -1,5 +1,6 @@
 sudo: false
 language: ruby
+before_install: gem install bundler
 script: bundle exec script/test
 cache: bundler
 

Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+ruby RUBY_VERSION
+
 gem 'ffi-ncurses', '~> 0.3', :platforms => :jruby
 gem 'jruby-openssl', '~> 0.8.8', :platforms => :jruby
 gem 'rake'
@@ -13,24 +15,13 @@ group :test do
   gem 'httpclient', '>= 2.2'
   gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
   gem 'minitest', '>= 5.0.5'
-  gem 'net-http-persistent', '~> 2.9.4'
+  gem 'net-http-persistent'
   gem 'patron', '>= 0.4.2', :platforms => :ruby
   gem 'rack-test', '>= 0.6', :require => 'rack/test'
   gem 'rest-client', '~> 1.6.0', :platforms => [:jruby, :ruby_18]
   gem 'simplecov'
   gem 'sinatra', '~> 1.3'
   gem 'typhoeus', '~> 0.3.3', :platforms => [:ruby_18, :ruby_19, :ruby_20, :ruby_21]
-
-  # Below are dependencies of the gems we actually care about that have
-  # dropped support for older Rubies. Because they are not first-level
-  # dependencies, we don't need to specify an unconstrained version, so we can
-  # lump them together here.
-
-  if RUBY_VERSION < '2'
-    gem 'json', '< 2'
-    gem 'tins', '< 1.7.0'
-    gem 'term-ansicolor', '< 1.4'
-  end
 end
 
 gemspec

lib/faraday/adapter/net_http_persistent.rb

@@ -8,6 +8,7 @@ class NetHttpPersistent < NetHttp
       dependency 'net/http/persistent'
 
       def net_http_connection(env)
+        proxy_uri = nil
         if (proxy = env[:request][:proxy])
           proxy_uri = ::URI::HTTP === proxy[:uri] ? proxy[:uri].dup : ::URI.parse(proxy[:uri].to_s)
           proxy_uri.user = proxy_uri.password = nil
@@ -16,10 +17,13 @@ def net_http_connection(env)
             define_method(:user) { proxy[:user] }
             define_method(:password) { proxy[:password] }
           end if proxy[:user]
-          return Net::HTTP::Persistent.new 'Faraday', proxy_uri
         end
 
-        Net::HTTP::Persistent.new 'Faraday'
+        if Net::HTTP::Persistent.instance_method(:initialize).parameters.first == [:key, :name]
+          Net::HTTP::Persistent.new(name: 'Faraday', proxy: proxy_uri)
+        else
+          Net::HTTP::Persistent.new('Faraday', proxy_uri)
+        end
       end
 
       def perform_request(http, env)

test/adapters/net_http_persistent_test.rb

@@ -10,8 +10,11 @@ def setup
         if defined?(Net::HTTP::Persistent)
           # work around problems with mixed SSL certificates
           # https://github.com/drbrain/net-http-persistent/issues/45
-          http = Net::HTTP::Persistent.new('Faraday')
-          http.ssl_cleanup(4)
+          if Net::HTTP::Persistent.instance_method(:initialize).parameters.first == [:key, :name]
+            Net::HTTP::Persistent.new(name: 'Faraday').reconnect_ssl
+          else
+            Net::HTTP::Persistent.new('Faraday').ssl_cleanup(4)
+          end
         end
       end if ssl_mode?
     end