net-http-persistent 1.1 → 1.2

data/History.txt

@@ -1,4 +1,11 @@
-=== 1.1
+=== 1.2 / 2010-05-20
+
+* Minor Enhancements
+  * Net::HTTP#read_timeout is now supported
+  * Net::HTTP#open_timeout is now supported
+  * Net::HTTP::Persistent#request now supports a block like Net::HTTP#request
+
+=== 1.1 / 2010-05-18
 
 * Minor Enhancements
   * Proxy support, see Net::HTTP::Persistent::new,

data/lib/net/http/persistent.rb

@@ -36,7 +36,7 @@ class Net::HTTP::Persistent
   ##
   # The version of Net::HTTP::Persistent use are using
 
-  VERSION = '1.1'
+  VERSION = '1.2'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -91,6 +91,11 @@ class Net::HTTP::Persistent
 
   attr_reader :name
 
+  ##
+  # Seconds to wait until a connection is opened.  See Net::HTTP#open_timeout
+
+  attr_accessor :open_timeout
+
   ##
   # This client's SSL private key
 
@@ -101,6 +106,11 @@ class Net::HTTP::Persistent
 
   attr_reader :proxy_uri
 
+  ##
+  # Seconds to wait until reading one block.  See Net::HTTP#read_timeout
+
+  attr_accessor :read_timeout
+
   ##
   # Where this instance's request counts live in the thread local variables
 
@@ -160,6 +170,8 @@ class Net::HTTP::Persistent
     @debug_output = nil
     @headers      = {}
     @keep_alive   = 30
+    @open_timeout = nil
+    @read_timeout = nil
 
     key = ['net_http_persistent', name, 'connections'].compact.join '_'
     @connection_key = key.intern
@@ -193,6 +205,8 @@ class Net::HTTP::Persistent
 
     unless connection.started? then
       connection.set_debug_output @debug_output if @debug_output
+      connection.open_timeout = @open_timeout if @open_timeout
+      connection.read_timeout = @read_timeout if @read_timeout
 
       ssl connection if uri.scheme == 'https'
 
@@ -289,12 +303,15 @@ class Net::HTTP::Persistent
   # Makes a request on +uri+.  If +req+ is nil a Net::HTTP::Get is performed
   # against +uri+.
   #
+  # If a block is passed #request behaves like Net::HTTP#request (the body of
+  # the response will not have been read).
+  #
   # +req+ must be a Net::HTTPRequest subclass (see Net::HTTP for a list).
   #
   # If there is an error and the request is idempontent according to RFC 2616
   # it will be retried automatically.
 
-  def request uri, req = nil
+  def request uri, req = nil, &block
     Thread.current[@request_key] ||= Hash.new 0
     retried      = false
     bad_response = false
@@ -313,7 +330,7 @@ class Net::HTTP::Persistent
 
     begin
       count = Thread.current[@request_key][connection_id] += 1
-      response = connection.request req
+      response = connection.request req, &block
 
     rescue Net::HTTPBadResponse => e
       message = error_message connection

data/test/test_net_http_persistent.rb

@@ -32,7 +32,13 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     c = Object.new
     # Net::HTTP
     def c.finish; @finished = true end
-    def c.request(req) @req = req; :response end
+    def c.request(req)
+      @req = req
+      r = Object.new
+      def r.read_body() :read_body end
+      yield r if block_given?
+      :response
+    end
     def c.reset; @reset = true end
     def c.start; end
 
@@ -78,11 +84,16 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_connection_for
+    @http.open_timeout = 123
+    @http.read_timeout = 321
     c = @http.connection_for @uri
 
     assert c.started?
     refute c.proxy?
 
+    assert_equal 123, c.open_timeout
+    assert_equal 321, c.read_timeout
+
     assert_includes conns.keys, 'example.com:80'
     assert_same c, conns['example.com:80']
   end
@@ -333,6 +344,29 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_match %r%too many bad responses%, e.message
   end
 
+  def test_request_block
+    @http.headers['user-agent'] = 'test ua'
+    c = connection
+    body = nil
+
+    res = @http.request @uri do |r|
+      body = r.read_body
+    end
+
+    req = c.req
+
+    assert_equal :response, res
+    refute_nil body
+
+    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_match %r%test ua%,  req['user-agent']
+
+    assert_equal 1, reqs[c.object_id]
+  end
+
   def test_request_reset
     c = connection
     def c.request(*a) raise Errno::ECONNRESET end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-persistent
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 1
-  - 1
-  version: "1.1"
+  - 2
+  version: "1.2"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -35,7 +35,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2010-05-18 00:00:00 -07:00
+date: 2010-05-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency