net-http-persistent 3.0.1 → 4.0.2

data/test/test_net_http_persistent.rb

@@ -56,7 +56,8 @@ class TestNetHttpPersistent < Minitest::Test
   def setup
     @http = Net::HTTP::Persistent.new
 
-    @uri  = URI.parse 'http://example.com/path'
+    @uri    = URI 'http://example.com/path'
+    @uri_v6 = URI 'http://[2001:db8::1]/path'
 
     ENV.delete 'http_proxy'
     ENV.delete 'HTTP_PROXY'
@@ -120,7 +121,7 @@ class TestNetHttpPersistent < Minitest::Test
   def basic_connection
     raise "#{@uri} is not HTTP" unless @uri.scheme.downcase == 'http'
 
-    net_http_args = [@uri.host, @uri.port]
+    net_http_args = [@uri.hostname, @uri.port, nil, nil, nil, nil]
 
     connection = Net::HTTP::Persistent::Connection.allocate
     connection.ssl_generation = @http.ssl_generation
@@ -132,7 +133,9 @@ class TestNetHttpPersistent < Minitest::Test
     connection
   end
 
-  def connection
+  def connection uri = @uri
+    @uri = uri
+
     connection = basic_connection
     connection.last_use = Time.now
 
@@ -152,7 +155,7 @@ class TestNetHttpPersistent < Minitest::Test
   def ssl_connection
     raise "#{@uri} is not HTTPS" unless @uri.scheme.downcase == 'https'
 
-    net_http_args = [@uri.host, @uri.port]
+    net_http_args = [@uri.hostname, @uri.port, nil, nil, nil, nil]
 
     connection = Net::HTTP::Persistent::Connection.allocate
     connection.ssl_generation = @http.ssl_generation
@@ -220,26 +223,6 @@ class TestNetHttpPersistent < Minitest::Test
     assert_equal 1, @http.ssl_generation
   end
 
-  def test_can_retry_eh_change_requests
-    post = Net::HTTP::Post.new '/'
-
-    refute @http.can_retry? post
-
-    @http.retry_change_requests = true
-
-    assert @http.can_retry? post
-  end
-
-  def test_can_retry_eh_idempotent
-    head = Net::HTTP::Head.new '/'
-
-    refute @http.can_retry? head
-
-    post = Net::HTTP::Post.new '/'
-
-    refute @http.can_retry? post
-  end
-
   def test_cert_store_equals
     @http.cert_store = :cert_store
 
@@ -265,6 +248,7 @@ class TestNetHttpPersistent < Minitest::Test
     @http.open_timeout = 123
     @http.read_timeout = 321
     @http.idle_timeout = 42
+    @http.max_retries  = 5
 
     used = @http.connection_for @uri do |c|
       assert_kind_of Net::HTTP, c.http
@@ -275,11 +259,12 @@ class TestNetHttpPersistent < Minitest::Test
       assert_equal 123, c.http.open_timeout
       assert_equal 321, c.http.read_timeout
       assert_equal 42, c.http.keep_alive_timeout
+      assert_equal 5, c.http.max_retries if c.http.respond_to?(:max_retries)
 
       c
     end
 
-    stored = @http.pool.checkout ['example.com', 80]
+    stored = @http.pool.checkout ['example.com', 80, nil, nil, nil, nil]
 
     assert_same used, stored
   end
@@ -377,6 +362,7 @@ class TestNetHttpPersistent < Minitest::Test
   end
 
   def test_connection_for_finished_ssl
+    skip 'Broken on Windows' if Gem.win_platform?
     skip 'OpenSSL is missing' unless HAVE_OPENSSL
 
     uri = URI.parse 'https://example.com/path'
@@ -395,6 +381,12 @@ class TestNetHttpPersistent < Minitest::Test
     end
   end
 
+  def test_connection_for_ipv6
+    @http.connection_for @uri_v6 do |c|
+      assert_equal '2001:db8::1', c.http.address
+    end
+  end
+
   def test_connection_for_host_down
     c = basic_connection
     def (c.http).start; raise Errno::EHOSTDOWN end
@@ -538,6 +530,21 @@ class TestNetHttpPersistent < Minitest::Test
     assert stored
   end
 
+  def test_connection_for_no_proxy_from_env
+    ENV['http_proxy'] = 'proxy.example'
+    ENV['no_proxy'] = 'localhost, example.com,'
+    ENV['proxy_user'] = 'johndoe'
+    ENV['proxy_password'] = 'muffins'
+
+    http = Net::HTTP::Persistent.new proxy: :ENV
+
+    http.connection_for @uri do |c|
+      assert c.http.started?
+      refute c.http.proxy?
+      refute c.http.proxy_from_env?
+    end
+  end
+
   def test_connection_for_refused
     Net::HTTP.use_connect :refused_connect
 
