net-http-persistent 1.6.1 → 1.7

data/History.txt

@@ -1,12 +1,21 @@
+=== 1.7 / 2011-04-17
+
+* Minor Enhancement
+  * Added Net::HTTP::Persistent#pipeline which integrates with
+    net-http-pipeline when it is present.
+* Bug Fix
+  * Perform a case-insensitive check of the URI scheme for HTTPS URIs
+
 === 1.6.1 / 2011-03-08
 
 * Bug Fix
   * Net::HTTP::Persistent#request now handles Errno::EINVAL as a connection
-    reset and will be retried for idempotent requests.
+    reset and will be retried for idempotent requests.  Reported by Aaron
+    Qian.
 
 === 1.6 / 2011-03-01
 
-* Minor Engancement
+* Minor Enhancement
   * Added Net::HTTP::Persistent#socket_options to set multiple socket options
     at socket startup.
 

data/lib/net/http/persistent.rb

@@ -3,6 +3,11 @@ require 'net/http/faster'
 require 'uri'
 require 'cgi' # for escaping
 
+begin
+  require 'net/http/pipeline'
+rescue LoadError
+end
+
 ##
 # Persistent connections for Net::HTTP
 #
@@ -37,7 +42,7 @@ class Net::HTTP::Persistent
   ##
   # The version of Net::HTTP::Persistent use are using
 
-  VERSION = '1.6.1'
+  VERSION = '1.7'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -228,7 +233,7 @@ class Net::HTTP::Persistent
     unless connection = connections[connection_id] then
       connections[connection_id] = Net::HTTP.new(*net_http_args)
       connection = connections[connection_id]
-      ssl connection if uri.scheme == 'https'
+      ssl connection if uri.scheme.downcase == 'https'
     end
 
     unless connection.started? then
@@ -239,7 +244,7 @@ class Net::HTTP::Persistent
       connection.start
 
       socket = connection.instance_variable_get :@socket
-      
+
       if socket then # for fakeweb
         @socket_options.each do |option|
           socket.io.setsockopt(*option)
@@ -307,6 +312,23 @@ class Net::HTTP::Persistent
     (uri =~ /^https?:/) ? uri : "http://#{uri}"
   end
 
+  ##
+  # Pipelines +requests+ to the HTTP server at +uri+ yielding responses if a
+  # block is given.  Returns all responses recieved.
+  #
+  # See
+  # Net::HTTP::Pipeline[http://docs.seattlerb.org/net-http-pipeline/Net/HTTP/Pipeline.html]
+  # for further details.
+  #
+  # Only if <tt>net-http-pipeline</tt> was required before
+  # <tt>net-http-persistent</tt> #pipeline will be present.
+
+  def pipeline uri, requests, &block # :yields: responses
+    connection = connection_for uri
+
+    connection.pipeline requests, &block
+  end
+
   ##
   # Creates a URI for an HTTP proxy server from ENV variables.
   #
@@ -417,7 +439,7 @@ class Net::HTTP::Persistent
 
   ##
   # Shuts down all connections for +thread+.
-  # 
+  #
   # Uses the current thread by default.
   #
   # If you've used Net::HTTP::Persistent across multiple threads you should
@@ -451,7 +473,7 @@ class Net::HTTP::Persistent
   # connections!  Call #shutdown at the appropriate time instead!
   #
   # Use this method only as a last resort!
-  
+
   def shutdown_in_all_threads
     Thread.list.each do |thread|
       shutdown thread

data/test/test_net_http_persistent.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'minitest/autorun'
 require 'net/http/persistent'
 require 'openssl'
@@ -61,21 +62,24 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
       @finished += 1
       @socket = nil
     end
+    def finished?
+      @finished >= 1
+    end
+    def pipeline requests, &block
+      requests.map { |r| r.path }
+    end
+    def reset?
+      @started == @finished + 1
+    end
     def start
       @started += 1
       io = Object.new
       def io.setsockopt(*a) @setsockopts ||= []; @setsockopts << a end
       @socket = Net::BufferedIO.new io
     end
-    def reset?
-      @started == @finished + 1
-    end
     def started?
       @started >= 1
     end
-    def finished?
-      @finished >= 1
-    end
   end
 
   def basic_connection
@@ -285,6 +289,22 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_equal expected, socket.io.instance_variable_get(:@setsockopts)
   end
 
+  def test_connection_for_ssl
+    uri = URI.parse 'https://example.com/path'
+    c = @http.connection_for uri
+
+    assert c.started?
+    assert c.use_ssl?
+  end
+
+  def test_connection_for_ssl_case
+    uri = URI.parse 'HTTPS://example.com/path'
+    c = @http.connection_for uri
+
+    assert c.started?
+    assert c.use_ssl?
+  end
+
   def test_error_message
     c = basic_connection
     reqs[c.object_id] = 5
@@ -347,6 +367,25 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_equal 'https://example', @http.normalize_uri('https://example')
   end
 
+  def test_pipeline
+    skip 'net-http-pipeline not installed' unless defined?(Net::HTTP::Pipeline)
+
+    cached = basic_connection
+    cached.start
+    conns['example.com:80'] = cached
+
+    requests = [
+      Net::HTTP::Get.new((@uri + '1').request_uri),
+      Net::HTTP::Get.new((@uri + '2').request_uri),
+    ]
+
+    responses = @http.pipeline @uri, requests
+
+    assert_equal 2, responses.length
+    assert_equal '/1', responses.first
+    assert_equal '/2', responses.last
+  end
+
   def test_proxy_from_env
     ENV['HTTP_PROXY']      = 'proxy.example'
     ENV['HTTP_PROXY_USER'] = 'johndoe'

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-persistent
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 1
   prerelease: 
   segments: 
   - 1
-  - 6
-  - 1
-  version: 1.6.1
+  - 7
+  version: "1.7"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -36,8 +35,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2011-03-08 00:00:00 -08:00
-default_executable: 
+date: 2011-04-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -63,12 +61,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 35
         segments: 
         - 2
         - 9
-        - 1
-        version: 2.9.1
+        - 4
+        version: 2.9.4
   type: :development
   version_requirements: *id002
 description: |-
@@ -102,7 +100,6 @@ files:
 - lib/net/http/faster.rb
 - lib/net/http/persistent.rb
 - test/test_net_http_persistent.rb
-has_rdoc: true
 homepage: http://seattlerb.rubyforge.org/net-http-persistent
 licenses: []
 
@@ -133,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: net-http-persistent
-rubygems_version: 1.6.1
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Manages persistent connections using Net::HTTP plus a speed fix for 1.8