net-http-persistent 1.2.1 → 1.2.2

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.2.2 / 2010-06-22
+
+* Bug Fixes
+  * #request only finishes a connection instead of restarting it.  This helps
+    prevents errors on non-idempotent HTTP requests after errors.
+  * #connection_for handles EHOSTDOWN like #reset
+
 === 1.2.1 / 2010-05-25
 
 * Bug Fixes

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.2.1'
+  VERSION = '1.2.2'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -216,6 +216,8 @@ class Net::HTTP::Persistent
     connection
   rescue Errno::ECONNREFUSED
     raise Error, "connection refused: #{connection.address}:#{connection.port}"
+  rescue Errno::EHOSTDOWN
+    raise Error, "host down: #{connection.address}:#{connection.port}"
   end
 
   ##
@@ -236,6 +238,16 @@ class Net::HTTP::Persistent
     URI.escape str if str
   end
 
+  ##
+  # Finishes the Net::HTTP +connection+
+
+  def finish connection
+    Thread.current[@request_key].delete connection.object_id
+
+    connection.finish
+  rescue IOError
+  end
+
   ##
   # Is +req+ idempotent according to RFC 2616?
 
@@ -287,10 +299,7 @@ class Net::HTTP::Persistent
   def reset connection
     Thread.current[@request_key].delete connection.object_id
 
-    begin
-      connection.finish
-    rescue IOError
-    end
+    finish connection
 
     connection.start
   rescue Errno::ECONNREFUSED

data/test/test_net_http_persistent.rb

@@ -123,6 +123,21 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_same c, conns['example.com:80']
   end
 
+  def test_connection_for_host_down
+    cached = Object.new
+    def cached.address; 'example.com' end
+    def cached.port; 80 end
+    def cached.start; raise Errno::EHOSTDOWN end
+    def cached.started?; false end
+    conns['example.com:80'] = cached
+
+    e = assert_raises Net::HTTP::Persistent::Error do
+      @http.connection_for @uri
+    end
+
+    assert_match %r%host down%, e.message
+  end
+
   def test_connection_for_name
     http = Net::HTTP::Persistent.new 'name'
     uri = URI.parse 'http://example/'
@@ -179,6 +194,35 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_equal '%20', @http.escape(' ')
   end
 
+  def test_finish
+    c = Object.new
+    def c.finish; @finished = true end
+    def c.finished?; @finished end
+    def c.start; @started = true end
+    def c.started?; @started end
+    reqs[c.object_id] = 5
+
+    @http.finish c
+
+    refute c.started?
+    assert c.finished?
+    assert_nil reqs[c.object_id]
+  end
+
+  def test_finish_io_error
+    c = Object.new
+    def c.finish; @finished = true; raise IOError end
+    def c.finished?; @finished end
+    def c.start; @started = true end
+    def c.started?; @started end
+    reqs[c.object_id] = 5
+
+    @http.finish c
+
+    refute c.started?
+    assert c.finished?
+  end
+
   def test_idempotent_eh
     assert @http.idempotent? Net::HTTP::Delete.new '/'
     assert @http.idempotent? Net::HTTP::Get.new '/'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-persistent
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Eric Hodel
@@ -36,7 +36,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2010-05-25 00:00:00 -07:00
+date: 2010-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.7.pre.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Persistent connections using Net::HTTP plus a speed fix for 1.8