diff options
| -rw-r--r-- | lib/mongrel.rb | 12 | ||||
| -rw-r--r-- | test/test_response.rb | 12 |
2 files changed, 10 insertions, 14 deletions
diff --git a/lib/mongrel.rb b/lib/mongrel.rb index c24cc67..5c5bafb 100644 --- a/lib/mongrel.rb +++ b/lib/mongrel.rb @@ -100,32 +100,32 @@ module Mongrel class HttpResponse attr_reader :socket - attr_reader :out + attr_reader :body attr_reader :header attr_reader :status attr_writer :status def initialize(socket) @socket = socket - @out = StringIO.new + @body = StringIO.new @status = 404 @header = HeaderOut.new(StringIO.new) end def start(status=200) @status = status - yield @header, @out + yield @header, @body finished end def finished @header.out.rewind - @out.rewind + @body.rewind - @socket.write("HTTP/1.1 #{@status} #{HTTP_STATUS_CODES[@status]}\r\nContent-Length: #{@out.length}\r\n") + @socket.write("HTTP/1.1 #{@status} #{HTTP_STATUS_CODES[@status]}\r\nContent-Length: #{@body.length}\r\n") @socket.write(@header.out.read) @socket.write("\r\n") - @socket.write(@out.read) + @socket.write(@body.read) end end diff --git a/test/test_response.rb b/test/test_response.rb index f033ba6..d436bfa 100644 --- a/test/test_response.rb +++ b/test/test_response.rb @@ -11,11 +11,10 @@ class ResponseTest < Test::Unit::TestCase resp.status = 200 resp.header["Accept"] = "text/plain" resp.header["X-Whatever"] = "stuff" - resp.out.write("test") + resp.body.write("test") resp.finished - out.rewind - puts out.read + assert out.length > 0, "output didn't have data" end def test_response_200 @@ -26,9 +25,7 @@ class ResponseTest < Test::Unit::TestCase out.write("tested") out.write("hello!") end - - io.rewind - puts io.read + assert io.length > 0, "output didn't have data" end def test_response_404 @@ -40,8 +37,7 @@ class ResponseTest < Test::Unit::TestCase out.write("NOT FOUND") end - io.rewind - puts io.read + assert io.length > 0, "output didn't have data" end end |