net-http-persistent 2.3.1 → 2.3.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.3.2
+
+* Bug fix
+  * Finish connections that were closed by Net::HTTP so they can be restarted.
+
 === 2.3.1 / 2011-10-26
 
 * Bug fix

data/Manifest.txt

@@ -2,7 +2,7 @@
 .gemtest
 History.txt
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 lib/net/http/faster.rb
 lib/net/http/persistent.rb

data/{README.txt → README.rdoc}

@@ -23,6 +23,31 @@ and retry according to RFC 2616.
 * Pure ruby
 * Timeout-less speed boost for Ruby 1.8 (by Aaron Patterson)
 
+== SYNOPSIS
+
+The following example will make two requests to the same server.  The
+connection is kept alive between requests:
+
+    require 'net/http/persistent'
+    
+    uri = URI 'http://example.com/awesome/web/service'
+    
+    http = Net::HTTP::Persistent.new 'my_app_name'
+    
+    # perform a GET
+    response = http.request uri
+    
+    # create a POST
+    post_uri = uri + 'create'
+    post = Net::HTTP::Post.new post_uri.path
+    post.set_form_data 'some' => 'cool data'
+    
+    # perform the POST, the URI is always required
+    response http.request post_uri, post
+
+Please see the documentation for +Net::HTTP::Persistent+ for more information,
+including how to handle SSL connections.
+
 == INSTALL:
 
   gem install net-http-persistent

data/Rakefile

@@ -9,6 +9,9 @@ Hoe.plugin :minitest
 Hoe.spec 'net-http-persistent' do |p|
   developer 'Eric Hodel', 'drbrain@segment7.net'
 
+  self.readme_file      = 'README.rdoc'
+  self.extra_rdoc_files += Dir['*.rdoc']
+
   rdoc_locations <<
     'docs.seattlerb.org:/data/www/docs.seattlerb.org/net-http-persistent/'
 end

data/lib/net/http/persistent.rb

@@ -149,7 +149,7 @@ class Net::HTTP::Persistent
   ##
   # The version of Net::HTTP::Persistent you are using
 
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -386,7 +386,7 @@ class Net::HTTP::Persistent
       net_http_args.concat @proxy_args
     end
 
-    connection = connections[connection_id] 
+    connection = connections[connection_id]
 
     unless connection = connections[connection_id] then
       connections[connection_id] = http_class.new(*net_http_args)
@@ -480,6 +480,38 @@ class Net::HTTP::Persistent
     retry_change_requests or idempotent?(req)
   end
 
+  if RUBY_VERSION > '1.9' then
+    ##
+    # Workaround for missing Net::HTTPHeader#connection_close? on Ruby 1.8
+
+    def connection_close? header
+      header.connection_close?
+    end
+
+    ##
+    # Workaround for missing Net::HTTPHeader#connection_keep_alive? on Ruby 1.8
+
+    def connection_keep_alive? header
+      header.connection_keep_alive?
+    end
+  else
+    ##
+    # Workaround for missing Net::HTTPRequest#connection_close? on Ruby 1.8
+
+    def connection_close? header
+      header['connection'] =~ /close/ or header['proxy-connection'] =~ /close/
+    end
+
+    ##
+    # Workaround for missing Net::HTTPRequest#connection_keep_alive? on Ruby
+    # 1.8
+
+    def connection_keep_alive? header
+      header['connection'] =~ /keep-alive/ or
+        header['proxy-connection'] =~ /keep-alive/
+    end
+  end
+
   ##
   # If a connection hasn't been used since max_age it will be reset and reused
 
@@ -587,6 +619,13 @@ class Net::HTTP::Persistent
     begin
       Thread.current[@request_key][connection_id] += 1
       response = connection.request req, &block
+
+      if connection_close?(req) or
+         (response.http_version <= '1.0' and
+          not connection_keep_alive?(response)) or
+         connection_close?(response) then
+        connection.finish
+      end
     rescue Net::HTTPBadResponse => e
       message = error_message connection
 

data/test/test_net_http_persistent.rb

@@ -99,10 +99,12 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
   def connection
     c = basic_connection
+    touts[c.object_id] = Time.now
 
     def c.request(req)
       @req = req
       r = Net::HTTPResponse.allocate
+      r.instance_variable_set :@header, {}
       def r.http_version() '1.1' end
       def r.read_body() :read_body end
       yield r if block_given?
@@ -575,7 +577,10 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     c = basic_connection
     def c.request(*a)
       if defined? @called then
-        Net::HTTPResponse.allocate
+        r = Net::HTTPResponse.allocate
+        r.instance_variable_set :@header, {}
+        def r.http_version() '1.1' end
+        r
       else
         @called = true
         raise Net::HTTPBadResponse
@@ -629,7 +634,35 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_equal 1, reqs[c.object_id]
   end
 
-  def test_request_connection
+  def test_request_close_1_0
+    c = connection
+
+    def c.request req
+      @req = req
+      r = Net::HTTPResponse.allocate
+      r.instance_variable_set :@header, {}
+      def r.http_version() '1.0' end
+      def r.read_body() :read_body end
+      yield r if block_given?
+      r
+    end
+
+    request = Net::HTTP::Get.new @uri.request_uri
+
+    res = @http.request @uri, request
+    req = c.req
+
+    assert_kind_of Net::HTTPResponse, res
+
+    assert_kind_of Net::HTTP::Get, req
+    assert_equal '/path',      req.path
+    assert_equal 'keep-alive', req['connection']
+    assert_equal '30',         req['keep-alive']
+
+    assert c.finished?
+  end
+
+  def test_request_connection_close_request
     c = connection
 
     request = Net::HTTP::Get.new @uri.request_uri
@@ -644,6 +677,37 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_equal '/path',      req.path
     assert_equal 'close',      req['connection']
     assert_equal nil,          req['keep-alive']
+
+    assert c.finished?
+  end
+
+  def test_request_connection_close_response
+    c = connection
+
+    def c.request req
+      @req = req
+      r = Net::HTTPResponse.allocate
+      r.instance_variable_set :@header, {}
+      r['connection'] = 'close'
+      def r.http_version() '1.1' end
+      def r.read_body() :read_body end
+      yield r if block_given?
+      r
+    end
+
+    request = Net::HTTP::Get.new @uri.request_uri
+
+    res = @http.request @uri, request
+    req = c.req
+
+    assert_kind_of Net::HTTPResponse, res
+
+    assert_kind_of Net::HTTP::Get, req
+    assert_equal '/path',      req.path
+    assert_equal 'keep-alive', req['connection']
+    assert_equal '30',         req['keep-alive']
+
+    assert c.finished?
   end
 
   def test_request_invalid
@@ -664,7 +728,10 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     def c.request(*a)
       if defined? @called then
-        Net::HTTPResponse.allocate
+        r = Net::HTTPResponse.allocate
+        r.instance_variable_set :@header, {}
+        def r.http_version() '1.1' end
+        r
       else
         @called = true
         raise Errno::EINVAL, "write"
@@ -694,7 +761,10 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     touts[c.object_id] = Time.now
     def c.request(*a)
       if defined? @called then
-        Net::HTTPResponse.allocate
+        r = Net::HTTPResponse.allocate
+        r.instance_variable_set :@header, {}
+        def r.http_version() '1.1' end
+        r
       else
         @called = true
         raise Errno::ECONNRESET

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-persistent
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 2
   - 3
-  - 1
-  version: 2.3.1
+  - 2
+  version: 2.3.2
 platform: ruby
 authors: 
 - Eric Hodel
@@ -36,7 +36,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2011-10-27 00:00:00 Z
+date: 2011-11-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -88,13 +88,13 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- README.txt
+- README.rdoc
 files: 
 - .autotest
 - .gemtest
 - History.txt
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - lib/net/http/faster.rb
 - lib/net/http/persistent.rb
@@ -107,7 +107,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement