http_spew 0.2.0 → 0.3.0

data/ChangeLog

@@ -1,5 +1,35 @@
 ChangeLog from http://bogomips.org/http_spew.git
 
+   commit b53bbc7852d9788099e514b54a0b90d82a3338bb
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Wed May 11 23:25:49 2011 +0000
+   
+       http_spew 0.3.0 - ContentMD5 improvements
+       
+       There are minor changes to HTTP_Spew::ContentMD5:
+       * allow optional input param to initialize
+       * update bytes_digested for incomplete xfers
+       
+       Still not API-stable, but maybe it's closer...
+   
+   commit 9d42089445aa2b61a50bf9a57a6f839569f4a1d4
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Wed May 11 21:05:04 2011 +0000
+   
+       content_md5: update bytes_digested for incomplete xfers
+       
+       Being able to track progress is good.
+   
+   commit 1a71f9204211061460e05e92c5523744b9b18afb
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Wed May 11 20:08:20 2011 +0000
+   
+       content_md5: optional input param to initialize
+       
+       This allows users to specify an alternate input without
+       modifying the Rack +env+.  This is potentially useful for
+       chaining other filters.
+   
    commit 84eaf4df3da4ef55e21649b971f2f246ab556b52
    Author: Eric Wong <normalperson@yhbt.net>
    Date:   Tue May 10 14:40:53 2011 -0700

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 0.2.0
+GIT_VERSION = 0.3.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.2.0.GIT
+DEF_VER=v0.3.0.GIT
 
 LF='
 '

data/LATEST

@@ -1,7 +1,8 @@
-=== http_spew 0.2.0 - bugfixes and improvements / 2011-05-10 22:19 UTC
+=== http_spew 0.3.0 - ContentMD5 improvements / 2011-05-11 23:29 UTC
 
-  InputSpray may now be layered on top of ContentMD5 successfully.
-  Improved multi-threading abilities and tests.
+  There are minor changes to HTTP_Spew::ContentMD5:
+  * allow optional input param to initialize
+  * update bytes_digested for incomplete xfers
 
-  Do not consider the API remotely stable, yet.
+  Still not API-stable, but maybe it's closer...
 

data/NEWS

@@ -1,3 +1,11 @@
+=== http_spew 0.3.0 - ContentMD5 improvements / 2011-05-11 23:29 UTC
+
+  There are minor changes to HTTP_Spew::ContentMD5:
+  * allow optional input param to initialize
+  * update bytes_digested for incomplete xfers
+
+  Still not API-stable, but maybe it's closer...
+
 === http_spew 0.2.0 - bugfixes and improvements / 2011-05-10 22:19 UTC
 
   InputSpray may now be layered on top of ContentMD5 successfully.

data/lib/http_spew/content_md5.rb

@@ -9,7 +9,7 @@ class HTTP_Spew::ContentMD5
 
   CRLF = "\r\n" # :nodoc:
 
-  def initialize(env)
+  def initialize(env, input = env["rack.input"])
     if trailer = env["HTTP_TRAILER"]
       unless trailer.split(/\s*,\s*/).grep(/\AContent-MD5\z/i)[0]
         trailer << (trailer.empty? ? "Content-MD5" : ",Content-MD5")
@@ -21,7 +21,7 @@ class HTTP_Spew::ContentMD5
     @to_io, wr = HTTP_Spew::ChunkyPipe.new
     expect_md5 = env.delete("HTTP_CONTENT_MD5")
     expect_len = env.delete("CONTENT_LENGTH")
-    start_write_driver(env["rack.input"], wr, expect_md5, expect_len)
+    start_write_driver(input, wr, expect_md5, expect_len)
   end
 
   # compatible with IO#read and Rack::InputWrapper#read
@@ -34,18 +34,19 @@ class HTTP_Spew::ContentMD5
     Thread.new do
       begin
         digest = Digest::MD5.new
-        buf = ""
-        bytes = 0
-        while input.read(0x4000, buf)
-          n = buf.size
-          bytes += n
-          wr.write("#{n.to_s(16)}\r\n")
-          digest.update(buf)
-          wr.write(buf << CRLF)
+        @bytes_digested = 0
+        if buf = input.read(0x4000)
+          begin
+            n = buf.size
+            @bytes_digested += n
+            wr.write("#{n.to_s(16)}\r\n")
+            digest.update(buf)
+            wr.write(buf << CRLF)
+          end while input.read(0x4000, buf)
         end
-        if expect_len && expect_len.to_i != bytes
+        if expect_len && expect_len.to_i != @bytes_digested
           raise HTTP_Spew::LengthError,
-               "expect=#{expect_len} != got=#{bytes}", []
+               "expect=#{expect_len} != got=#@bytes_digested", []
         end
         md5 = [ digest.digest ].pack("m0")
         if expect_md5 && expect_md5.strip != md5
@@ -54,7 +55,6 @@ class HTTP_Spew::ContentMD5
         end
         wr.write "0\r\nContent-MD5: #{md5}\r\n\r\n"
         @content_md5 = md5
-        @bytes_digested = bytes
       rescue => e
         @to_io.error = e
       ensure

data/lib/http_spew/version.rb

@@ -1,2 +1,2 @@
 # -*- encoding: binary -*-
-HTTP_Spew.const_set :VERSION, "0.2.0"
+HTTP_Spew.const_set :VERSION, "0.3.0"

data/test/test_content_md5.rb

@@ -83,4 +83,23 @@ class TestContentMD5 < Test::Unit::TestCase
     body = ""
     req.each { |buf| body << buf }
   end
+
+  def test_upload_with_md5_alt_input
+    str = rand_data(123) * (8 * 1021 * 13)
+    expect_md5 = [Digest::MD5.digest(str)].pack("m0")
+    expect = "expect=#{expect_md5}\nreaded=#{expect_md5}\n"
+    @env["CONTENT_LENGTH"] = str.size.to_s
+    @env["rack.input"] = File.open("/dev/null", "rb")
+    input = HTTP_Spew::ContentMD5.new(@env, StringIO.new(str))
+    assert_nil @env["CONTENT_LENGTH"]
+    assert_equal "chunked", @env["HTTP_TRANSFER_ENCODING"]
+    req = HTTP_Spew::Request.new(@env, input, @sockaddr)
+    rv = HTTP_Spew.wait 1, [req], 666
+    assert_equal 200, rv[0].response[0].to_i
+    body = ""
+    req.each { |buf| body << buf }
+    assert_equal body, expect
+    assert_equal expect_md5, input.content_md5
+    assert_equal 123 * 8 * 1021 * 13, input.bytes_digested
+  end
 end

data/test/test_input_spray_with_md5.rb

@@ -69,7 +69,7 @@ class TestInputSprayWithMD5 < Test::Unit::TestCase
       assert_kind_of HTTP_Spew::ChecksumError, r.error
     }
     assert_nil input.content_md5
-    assert_nil input.bytes_digested
+    assert_equal str.size, input.bytes_digested
   end
 
   def test_upload_with_valid_md5_sprayed_one_failure

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_spew
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - HTTP Spew hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 Z
+date: 2011-05-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: kcar