net-http-persistent 2.9.4 → 4.0.2

data/test/test_net_http_persistent_timed_stack_multi.rb

@@ -0,0 +1,151 @@
+require 'minitest/autorun'
+require 'net/http/persistent'
+
+class TestNetHttpPersistentTimedStackMulti < Minitest::Test
+
+  class Connection
+    attr_reader :host
+
+    def initialize(host)
+      @host = host
+    end
+  end
+
+  def setup
+    @stack = Net::HTTP::Persistent::TimedStackMulti.new { Object.new }
+  end
+
+  def test_empty_eh
+    stack = Net::HTTP::Persistent::TimedStackMulti.new(1) { Object.new }
+
+    refute_empty stack
+
+    popped = stack.pop
+
+    assert_empty stack
+
+    stack.push connection_args: popped
+
+    refute_empty stack
+  end
+
+  def test_length
+    stack = Net::HTTP::Persistent::TimedStackMulti.new(1) { Object.new }
+
+    assert_equal 1, stack.length
+
+    popped = stack.pop
+
+    assert_equal 0, stack.length
+
+    stack.push connection_args: popped
+
+    assert_equal 1, stack.length
+  end
+
+  def test_pop
+    object = Object.new
+    @stack.push object
+
+    popped = @stack.pop
+
+    assert_same object, popped
+  end
+
+  def test_pop_empty
+    e = assert_raises Timeout::Error do
+      @stack.pop timeout: 0
+    end
+
+    assert_match 'Waited 0 sec', e.message
+  end
+
+  def test_pop_full
+    stack = Net::HTTP::Persistent::TimedStackMulti.new(1) { Object.new }
+
+    popped = stack.pop
+
+    refute_nil popped
+    assert_empty stack
+  end
+
+  def test_pop_wait
+    thread = Thread.start do
+      @stack.pop
+    end
+
+    Thread.pass while thread.status == 'run'
+
+    object = Object.new
+
+    @stack.push object
+
+    assert_same object, thread.value
+  end
+
+  def test_pop_shutdown
+    @stack.shutdown { }
+
+    assert_raises ConnectionPool::PoolShuttingDownError do
+      @stack.pop
+    end
+  end
+
+  def test_push
+    stack = Net::HTTP::Persistent::TimedStackMulti.new(1) { Object.new }
+
+    conn = stack.pop
+
+    stack.push connection_args: conn
+
+    refute_empty stack
+  end
+
+  def test_push_shutdown
+    called = []
+
+    @stack.shutdown do |object|
+      called << object
+    end
+
+    @stack.push connection_args: Object.new
+
+    refute_empty called
+    assert_empty @stack
+  end
+
+  def test_shutdown
+    @stack.push connection_args: Object.new
+
+    called = []
+
+    @stack.shutdown do |object|
+      called << object
+    end
+
+    refute_empty called
+    assert_empty @stack
+  end
+
+  def test_pop_recycle
+    stack = Net::HTTP::Persistent::TimedStackMulti.new(2) { |host| Connection.new(host) }
+
+    a_conn = stack.pop connection_args: 'a.example'
+    stack.push a_conn, connection_args: 'a.example'
+
+    b_conn = stack.pop connection_args: 'b.example'
+    stack.push b_conn, connection_args: 'b.example'
+
+    c_conn = stack.pop connection_args: 'c.example'
+
+    assert_equal 'c.example', c_conn.host
+
+    stack.push c_conn, connection_args: 'c.example'
+
+    recreated = stack.pop connection_args: 'a.example'
+
+    refute_same a_conn, recreated
+  end
+
+end
+

metadata

@@ -1,90 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: net-http-persistent
 version: !ruby/object:Gem::Version
-  version: 2.9.4
+  version: 4.0.2
 platform: ruby
 authors:
 - Eric Hodel
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBBMRAwDgYDVQQDDAdkcmJy
-  YWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZFgNu
-  ZXQwHhcNMTMwMjI4MDUyMjA4WhcNMTQwMjI4MDUyMjA4WjBBMRAwDgYDVQQDDAdk
-  cmJyYWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZ
-  FgNuZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbbgLrGLGIDE76
-  LV/cvxdEzCuYuS3oG9PrSZnuDweySUfdp/so0cDq+j8bqy6OzZSw07gdjwFMSd6J
-  U5ddZCVywn5nnAQ+Ui7jMW54CYt5/H6f2US6U0hQOjJR6cpfiymgxGdfyTiVcvTm
-  Gj/okWrQl0NjYOYBpDi+9PPmaH2RmLJu0dB/NylsDnW5j6yN1BEI8MfJRR+HRKZY
-  mUtgzBwF1V4KIZQ8EuL6I/nHVu07i6IkrpAgxpXUfdJQJi0oZAqXurAV3yTxkFwd
-  g62YrrW26mDe+pZBzR6bpLE+PmXCzz7UxUq3AE0gPHbiMXie3EFE0oxnsU3lIduh
-  sCANiQ8BAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBS5k4Z75VSpdM0AclG2UvzFA/VW5DAfBgNVHREEGDAWgRRkcmJyYWluQHNlZ21l
-  bnQ3Lm5ldDAfBgNVHRIEGDAWgRRkcmJyYWluQHNlZ21lbnQ3Lm5ldDANBgkqhkiG
-  9w0BAQUFAAOCAQEAOflo4Md5aJF//EetzXIGZ2EI5PzKWX/mMpp7cxFyDcVPtTv0
-  js/6zWrWSbd60W9Kn4ch3nYiATFKhisgeYotDDz2/pb/x1ivJn4vEvs9kYKVvbF8
-  V7MV/O5HDW8Q0pA1SljI6GzcOgejtUMxZCyyyDdbUpyAMdt9UpqTZkZ5z1sicgQk
-  5o2XJ+OhceOIUVqVh1r6DNY5tLVaGJabtBmJAYFVznDcHiSFybGKBa5n25Egql1t
-  KDyY1VIazVgoC8XvR4h/95/iScPiuglzA+DBG1hip1xScAtw05BrXyUNrc9CEMYU
-  wgF94UVoHRp6ywo8I7NP3HcwFQDFNEZPNGXsng==
-  -----END CERTIFICATE-----
-date: 2014-02-10 00:00:00.000000000 Z
+cert_chain: []
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
-  type: :development
+        version: '2.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '2.2'
 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: []
@@ -96,19 +47,22 @@ extra_rdoc_files:
 files:
 - ".autotest"
 - ".gemtest"
+- Gemfile
 - History.txt
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- lib/net/http/faster.rb
 - lib/net/http/persistent.rb
-- lib/net/http/persistent/ssl_reuse.rb
+- lib/net/http/persistent/connection.rb
+- lib/net/http/persistent/pool.rb
+- lib/net/http/persistent/timed_stack_multi.rb
 - test/test_net_http_persistent.rb
-- test/test_net_http_persistent_ssl_reuse.rb
-homepage: http://docs.seattlerb.org/net-http-persistent
+- test/test_net_http_persistent_timed_stack_multi.rb
+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"
@@ -119,19 +73,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: net-http-persistent
-rubygems_version: 2.2.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
-test_files:
-- test/test_net_http_persistent.rb
-- test/test_net_http_persistent_ssl_reuse.rb
+summary: Manages persistent connections using Net::HTTP including a thread pool for
+  connecting to multiple hosts
+test_files: []

checksums.yaml.gz.sig

