net-http-pipeline 1.0 → 1.0.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.0.1 / 2012-04-13
+
+* Bug fixes
+  * IOError is now handled in pipeline_check and pipeline_receive in case you
+    pipeline to a closed socket.  Partial patch by Eric Wong.  Issue #2
+
 === 1.0 / 2011-03-29
 
 * API change

data/Manifest.txt

@@ -4,5 +4,5 @@ Manifest.txt
 README.txt
 Rakefile
 lib/net/http/pipeline.rb
-sample/two_get.rb
+sample/pipeline.rb
 test/test_net_http_pipeline.rb

data/README.txt

@@ -1,6 +1,6 @@
 = net-http-pipeline
 
-* http://seattlerb.rubyforge.org/net-http-pipeline
+* http://docs.seattlerb.org/net-http-pipeline
 * http://github.com/drbrain/net-http-pipeline
 
 == DESCRIPTION:
@@ -12,8 +12,6 @@ The server will respond in-order.
 == FEATURES/PROBLEMS:
 
 * Provides HTTP/1.1 pipelining
-* Does not implement request wrangling per RFC 2616 8.1.2.2
-* Does not handle errors
 
 == SYNOPSIS:
 

data/Rakefile

@@ -5,13 +5,15 @@ require 'hoe'
 
 Hoe.plugin :git
 Hoe.plugin :minitest
-Hoe.plugins.delete :rubyforge
+Hoe.plugin :travis
 
 Hoe.spec 'net-http-pipeline' do
   developer 'Eric Hodel', 'drbrain@segment7.net'
 
   rdoc_locations <<
     'docs.seattlerb.org:/data/www/docs.seattlerb.org/net-http-pipeline/'
+  rdoc_locations <<
+    'rubyforge.org:/var/www/gforge-projects/seattlerb/net-http-pipeline/'
 end
 
 # vim: syntax=Ruby

data/lib/net/http/pipeline.rb

@@ -34,7 +34,7 @@ module Net::HTTP::Pipeline
   ##
   # The version of net-http-pipeline you are using
 
-  VERSION = '1.0'
+  VERSION = '1.0.1'
 
   ##
   # Pipeline error class
@@ -223,7 +223,7 @@ module Net::HTTP::Pipeline
     begin
       res = request req
     rescue Timeout::Error, EOFError, Errno::ECONNABORTED, Errno::ECONNRESET,
-           Errno::EPIPE, Net::HTTPBadResponse => e
+           Errno::EPIPE, Net::HTTPBadResponse, IOError => e
       if retried then
         requests.unshift req
         raise ResponseError.new(e, requests, responses)
@@ -312,7 +312,7 @@ module Net::HTTP::Pipeline
 
     responses
   rescue Timeout::Error, EOFError, Errno::ECONNABORTED, Errno::ECONNRESET,
-         Errno::EPIPE, Net::HTTPBadResponse => e
+         Errno::EPIPE, Net::HTTPBadResponse, IOError => e
     pipeline_finish
 
     raise ResponseError.new(e, in_flight, responses)

data/sample/pipeline.rb

@@ -0,0 +1,21 @@
+require 'net/http/pipeline'
+
+http = Net::HTTP.new 'localhost'
+http.set_debug_output $stderr # so you can see what is happening
+# http.pipelining = true # set this when localhost:80 is an HTTP/1.1 server
+
+http.start do |http|
+  reqs = []
+  reqs << Net::HTTP::Get.new('/?a') # this request will be non-pipelined
+                                    # to check if localhost:80 is HTTP/1.1
+                                    # unless http.pipelining == true
+  reqs << Net::HTTP::Get.new('/?b') # these requests will be pipelined
+  reqs << Net::HTTP::Get.new('/?c')
+
+  http.pipeline reqs do |res|
+    puts res.code
+    puts res.body[0..60].inspect
+    puts
+  end
+end
+

data/test/test_net_http_pipeline.rb

@@ -14,6 +14,17 @@ class TestNetHttpPipeline < MiniTest::Unit::TestCase
     @get2 = Net::HTTP::Get.new '/'
     @get3 = Net::HTTP::Get.new '/'
     @post = Net::HTTP::Post.new '/'
