net-http-persistent 1.2.5 → 1.3

data.tar.gz.sig

@@ -1 +1,2 @@
-Hɇ�h\�CK�R�ʩ�F�}�K�s�?#����˶�)�LlB�+��,(�Ob#N3�iz��7��឴���(C6��yl���.Da�A��ޓ� �QVeR0;ڣs��ku�:�׾�Y��N��㣣وd_���v`�W	������޴K�&*)���.e����Id���s����j�	��7�Њ�D�,D�t�ѫD�$_]�i�/���>cs]E��o���.fH��W���=_�6o������z��$�;Gn�.R
+)�9���ϬT\4V���I�i)n``]�M+(>kN٣$2ע�7����<H�r�|5��������I�Y8��2�-
+[S��Z��͑���Le�J��74K�o/*ͼ��-���%���v���}��Q�1R�u�s�,X#��j�7�����̍������{6�:H�B���$:�0z4��6{ͮ"�����c��{�I�#���J�NyA�:��;^��wU����-H����ܡ�C�g:X��������f�n9\��lC�I

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.3 / 2010-09-08
+
+* Minor Enhancements
+  * HTTP versions are now recorded.  This information is not currently used.
+
+* Bug Fixes
+  * #shutdown no longer fails when an unstarted HTTP connection is shut down.
+
 === 1.2.5 / 2010-07-27
 
 * Bug Fixes

data/lib/net/http/persistent.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'net/http/faster'
 require 'uri'
+require 'cgi' # for escaping
 
 ##
 # Persistent connections for Net::HTTP
@@ -36,7 +37,7 @@ class Net::HTTP::Persistent
   ##
   # The version of Net::HTTP::Persistent use are using
 
-  VERSION = '1.2.5'
+  VERSION = '1.3'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -74,6 +75,12 @@ class Net::HTTP::Persistent
 
   attr_reader :headers
 
+  ##
+  # Maps host:port to an HTTP version.  This allows us to enable version
+  # specific features.
+
+  attr_reader :http_versions
+
   ##
   # The value sent in the Keep-Alive header.  Defaults to 30.  Not needed for
   # HTTP/1.1 servers.
@@ -167,11 +174,12 @@ class Net::HTTP::Persistent
       @proxy_connection_id = [nil, *@proxy_args].join ':'
     end
 
-    @debug_output = nil
-    @headers      = {}
-    @keep_alive   = 30
-    @open_timeout = nil
-    @read_timeout = nil
+    @debug_output  = nil
+    @headers       = {}
+    @http_versions = {}
+    @keep_alive    = 30
+    @open_timeout  = nil
+    @read_timeout  = nil
 
     key = ['net_http_persistent', name, 'connections'].compact.join '_'
     @connection_key = key.intern
@@ -235,7 +243,7 @@ class Net::HTTP::Persistent
   # URI::escape wrapper
 
   def escape str
-    URI.escape str if str
+    CGI.escape str if str
   end
 
   ##
@@ -248,6 +256,13 @@ class Net::HTTP::Persistent
   rescue IOError
   end
 
+  ##
+  # Returns the HTTP protocol version for +uri+
+
+  def http_version uri
+    @http_versions["#{uri.host}:#{uri.port}"]
+  end
+
   ##
   # Is +req+ idempotent according to RFC 2616?
 
@@ -338,7 +353,7 @@ class Net::HTTP::Persistent
     connection_id = connection.object_id
 
     begin
-      count = Thread.current[@request_key][connection_id] += 1
+      Thread.current[@request_key][connection_id] += 1
       response = connection.request req, &block
 
     rescue Net::HTTPBadResponse => e
@@ -365,6 +380,8 @@ class Net::HTTP::Persistent
       retry
     end
 
+    @http_versions["#{uri.host}:#{uri.port}"] ||= response.http_version
+
     response
   end
 
@@ -378,7 +395,10 @@ class Net::HTTP::Persistent
     connections = Thread.current[@connection_key]
 
     connections.each do |_, connection|
-      connection.finish
+      begin
+        connection.finish
+      rescue IOError
+      end
     end if connections
 
     Thread.current[@connection_key] = nil

data/test/test_net_http_persistent.rb

@@ -4,6 +4,8 @@ require 'openssl'
 require 'stringio'
 
 class Net::HTTP
+  alias orig_connect connect
+
   def connect
   end
 end
@@ -28,29 +30,40 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     end
   end
 
-  def connection
+  def basic_connection
     c = Object.new
-    # Net::HTTP
+    c.instance_variable_set :@finished, false
+    c.instance_variable_set :@reset,    false
+    c.instance_variable_set :@started,  false
+
     def c.finish; @finished = true 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
 
-    # util
     def c.req() @req; end
     def c.reset?; @reset end
     def c.started?; true end
     def c.finished?; @finished end
+
     conns["#{@uri.host}:#{@uri.port}"] = c
     c
   end
 
+  def connection
+    c = basic_connection
+
+    def c.request(req)
+      @req = req
+      r = Net::HTTPResponse.allocate
+      def r.http_version() '1.1' end
+      def r.read_body() :read_body end
+      yield r if block_given?
+      r
+    end
+
+    c
+  end
+
   def conns
     Thread.current[@http.connection_key] ||= {}
   end
@@ -191,11 +204,12 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   def test_escape
     assert_nil @http.escape nil
 
-    assert_equal '%20', @http.escape(' ')
+    assert_equal '+%3F', @http.escape(' ?')
   end
 
   def test_finish
     c = Object.new
+    c.instance_variable_set :@started, false
     def c.finish; @finished = true end
     def c.finished?; @finished end
     def c.start; @started = true end
@@ -211,6 +225,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
   def test_finish_io_error
     c = Object.new
+    c.instance_variable_set :@started, false
     def c.finish; @finished = true; raise IOError end
     def c.finished?; @finished end
     def c.start; @started = true end
@@ -223,6 +238,16 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert c.finished?
   end
 
+  def test_http_version
+    assert_nil @http.http_version @uri
+
+    connection
+
+    @http.request @uri
+
+    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 '/'
@@ -346,7 +371,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     res = @http.request @uri
     req = c.req
 
-    assert_equal :response, res
+    assert_kind_of Net::HTTPResponse, res
 
     assert_kind_of Net::HTTP::Get, req
     assert_equal '/path',      req.path
@@ -358,7 +383,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_request_bad_response
-    c = connection
+    c = basic_connection
     def c.request(*a) raise Net::HTTPBadResponse end
 
     e = assert_raises Net::HTTP::Persistent::Error do
@@ -370,23 +395,23 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_request_bad_response_retry
-    c = connection
+    c = basic_connection
     def c.request(*a)
-      def self.request(*a)
-        :response
+      if defined? @called then
+        Net::HTTPResponse.allocate
+      else
+        @called = true
+        raise Net::HTTPBadResponse
       end
-
-      raise Net::HTTPBadResponse
     end
 
-    res = @http.request @uri
+    @http.request @uri
 
-    assert_equal :response, res
     assert c.finished?
   end
 
   def test_request_bad_response_unsafe
-    c = connection
+    c = basic_connection
     def c.request(*a)
       if instance_variable_defined? :@request then
         raise 'POST must not be retried'
@@ -415,7 +440,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     req = c.req
 
-    assert_equal :response, res
+    assert_kind_of Net::HTTPResponse, res
     refute_nil body
 
     assert_kind_of Net::HTTP::Get, req
@@ -428,7 +453,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_request_reset
-    c = connection
+    c = basic_connection
     def c.request(*a) raise Errno::ECONNRESET end
 
     e = assert_raises Net::HTTP::Persistent::Error do
@@ -440,23 +465,23 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_request_reset_retry
-    c = connection
+    c = basic_connection
     def c.request(*a)
-      def self.request(*a)
-        :response
+      if defined? @called then
+        Net::HTTPResponse.allocate
+      else
+        @called = true
+        raise Errno::ECONNRESET
       end
-
-      raise Errno::ECONNRESET
     end
 
-    res = @http.request @uri
+    @http.request @uri
 
-    assert_equal :response, res
     assert c.finished?
   end
 
   def test_request_reset_unsafe
-    c = connection
+    c = basic_connection
     def c.request(*a)
       if instance_variable_defined? :@request then
         raise 'POST must not be retried'
@@ -479,11 +504,9 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     post = Net::HTTP::Post.new @uri.path
 
-    res = @http.request @uri, post
+    @http.request @uri, post
     req = c.req
 
-    assert_equal :response, res
-
     assert_same post, req
   end
 
@@ -505,6 +528,18 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     refute_same rs, reqs
   end
 
+  def test_shutdown_not_started
+    c = Object.new
+    def c.finish() raise IOError end
+
+    conns["#{@uri.host}:#{@uri.port}"] = c
+
+    @http.shutdown
+
+    assert_nil Thread.current[@http.connection_key]
+    assert_nil Thread.current[@http.request_key]
+  end
+
   def test_shutdown_no_connections
     @http.shutdown
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-persistent
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 9
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 5
-  version: 1.2.5
+  - 3
+  version: "1.3"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -36,7 +35,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2010-07-27 00:00:00 -07:00
+date: 2010-09-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,34 +46,18 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
         - 2
         - 0
-        - 3
-        version: 2.0.3
+        - 4
+        version: 2.0.4
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
-  type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -86,23 +69,23 @@ dependencies:
         - 0
         version: 1.5.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 21
         segments: 
         - 2
-        - 5
-        - 0
-        version: 2.5.0
+        - 6
+        - 1
+        version: 2.6.1
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 description: |-
   Persistent connections using Net::HTTP plus a speed fix for 1.8.  It's
   thread-safe too!