Merge da8a179 into 7a444d8

lib/stripe/stripe_client.rb

@@ -31,11 +31,18 @@ def self.default_conn
       # of connection re-use, so make sure that we have a separate connection
       # object per thread.
       Thread.current[:stripe_client_default_conn] ||= begin
-        conn = Faraday.new do |c|
-          c.use Faraday::Request::Multipart
-          c.use Faraday::Request::UrlEncoded
-          c.use Faraday::Response::RaiseError
-          c.adapter Faraday.default_adapter
+        conn = Faraday.new do |builder|
+          builder.use Faraday::Request::Multipart
+          builder.use Faraday::Request::UrlEncoded
+          builder.use Faraday::Response::RaiseError
+
+          # Net::HTTP::Persistent doesn't seem to do well on JRuby, so fall
+          # back to default there.
+          if RUBY_PLATFORM == "java"
+            builder.adapter :net_http
+          else
+            builder.adapter :net_http_persistent
+          end
         end
 
         if Stripe.verify_ssl_certs

stripe.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.license = "MIT"
 
   s.add_dependency("faraday", "~> 0.10")
+  s.add_dependency("net-http-persistent", "~> 3.0")
 
   s.files = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")

test/test_helper.rb

@@ -27,7 +27,8 @@
 # we can print one error and fail fast so that it's more clear to the user how
 # they should fix the problem.
 begin
-  resp = Faraday.get("http://localhost:#{MOCK_PORT}/")
+  conn = Faraday::Connection.new("http://localhost:#{MOCK_PORT}")
+  resp = conn.get("/")
   version = resp.headers["Stripe-Mock-Version"]
   if version != "master" &&
      Gem::Version.new(version) < Gem::Version.new(MOCK_MINIMUM_VERSION)