+
+    remove_start
+
+    def start
+    end
+  end
+
+  def remove_start
+    class << self
+      alias_method :old_start, :start if method_defined? :start
+    end
   end
 
   ##
@@ -147,9 +158,6 @@ class TestNetHttpPipeline < MiniTest::Unit::TestCase
     r
   end
 
-  def start
-  end
-
   def started?() @started end
 
   # tests start
@@ -273,6 +281,8 @@ class TestNetHttpPipeline < MiniTest::Unit::TestCase
 
     @socket = @error_socket
 
+    remove_start
+
     def start
       @socket = @good_socket
     end
@@ -337,6 +347,8 @@ class TestNetHttpPipeline < MiniTest::Unit::TestCase
 
     @sockets = [@error_socket2, @good_socket]
 
+    remove_start
+
     def start
       @socket = @sockets.shift
     end
@@ -378,6 +390,8 @@ class TestNetHttpPipeline < MiniTest::Unit::TestCase
 
     @socket = @error_socket
 
+    remove_start
+
     def start
       @socket = @error_socket2
     end
@@ -446,6 +460,8 @@ class TestNetHttpPipeline < MiniTest::Unit::TestCase
     @socket2.read_io.write http_response('Worked 1!')
     @socket2.start
 
+    remove_start
+
     def start
       @socket = @socket2
     end
@@ -481,6 +497,23 @@ Worked 1!
     refute pipelining
   end
 
+  def test_pipeline_check_ioerror
+    @socket = Buffer.new IOError, true
+    @socket.read_io.write http_response('Worked 1!')
+    @socket.start
+
+    requests = [@get1, @get2]
+    responses = []
+
+    assert_raises Net::HTTP::Pipeline::ResponseError do
+      pipeline_check requests, responses
+    end
+
+    assert_equal [@get1, @get2], requests
+    assert_equal 0, responses.length
+    refute pipelining
+  end
+
   def test_pipeline_check_non_persistent
     @socket = Buffer.new
     @socket.read_io.write http_response('Worked 1!', 'Connection: close')
@@ -592,6 +625,29 @@ Worked 1!
     assert_kind_of Errno::ECONNRESET, e.original
   end
 
+  def test_pipeline_receive_ioerror
+    @socket = Buffer.new IOError
+    @socket.read_io.write http_response('Worked 1!')
+    @socket.start
+
+    in_flight = [@get1, @get2]
+    responses = []
+
+    e = assert_raises Net::HTTP::Pipeline::ResponseError do
+      pipeline_receive in_flight, responses
+    end
+
+    @socket.finish
+
+    assert @socket.closed?
+
+    assert_equal [@get2], e.requests
+    assert_equal 1, e.responses.length
+    assert_equal 'Worked 1!', e.responses.first.body
+
+    assert_kind_of IOError, e.original
+  end
+
   def test_pipeline_receive_timeout
     @socket = Buffer.new Timeout::Error
     @socket.read_io.write http_response('Worked 1!')

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-pipeline
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  version: "1.0"
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Eric Hodel
@@ -15,9 +16,9 @@ bindir: bin
 cert_chain: 
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRAwDgYDVQQDDAdkcmJy
+  MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBBMRAwDgYDVQQDDAdkcmJy
   YWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZFgNu
-  ZXQwHhcNMDcxMjIxMDIwNDE0WhcNMDgxMjIwMDIwNDE0WjBBMRAwDgYDVQQDDAdk
+  ZXQwHhcNMTIwMjI4MTc1NDI1WhcNMTMwMjI3MTc1NDI1WjBBMRAwDgYDVQQDDAdk
   cmJyYWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZ
   FgNuZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbbgLrGLGIDE76
   LV/cvxdEzCuYuS3oG9PrSZnuDweySUfdp/so0cDq+j8bqy6OzZSw07gdjwFMSd6J
@@ -25,18 +26,18 @@ cert_chain:
   Gj/okWrQl0NjYOYBpDi+9PPmaH2RmLJu0dB/NylsDnW5j6yN1BEI8MfJRR+HRKZY
   mUtgzBwF1V4KIZQ8EuL6I/nHVu07i6IkrpAgxpXUfdJQJi0oZAqXurAV3yTxkFwd
   g62YrrW26mDe+pZBzR6bpLE+PmXCzz7UxUq3AE0gPHbiMXie3EFE0oxnsU3lIduh