@@ -549,6 +556,7 @@ class TestNetHttpPersistent < Minitest::Test
   end
 
   def test_connection_for_ssl
+    skip 'Broken on Windows' if Gem.win_platform?
     skip 'OpenSSL is missing' unless HAVE_OPENSSL
 
     uri = URI.parse 'https://example.com/path'
@@ -589,6 +597,7 @@ class TestNetHttpPersistent < Minitest::Test
   end
 
   def test_connection_for_ssl_case
+    skip 'Broken on Windows' if Gem.win_platform?
     skip 'OpenSSL is missing' unless HAVE_OPENSSL
 
     uri = URI.parse 'HTTPS://example.com/path'
@@ -612,16 +621,6 @@ class TestNetHttpPersistent < Minitest::Test
     end
   end
 
-  def test_error_message
-    c = basic_connection
-    c.last_use = Time.now - 1
-    c.requests = 5
-
-    message = @http.error_message c
-    assert_match %r%after 4 requests on #{c.http.object_id}%, message
-    assert_match %r%, last used [\d.]+ seconds ago%, message
-  end
-
   def test_escape
     assert_nil @http.escape nil
 
@@ -635,6 +634,7 @@ class TestNetHttpPersistent < Minitest::Test
   end
 
   def test_expired_eh
+    skip 'Broken on Windows' if Gem.win_platform?
     c = basic_connection
     c.requests = 0
     c.last_use = Time.now - 11
@@ -675,6 +675,7 @@ class TestNetHttpPersistent < Minitest::Test
   def test_finish
     c = basic_connection
     c.requests = 5
+    c.http.instance_variable_set(:@last_communicated, Process.clock_gettime(Process::CLOCK_MONOTONIC))
 
     @http.finish c
 
@@ -683,6 +684,7 @@ class TestNetHttpPersistent < Minitest::Test
 
     assert_equal 0, c.requests
     assert_equal Net::HTTP::Persistent::EPOCH, c.last_use
+    assert_nil c.http.instance_variable_get(:@last_communicated)
   end
 
   def test_finish_io_error
@@ -720,15 +722,21 @@ class TestNetHttpPersistent < Minitest::Test
     assert_equal '1.1', @http.http_version(@uri)
   end
 
-  def test_idempotent_eh
-    assert @http.idempotent? Net::HTTP::Delete.new '/'
-    assert @http.idempotent? Net::HTTP::Get.new '/'
-    assert @http.idempotent? Net::HTTP::Head.new '/'
-    assert @http.idempotent? Net::HTTP::Options.new '/'
-    assert @http.idempotent? Net::HTTP::Put.new '/'
-    assert @http.idempotent? Net::HTTP::Trace.new '/'
+  def test_http_version_IPv6
+    assert_nil @http.http_version @uri_v6
 
-    refute @http.idempotent? Net::HTTP::Post.new '/'
+    connection @uri_v6
+
+    @http.request @uri_v6
+
+    assert_equal '1.1', @http.http_version(@uri_v6)
+  end
+
+  def test_max_retries_equals
+    @http.max_retries = 5
+
+    assert_equal 5, @http.max_retries
+    assert_equal 1, @http.generation
   end
 
   def test_normalize_uri
@@ -751,7 +759,7 @@ class TestNetHttpPersistent < Minitest::Test
     skip 'net-http-pipeline not installed' unless defined?(Net::HTTP::Pipeline)
 
     cached = basic_connection
-    cached.start
+    cached.http.start
 
     requests = [
       Net::HTTP::Get.new((@uri + '1').request_uri),
@@ -800,6 +808,14 @@ class TestNetHttpPersistent < Minitest::Test
     assert_equal proxy_uri, @http.proxy_uri
   end
 
+  def test_proxy_equals_uri_IPv6
+    proxy_uri = @uri_v6
+
+    @http.proxy = proxy_uri
+
+    assert_equal proxy_uri, @http.proxy_uri
+  end
+
   def test_proxy_from_env
     ENV['http_proxy']      = 'proxy.example'
     ENV['http_proxy_user'] = 'johndoe'
@@ -945,7 +961,7 @@ class TestNetHttpPersistent < Minitest::Test
     assert_equal Net::HTTP::Persistent::EPOCH, used2.last_use
   end
 
-  def test_request
+  def test_requestx
     @http.override_headers['user-agent'] = 'test ua'
     @http.headers['accept'] = 'text/*'
     c = connection
@@ -964,65 +980,12 @@ class TestNetHttpPersistent < Minitest::Test
     assert_equal 'keep-alive', req['connection']
     assert_equal '30',         req['keep-alive']
 
-    assert_in_delta Time.now, c.last_use
-
-    assert_equal 1, c.requests
-  end
-
-  def test_request_ETIMEDOUT
-    c = basic_connection
-    def (c.http).request(*a) raise Errno::ETIMEDOUT, "timed out" end
-
-    e = assert_raises Net::HTTP::Persistent::Error do
-      @http.request @uri
-    end
-
-    assert_equal 0, c.requests
-    assert_match %r%too many connection resets%, e.message
-  end
-
-  def test_request_bad_response
-    c = basic_connection
-    def (c.http).request(*a) raise Net::HTTPBadResponse end
-
-    e = assert_raises Net::HTTP::Persistent::Error do
-      @http.request @uri
-    end
-
-    assert_equal 0, c.requests
-    assert_match %r%too many bad responses%, e.message
-  end
-
-  def test_request_bad_response_retry
-    c = basic_connection
-    def (c.http).request(*a)
-      raise Net::HTTPBadResponse
-    end
-
-    assert_raises Net::HTTP::Persistent::Error do
-      @http.request @uri
-    end
-
-    assert c.http.finished?
-  end
-
-  def test_request_bad_response_unsafe
-    c = basic_connection
-    def (c.http).request(*a)
-      if instance_variable_defined? :@request then
-        raise 'POST must not be retried'
-      else
-        @request = true
-        raise Net::HTTPBadResponse
-      end
-    end
-
-    e = assert_raises Net::HTTP::Persistent::Error do
-      @http.request @uri, Net::HTTP::Post.new(@uri.path)
+    # There's some roounding issue on jruby preventing this from passing
+    unless RUBY_PLATFORM == "java"
+      assert_in_delta Time.now, c.last_use
     end
 
-    assert_equal 0, c.requests
-    assert_match %r%too many bad responses%, e.message
+    assert_equal 1, c.requests
   end
 
   def test_request_block
@@ -1150,12 +1113,12 @@ class TestNetHttpPersistent < Minitest::Test
     c = basic_connection
     def (c.http).request(*a) raise Errno::EINVAL, "write" end
 
-    e = assert_raises Net::HTTP::Persistent::Error do
+    e = assert_raises Errno::EINVAL do
       @http.request @uri
     end
 
     assert_equal 0, c.requests
-    assert_match %r%too many connection resets%, e.message
+    assert_match %r%Invalid argument - write%, e.message
   end
 
   def test_request_post
@@ -1169,69 +1132,6 @@ class TestNetHttpPersistent < Minitest::Test
     assert_same post, req
   end
 
-  def test_request_reset
-    c = basic_connection
-    def (c.http).request(*a) raise Errno::ECONNRESET end
-
-    e = assert_raises Net::HTTP::Persistent::Error do
-      @http.request @uri
-    end
-
-    assert_equal 0, c.requests
-    assert_match %r%too many connection resets%, e.message
-  end
-
-  def test_request_reset_retry
-    c = basic_connection
-    c.last_use = Time.now
-
-    def (c.http).request(*a)
-      raise Errno::ECONNRESET
-    end
-
-    assert_raises Net::HTTP::Persistent::Error do
-      @http.request @uri
-    end
-
-    refute (c.http).reset?
-    assert (c.http).finished?
-  end
-
-  def test_request_reset_unsafe
-    c = basic_connection
-    def (c.http).request(*a)
-      if instance_variable_defined? :@request then
-        raise 'POST must not be retried'
-      else
-        @request = true
-        raise Errno::ECONNRESET
-      end
-    end
-
-    e = assert_raises Net::HTTP::Persistent::Error do
-      @http.request @uri, Net::HTTP::Post.new(@uri.path)
-    end
-
-    assert_equal 0, c.requests
-    assert_match %r%too many connection resets%, e.message
-  end
-
-  def test_request_ssl_error
-    skip 'OpenSSL is missing' unless HAVE_OPENSSL
-
-    uri = URI.parse 'https://example.com/path'
-    @http.connection_for uri do |c|
-      def (c.http).request(*)
-        raise OpenSSL::SSL::SSLError, "SSL3_WRITE_PENDING:bad write retry"
-      end
-
-      e = assert_raises Net::HTTP::Persistent::Error do
-        @http.request uri
-      end
-      assert_match %r%bad write retry%, e.message
-    end
-  end
-
   def test_request_setup
     @http.override_headers['user-agent'] = 'test ua'
     @http.headers['accept'] = 'text/*'
@@ -1275,30 +1175,6 @@ class TestNetHttpPersistent < Minitest::Test
     assert_equal '/path?a=b',  req.path
   end
 
-  def test_request_failed
-    c = basic_connection
-    c.requests = 1
-    c.last_use = Time.now
-
-    original = nil
-
-    begin
-      raise 'original'
-    rescue => original
-    end
-
-    req = Net::HTTP::Get.new '/'
-
-    e = assert_raises Net::HTTP::Persistent::Error do
-      @http.request_failed original, req, c
-    end
-
-    assert_match "too many connection resets (due to original - RuntimeError)",
-                 e.message
-
-    assert_equal original.backtrace, e.backtrace
-  end
-
   def test_reset
     c = basic_connection
     c.http.start
@@ -1353,23 +1229,6 @@ class TestNetHttpPersistent < Minitest::Test
     assert_match __FILE__, e.backtrace.first
   end
 
-  def test_retry_change_requests_equals
-    get  = Net::HTTP::Get.new('/')
-    post = Net::HTTP::Post.new('/')
-
-    refute @http.retry_change_requests
-
-    refute @http.can_retry?(get)
-    refute @http.can_retry?(post)
-
-    @http.retry_change_requests = true
-
-    assert @http.retry_change_requests
-
-    refute @http.can_retry?(get)
-    assert @http.can_retry?(post)
-  end
-
   def test_shutdown
     c = connection
 
@@ -1585,5 +1444,15 @@ class TestNetHttpPersistent < Minitest::Test
     assert_equal 1, @http.ssl_generation
   end
 
+  def test_connection_pool_after_fork
+    # ConnectionPool 2.4+ calls `checkin(force: true)` after fork
+    @http.pool.checkin(force: true)
+
+    @http.pool.checkout ['example.com', 80, nil, nil, nil, nil]
+    @http.pool.checkin(force: true)
+    @http.pool.reload do |connection|
+      connection.close
+    end
+  end
 end
 

data/test/test_net_http_persistent_timed_stack_multi.rb

@@ -57,7 +57,7 @@ class TestNetHttpPersistentTimedStackMulti < Minitest::Test
       @stack.pop timeout: 0
     end
 
-    assert_equal 'Waited 0 sec', e.message
+    assert_match 'Waited 0 sec', e.message
   end
 
   def test_pop_full

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-http-persistent
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Eric Hodel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -24,65 +24,18 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.11'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.17'
 description: |-
-  Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8.
-  It's thread-safe too!
+  Manages persistent connections using Net::HTTP including a thread pool for
+  connecting to multiple hosts.
 
   Using persistent HTTP connections can dramatically increase the speed of HTTP.
   Creating a new HTTP connection for every request involves an extra TCP
   round-trip and causes TCP congestion avoidance negotiation to start over.
 
   Net::HTTP supports persistent connections with some API methods but does not
-  handle reconnection gracefully.  Net::HTTP::Persistent supports reconnection
-  and retry according to RFC 2616.
+  make setting up a single persistent connection or managing multiple
+  connections easy.  Net::HTTP::Persistent wraps Net::HTTP and allows you to
+  focus on how to make HTTP requests.
 email:
 - drbrain@segment7.net
 executables: []
@@ -94,7 +47,7 @@ extra_rdoc_files:
 files:
 - ".autotest"
 - ".gemtest"
-- ".travis.yml"
+- Gemfile
 - History.txt
 - Manifest.txt
 - README.rdoc
@@ -105,10 +58,11 @@ files:
 - lib/net/http/persistent/timed_stack_multi.rb
 - test/test_net_http_persistent.rb
 - test/test_net_http_persistent_timed_stack_multi.rb
-homepage: http://docs.seattlerb.org/net-http-persistent
+homepage: https://github.com/drbrain/net-http-persistent
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/drbrain/net-http-persistent
 post_install_message: 
 rdoc_options:
 - "--main"
@@ -117,18 +71,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
-summary: Manages persistent connections using Net::HTTP plus a speed fix for Ruby
-  1.8
+summary: Manages persistent connections using Net::HTTP including a thread pool for
+  connecting to multiple hosts
 test_files: []

data/.travis.yml

@@ -1,15 +0,0 @@
----
-after_script:
-- rake travis:after -t
-before_script:
-- gem install hoe-travis --no-rdoc --no-ri
-- rake travis:before -t
-language: ruby
-notifications:
-  email:
-  - drbrain@segment7.net
-rvm:
-- 2.1.10
-- 2.2.5
-- 2.3.1
-script: rake travis