@@ -1,2 +0,0 @@
-.Nj�^K�^;Y�Q�-_�Q�a�Jm�cݭ���|���t�W� P��A{��X��'5�]1��]Ǵt���H�ҫu�Y���
-?�

data/lib/net/http/faster.rb

@@ -1,27 +0,0 @@
-require 'net/protocol'
-
-##
-# Aaron Patterson's monkeypatch (accepted into 1.9.1) to fix Net::HTTP's speed
-# problems.
-#
-# http://gist.github.com/251244
-
-class Net::BufferedIO #:nodoc:
-  alias :old_rbuf_fill :rbuf_fill
-
-  def rbuf_fill
-    if @io.respond_to? :read_nonblock then
-      begin
-        @rbuf << @io.read_nonblock(65536)
-      rescue Errno::EWOULDBLOCK, Errno::EAGAIN => e
-        retry if IO.select [@io], nil, nil, @read_timeout
-        raise Timeout::Error, e.message
-      end
-    else # SSL sockets do not have read_nonblock
-      timeout @read_timeout do
-        @rbuf << @io.sysread(65536)
-      end
-    end
-  end
-end if RUBY_VERSION < '1.9'
-

data/lib/net/http/persistent/ssl_reuse.rb

@@ -1,129 +0,0 @@
-##
-# This Net::HTTP subclass adds SSL session reuse and Server Name Indication
-# (SNI) RFC 3546.
-#
-# DO NOT DEPEND UPON THIS CLASS
-#
-# This class is an implementation detail and is subject to change or removal
-# at any time.
-
-class Net::HTTP::Persistent::SSLReuse < Net::HTTP
-
-  @is_proxy_class = false
-  @proxy_addr = nil
-  @proxy_port = nil
-  @proxy_user = nil
-  @proxy_pass = nil
-
-  def initialize address, port = nil # :nodoc:
-    super
-
-    @ssl_session = nil
-  end
-
-  ##
-  # From ruby trunk r33086 including http://redmine.ruby-lang.org/issues/5341
-
-  def connect # :nodoc:
-    D "opening connection to #{conn_address()}..."
-    s = timeout(@open_timeout) { TCPSocket.open(conn_address(), conn_port()) }
-    D "opened"
-    if use_ssl?
-      ssl_parameters = Hash.new
-      iv_list = instance_variables
-      SSL_ATTRIBUTES.each do |name|
-        ivname = "@#{name}".intern
-        if iv_list.include?(ivname) and
-           value = instance_variable_get(ivname)
-          ssl_parameters[name] = value
-        end
-      end
-      unless @ssl_context then
-        @ssl_context = OpenSSL::SSL::SSLContext.new
-        @ssl_context.set_params(ssl_parameters)
-      end
-      s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
-      s.sync_close = true
-    end
-    @socket = Net::BufferedIO.new(s)
-    @socket.read_timeout = @read_timeout
-    @socket.continue_timeout = @continue_timeout if
-      @socket.respond_to? :continue_timeout
-    @socket.debug_output = @debug_output
-    if use_ssl?
-      begin
-        if proxy?
-          @socket.writeline sprintf('CONNECT %s:%s HTTP/%s',
-                                    @address, @port, HTTPVersion)
-          @socket.writeline "Host: #{@address}:#{@port}"
-          if proxy_user
-            credential = ["#{proxy_user}:#{proxy_pass}"].pack('m')
-            credential.delete!("\r\n")
-            @socket.writeline "Proxy-Authorization: Basic #{credential}"
-          end
-          @socket.writeline ''
-          Net::HTTPResponse.read_new(@socket).value
-        end
-        s.session = @ssl_session if @ssl_session
-        # Server Name Indication (SNI) RFC 3546
-        s.hostname = @address if s.respond_to? :hostname=
-        timeout(@open_timeout) { s.connect }
-        if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
-          s.post_connection_check(@address)
-        end
-        @ssl_session = s.session
-      rescue => exception
-        D "Conn close because of connect error #{exception}"
-        @socket.close if @socket and not @socket.closed?
-        raise exception
-      end
-    end
-    on_connect
-  end if RUBY_VERSION > '1.9'
-
-  ##
-  # From ruby_1_8_7 branch r29865 including a modified
-  # http://redmine.ruby-lang.org/issues/5341
-
-  def connect # :nodoc:
-    D "opening connection to #{conn_address()}..."
-    s = timeout(@open_timeout) { TCPSocket.open(conn_address(), conn_port()) }
-    D "opened"
-    if use_ssl?
-      unless @ssl_context.verify_mode
-        warn "warning: peer certificate won't be verified in this SSL session"
-        @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-      s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
-      s.sync_close = true
-    end
-    @socket = Net::BufferedIO.new(s)
-    @socket.read_timeout = @read_timeout
-    @socket.debug_output = @debug_output
-    if use_ssl?
-      if proxy?
-        @socket.writeline sprintf('CONNECT %s:%s HTTP/%s',
-                                  @address, @port, HTTPVersion)
-        @socket.writeline "Host: #{@address}:#{@port}"
-        if proxy_user
-          credential = ["#{proxy_user}:#{proxy_pass}"].pack('m')
-          credential.delete!("\r\n")
-          @socket.writeline "Proxy-Authorization: Basic #{credential}"
-        end
-        @socket.writeline ''
-        Net::HTTPResponse.read_new(@socket).value
-      end
-      s.session = @ssl_session if @ssl_session
-      s.connect
-      if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
-        s.post_connection_check(@address)
-      end
-      @ssl_session = s.session
-    end
-    on_connect
-  end if RUBY_VERSION < '1.9'
-
-  private :connect
-
-end
-

data/test/test_net_http_persistent_ssl_reuse.rb

@@ -1,112 +0,0 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'net/http/persistent'
-have_ssl =
-  begin
-    require 'openssl'
-    require 'webrick'
-    require 'webrick/ssl'
-    true
-  rescue LoadError
-    false
-  end
-
-##
-# This test is based on (and contains verbatim code from) the Net::HTTP tests
-# in ruby
-
-class TestNetHttpPersistentSSLReuse < Minitest::Test
-
-  class NullWriter
-    def <<(s) end
-    def puts(*args) end
-    def print(*args) end
-    def printf(*args) end
-  end
-
-  def setup
-    @name = OpenSSL::X509::Name.parse 'CN=localhost/DC=localdomain'
-
-    @key = OpenSSL::PKey::RSA.new 1024
-
-    @cert = OpenSSL::X509::Certificate.new
-    @cert.version = 2
-    @cert.serial = 0
-    @cert.not_before = Time.now
-    @cert.not_after = Time.now + 300
-    @cert.public_key = @key.public_key
-    @cert.subject = @name
-    @cert.issuer = @name
-
-    @cert.sign @key, OpenSSL::Digest::SHA1.new
-
-    @host = 'localhost'
-    @port = 10082
-
-    config = {
-      :BindAddress                => @host,
-      :Port                       => @port,
-      :Logger                     => WEBrick::Log.new(NullWriter.new),
-      :AccessLog                  => [],
-      :ShutDownSocketWithoutClose => true,
-      :ServerType                 => Thread,
-      :SSLEnable                  => true,
-      :SSLCertificate             => @cert,
-      :SSLPrivateKey              => @key,
-      :SSLStartImmediately        => true,
-    }
-
-    @server = WEBrick::HTTPServer.new config
-
-    @server.mount_proc '/' do |req, res|
-      res.body = "ok"
-    end
-
-    @server.start
-
-    begin
-      TCPSocket.open(@host, @port).close
-    rescue Errno::ECONNREFUSED
-      sleep 0.2
-      n_try_max -= 1
-      raise 'cannot spawn server; give up' if n_try_max < 0
-      retry
-    end
-  end
-
-  def teardown
-    if @server then
-      @server.shutdown
-      sleep 0.01 until @server.status == :Stop
-    end
-  end
-
-  def test_ssl_connection_reuse
-    store = OpenSSL::X509::Store.new
-    store.add_cert @cert
-
-    @http = Net::HTTP::Persistent::SSLReuse.new @host, @port
-    @http.cert_store = store
-    @http.ssl_version = :SSLv3 if @http.respond_to? :ssl_version=
-    @http.use_ssl = true
-    @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-
-    @http.start
-    @http.get '/'
-    @http.finish
-
-    @http.start
-    @http.get '/'
-    @http.finish
-
-    @http.start
-    @http.get '/'
-
-    socket = @http.instance_variable_get :@socket
-    ssl_socket = socket.io
-
-    assert ssl_socket.session_reused?
-  end
-
-end if have_ssl
-