net-http-persistent 1.0 → 1.0.1

data/History.txt

@@ -1,6 +1,13 @@
-=== 1.0.0 / 2010-05-04
+=== 1.0.1 / 2010-05-05
+
+* Minor Enhancements
+  * Added #debug_output
+  * Now uses Hoe minitest plugin
+* Bug fixes
+  * Tests pass on 1.9
 
-* 1 major enhancement
+=== 1.0.0 / 2010-05-04
 
+* Major Enhancements
   * Birthday!
 

data/Rakefile

@@ -4,6 +4,7 @@ require 'rubygems'
 require 'hoe'
 
 Hoe.plugin :git
+Hoe.plugin :minitest
 
 Hoe.spec 'net-http-persistent' do |p|
   self.rubyforge_name = 'seattlerb'

data/lib/net/http/persistent.rb

@@ -29,7 +29,7 @@ class Net::HTTP::Persistent
   ##
   # The version of Net::HTTP::Persistent use are using
 
-  VERSION = '1.0'
+  VERSION = '1.0.1'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -49,6 +49,14 @@ class Net::HTTP::Persistent
 
   attr_accessor :ca_file
 
+  ##
+  # Sends debug_output to this IO via Net::HTTP#set_debug_output.
+  #
+  # Never use this method in production code, it causes a serious security
+  # hole.
+
+  attr_accessor :debug_output
+
   ##
   # Headers that are added to every request
 
@@ -78,8 +86,9 @@ class Net::HTTP::Persistent
   attr_accessor :verify_mode
 
   def initialize # :nodoc:
-    @keep_alive = 30
-    @headers = {}
+    @debug_output = nil
+    @headers      = {}
+    @keep_alive   = 30
 
     @certificate     = nil
     @ca_file         = nil
@@ -100,9 +109,13 @@ class Net::HTTP::Persistent
     connections[connection_id] ||= Net::HTTP.new uri.host, uri.port
     connection = connections[connection_id]
 
-    ssl connection if uri.scheme == 'https' and not connection.started?
+    unless connection.started? then
+      connection.set_debug_output @debug_output if @debug_output
+
+      ssl connection if uri.scheme == 'https'
 
-    connection.start unless connection.started?
+      connection.start
+    end
 
     connection
   rescue Errno::ECONNREFUSED

data/test/test_net_http_persistent.rb

@@ -1,6 +1,7 @@
 require 'minitest/autorun'
 require 'net/http/persistent'
 require 'openssl'
+require 'stringio'
 
 class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
@@ -59,6 +60,19 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_same cached, c
   end
 
+  def test_connection_for_debug_output
+    io = StringIO.new
+    @http.debug_output = io
+
+    c = @http.connection_for @uri
+
+    assert c.started?
+    assert_equal io, c.instance_variable_get(:@debug_output)
+
+    assert_includes conns.keys, 'example.com:80'
+    assert_same c, conns['example.com:80']
+  end
+
   def test_connection_for_refused
     cached = Object.new
     def cached.address; 'example.com' end
@@ -71,7 +85,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
       @http.connection_for @uri
     end
 
-    assert_match %r%connection refused%, e
+    assert_match %r%connection refused%, e.message
   end
 
   def test_error_message
@@ -122,7 +136,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
       @http.reset c
     end
 
-    assert_match %r%host down%, e
+    assert_match %r%host down%, e.message
   end
 
   def test_reset_refused
@@ -137,7 +151,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
       @http.reset c
     end
 
-    assert_match %r%connection refused%, e
+    assert_match %r%connection refused%, e.message
   end
 
   def test_request
@@ -153,7 +167,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_equal '/path',      req.path
     assert_equal 'keep-alive', req['connection']
     assert_equal '30',         req['keep-alive']
-    assert_equal 'test ua',    req['user-agent']
+    assert_match %r%test ua%,  req['user-agent']
 
     assert_equal 1, reqs[c.object_id]
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-persistent
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  version: "1.0"
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Eric Hodel
@@ -35,7 +36,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2010-05-04 00:00:00 -07:00
+date: 2010-05-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,9 +72,25 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: minitest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
+        version: 1.5.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -85,7 +102,7 @@ dependencies:
         - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: |-
   Persistent connections using Net::HTTP plus a speed fix for 1.8.  It's
   thread-safe too!