-  sCANiQ8BAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBS5k4Z75VSpdM0AclG2UvzFA/VW5DANBgkqhkiG9w0BAQUFAAOCAQEAHagT4lfX
-  kP/hDaiwGct7XPuVGbrOsKRVD59FF5kETBxEc9UQ1clKWngf8JoVuEoKD774dW19
-  bU0GOVWO+J6FMmT/Cp7nuFJ79egMf/gy4gfUfQMuvfcr6DvZUPIs9P/TlK59iMYF
-  DIOQ3DxdF3rMzztNUCizN4taVscEsjCcgW6WkUJnGdqlu3OHWpQxZBJkBTjPCoc6
-  UW6on70SFPmAy/5Cq0OJNGEWBfgD9q7rrs/X8GGwUWqXb85RXnUVi/P8Up75E0ag
-  14jEc90kN+C7oI/AGCBN0j6JnEtYIEJZibjjDJTSMWlUKKkj30kq7hlUC2CepJ4v
-  x52qPcexcYZR7w==
+  sCANiQ8BAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBS5k4Z75VSpdM0AclG2UvzFA/VW5DAfBgNVHREEGDAWgRRkcmJyYWluQHNlZ21l
+  bnQ3Lm5ldDAfBgNVHRIEGDAWgRRkcmJyYWluQHNlZ21lbnQ3Lm5ldDANBgkqhkiG
+  9w0BAQUFAAOCAQEAPeWzFnrcvC6eVzdlhmjUub2s6qieBkongKRDHQz5MEeQv4LS
+  SARnoHY+uCAVL/1xGAhmpzqQ3fJGWK9eBacW/e8E5GF9xQcV3mE1bA0WNaiDlX5j
+  U2aI+ZGSblqvHUCxKBHR1s7UMHsbz1saOmgdRTyPx0juJs68ocbUTeYBLWu9V4KP
+  zdGAG2JXO2gONg3b4tYDvpBLbry+KOX27iAJulUaH9TiTOULL4ITJVFsK0mYVqmR
+  Q8Tno9S3e4XGGP1ZWfLrTWEJbavFfhGHut2iMRwfC7s/YILAHNATopaJdH9DNpd1
+  U81zGHMUBOvz/VGT6wJwYJ3emS2nfA2NOHFfgA==
   -----END CERTIFICATE-----
 
-date: 2011-03-29 00:00:00 -07:00
-default_executable: 
+date: 2012-04-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -44,32 +45,45 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 21
         segments: 
         - 2
-        - 0
-        - 2
-        version: 2.0.2
+        - 11
+        version: "2.11"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rdoc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 19
         segments: 
-        - 2
-        - 9
-        - 1
-        version: 2.9.1
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 2
+        - 16
+        version: "2.16"
+  type: :development
+  version_requirements: *id003
 description: |-
   An HTTP/1.1 pipelining implementation atop Net::HTTP.  A pipelined connection
   sends multiple requests to the HTTP server without waiting for the responses.
@@ -91,11 +105,10 @@ files:
 - README.txt
 - Rakefile
 - lib/net/http/pipeline.rb
-- sample/two_get.rb
+- sample/pipeline.rb
 - test/test_net_http_pipeline.rb
 - .gemtest
-has_rdoc: true
-homepage: http://seattlerb.rubyforge.org/net-http-pipeline
+homepage: http://docs.seattlerb.org/net-http-pipeline
 licenses: []
 
 post_install_message: 
@@ -125,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: net-http-pipeline
-rubygems_version: 1.6.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: An HTTP/1.1 pipelining implementation atop Net::HTTP

data/sample/two_get.rb

@@ -1,12 +0,0 @@
-require 'net/http/pipeline'
-
-Net::HTTP.start 'localhost' do |http|
-  req1 = Net::HTTP::Get.new '/'
-  req2 = Net::HTTP::Get.new '/'
-
-  http.pipeline req1, req2 do |res|
-    puts res.code
-    puts res.body[0..60].inspect
-    puts
-  end
-end