reel 0.4.0.pre → 0.4.0.pre2

data/lib/reel/response_writer.rb

@@ -0,0 +1,69 @@
+module Reel
+  class Response
+    class Writer
+
+      CRLF = "\r\n"
+      def initialize(socket, connection)
+        @socket = socket
+        @connection = connection
+      end
+
+      # Write body chunks directly to the connection
+      def write(chunk)
+        chunk_header = chunk.bytesize.to_s(16)
+        @socket << chunk_header + CRLF
+        @socket << chunk + CRLF
+      end
+
+      # Finish the response and reset the response state to header
+      def finish_response
+        @socket << "0#{CRLF * 2}"
+      end
+
+      # Takes a Reel::Response and renders it
+      # back over the socket.
+      def handle_response(response)
+        @socket << render_header(response)
+        if response.respond_to?(:render)
+          response.render(@socket)
+        else
+          case response.body
+          when String
+            @socket << response.body
+          when IO
+            begin
+              if !defined?(JRUBY_VERSION)
+                IO.copy_stream(response.body, @socket)
+              else
+                # JRuby 1.6.7 doesn't support IO.copy_stream :(
+                while data = response.body.read(4096)
+                  @socket << data
+                end
+              end
+            ensure
+              response.body.close
+            end
+          when Enumerable
+            response.body.each do |chunk|
+              write(chunk)
+            end
+
+            finish_response
+          end
+        end
+      end
+
+      # Convert headers into a string
+      def render_header(response)
+        response_header = "#{response.version} #{response.status} #{response.reason}#{CRLF}"
+        unless response.headers.empty?
+          response_header << response.headers.map do |header, value|
+            "#{header}: #{value}"
+          end.join(CRLF) << CRLF
+        end
+        response_header << CRLF
+      end
+      private :render_header
+    end
+  end
+end

data/lib/reel/server.rb

@@ -5,20 +5,19 @@ module Reel
     # How many connections to backlog in the TCP accept queue
     DEFAULT_BACKLOG = 100
 
-    # FIXME: remove respond_to? check after Celluloid 1.0
-    finalizer :finalize if respond_to?(:finalizer)
+    execute_block_on_receiver :initialize
+    finalizer :shutdown
 
     def initialize(host, port, backlog = DEFAULT_BACKLOG, &callback)
       # This is actually an evented Celluloid::IO::TCPServer
       @server = TCPServer.new(host, port)
+      @server.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       @server.listen(backlog)
       @callback = callback
       async.run
     end
 
-    execute_block_on_receiver :initialize
-
-    def finalize
+    def shutdown
       @server.close if @server
     end
 
@@ -28,8 +27,9 @@ module Reel
 
     def handle_connection(socket)
       connection = Connection.new(socket)
+
       begin
-        @callback[connection]
+        @callback.call(connection)
       ensure
         if connection.attached?
           connection.close rescue nil

data/lib/reel/ssl_server.rb

@@ -0,0 +1,39 @@
+module Reel
+  class SSLServer < Server
+    execute_block_on_receiver :initialize
+
+    def initialize(host, port, options = {}, &callback)
+      backlog = options.fetch(:backlog, DEFAULT_BACKLOG)
+
+      # Ideally we can encapsulate this rather than making Ruby OpenSSL a
+      # mandatory part of the Reel API. It would be nice to support
+      # alternatives (e.g. Puma's MiniSSL)
+      ssl_context = OpenSSL::SSL::SSLContext.new
+      ssl_context.cert = OpenSSL::X509::Certificate.new options.fetch(:cert)
+      ssl_context.key  = OpenSSL::PKey::RSA.new options.fetch(:key)
+
+      # FIXME: VERY VERY VERY VERY BAD RELEASE BLOCKER BAD
+      ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      @tcpserver  = Celluloid::IO::TCPServer.new(host, port)
+      @server = Celluloid::IO::SSLServer.new(@tcpserver, ssl_context)
+      @server.listen(backlog)
+      @callback = callback
+
+      async.run
+    end
+
+    def run
+      loop do
+        begin
+          socket = @server.accept
+        rescue OpenSSL::SSL::SSLError
+          # TODO: log this?
+          retry
+        end
+
+        async.handle_connection socket
+      end
+    end
+  end
+end

data/lib/reel/stream.rb

@@ -31,7 +31,7 @@ module Reel
       @socket.closed?
     end
   end
-    
+
   class EventStream < Stream
 
     # EventSource-related helpers
@@ -60,12 +60,12 @@ module Reel
     end
 
   end
-  
+
   class ChunkStream < Stream
     def write(chunk)
       chunk_header = chunk.bytesize.to_s(16)
-      write chunk_header + Response::CRLF
-      write chunk + Response::CRLF
+      write chunk_header + Response::Writer::CRLF
+      write chunk + Response::Writer::CRLF
       self
     end
     alias :<< :write
@@ -73,7 +73,7 @@ module Reel
     # finish does not actually close the socket,
     # it only inform the browser there are no more messages
     def finish
-      write "0#{Response::CRLF * 2}"
+      write "0#{Response::Writer::CRLF * 2}"
     end
 
     def close
@@ -107,7 +107,6 @@ module Reel
     end
 
     def render(socket)
-      socket << render_header
       @body.call socket
     end
   end

data/lib/reel/version.rb

@@ -1,3 +1,3 @@
 module Reel
-  VERSION = "0.4.0.pre"
+  VERSION = "0.4.0.pre2"
 end

data/lib/reel/websocket.rb

@@ -7,10 +7,12 @@ module Reel
     include ConnectionMixin
     include RequestMixin
 
+    attr_reader :socket
     def_delegators :@socket, :addr, :peeraddr
 
-    def initialize(http_parser, socket)
-      @http_parser, @socket = http_parser, socket
+    def initialize(info, socket)
+      @request_info = info
+      @socket = socket
 
       handshake = ::WebSocket::ClientHandshake.new(:get, url, headers)
 
@@ -36,8 +38,8 @@ module Reel
         close
       end
 
-      @parser.on_ping do
-        @socket << ::WebSocket::Message.pong.to_data
+      @parser.on_ping do |payload|
+        @socket << ::WebSocket::Message.pong(payload).to_data
       end
     end
 

data/reel.gemspec

@@ -15,10 +15,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Reel::VERSION
 
-  gem.add_runtime_dependency 'celluloid-io',     '>= 0.8.0'
+  gem.add_runtime_dependency 'celluloid',        '>= 0.14.1'
+  gem.add_runtime_dependency 'celluloid-io',     '>= 0.14.1'
   gem.add_runtime_dependency 'http',             '>= 0.2.0'
-  gem.add_runtime_dependency 'http_parser.rb',   '>= 0.5.3'
-  gem.add_runtime_dependency 'websocket_parser', '>= 0.1.2'
+  gem.add_runtime_dependency 'http_parser.rb',   '>= 0.6.0.beta.2'
+  gem.add_runtime_dependency 'websocket_parser', '>= 0.1.4'
   gem.add_runtime_dependency 'rack',             '>= 1.4.0'
 
   gem.add_development_dependency 'rake'

data/spec/fixtures/client.crt

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDmjCCAoICCQDwZ8yE/0n4PjANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28x
+EjAQBgNVBAoTCUNlbGx1bG9pZDEbMBkGA1UEAxMSY2xpZW50LmV4YW1wbGUuY29t
+MSEwHwYJKoZIhvcNAQkBFhJjbGllbnRAZXhhbXBsZS5jb20wHhcNMTIxMTI1MTkx
+NjI2WhcNMjIxMTIzMTkxNjI2WjCBjjELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh
+bGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xEjAQBgNVBAoTCUNlbGx1
+bG9pZDEbMBkGA1UEAxMSY2xpZW50LmV4YW1wbGUuY29tMSEwHwYJKoZIhvcNAQkB
+FhJjbGllbnRAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDV6zzpkAIX4FijnytX84GgHb8hYdNJAn+9g57XGrqtAH6BlLoANFl4n/+y
+nEQwBqlrNnfstPrf7sPezytntSVyufSE+LGUGBJA/jyjQCMcEe8+4bfOC2ZhCpvn
+I2dKNKwsmM+DyWs/PVl7XEAZF2P4iQ8eGLVFjph+KA/D79cHkIeGt4FEA4xJWqKf
++Kjftxo1cBqLx2dUiucRL7tva3ingAqYSs/i82jKLGlj7fdRMytOx87Nhs35RWpu
+66l7hvpetx3t2wU2obKOzKhS4ycaZ2AptEDNXKaBTQ5lejSRxFBCpYQtqmkd0bMG
+/T5ZfXC45axj9a2rj8AKZct+mLCzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAHzr
+b4VTktAi+8baGRJCXupt0Ari8ffoWhsYerELFLQF7K2sluxOqCsGEEF21e99fZxP
+lisLi0DIQ7cNlOGjRJ3xaydE74Fsry3xBNKoR8I7OMr9VFsrC54tc0x7NQ7bRHy6
+kCjSwKN4I2KWJjQ8yf8mIalmUKOmb/hirzna8io4CiDeJGZ1XNAQ9dl1RHRW442G
+GTu2ofAtU8TlzilZyclMY/lN7whw7sKP+pPr6fpAOJZsR64IzbBcWHHjJhx70XOx
+jnd5FB1oXnuupgPqEKmatSCytrue8GTkanB8VZ6+Zd/4XgTkie3UtCZW8R+NL/Lo
+us/+Ks3WIDyYdPSPnbE=
+-----END CERTIFICATE-----

data/spec/fixtures/client.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA1es86ZACF+BYo58rV/OBoB2/IWHTSQJ/vYOe1xq6rQB+gZS6
+ADRZeJ//spxEMAapazZ37LT63+7D3s8rZ7Ulcrn0hPixlBgSQP48o0AjHBHvPuG3
+zgtmYQqb5yNnSjSsLJjPg8lrPz1Ze1xAGRdj+IkPHhi1RY6YfigPw+/XB5CHhreB
+RAOMSVqin/io37caNXAai8dnVIrnES+7b2t4p4AKmErP4vNoyixpY+33UTMrTsfO
+zYbN+UVqbuupe4b6Xrcd7dsFNqGyjsyoUuMnGmdgKbRAzVymgU0OZXo0kcRQQqWE
+LappHdGzBv0+WX1wuOWsY/Wtq4/ACmXLfpiwswIDAQABAoIBAQCFDDcpaUj0ArP+
+qEuz+x6/MGEk6QwZV7WNcGSFkvlSCoGkJJV+9RBExvao5yo92JbcuNbj4Tg7uOwY
+EzAC45a0AVZEscz4t/P6emXKf2SW28y6hnbkbxCxAIEwxENE0vfXEP/YDplmjsit
+whWXxYWHGe/OHz33UhYkONR9YBmUeLrtloRNUV82XDSpn4d7toLKaZW2kOFl4nFR
+SQ3pDPk1hleG8AZcfnF2LwaPx1XjPwBnXY9FK2jyNupVghfCw/Sv91dbbVkkIG14
+A8WpZKAXjXXOcTroof5+NJSPXzYrRuvP8K6H2zGj7F/AsP4hiZqGkb4tel0yH5VM
+oLCUTHqhAoGBAPysxeoT1ytajQ55UV1yjsnQ3jF9YcWsZwPEJgMI+bt+QzAfqqZs
+Kuvg8Gi7ukbcc2pKwXv+ma9HLJq/pQbWlfxcMNulY0VCPY/ceaPen+EfCJTApVpY
+YFS25i/JnIp9IudpQBuLHz9Yy4f1W2VoeG/mFqOmUxiTx4LM87G6rdtDAoGBANi7
+5raiwDS+rD91l5FLq3kdvgSDgYk4hh7BBJNJt8vhJYInIev5eb/Z41X8PfqWa2ir
+9aanpMYhWDJxbdSQDd3/op6jtOZM7InLceAm2O29VY2+HW5ePpc21AHsqoZpFYEZ
+YP8xvbSjJzfkrYr4y+aAMXONVAi4afqG7x6GqCXRAoGBAPbzFWu1gHKKyZn/0Bn4
+wL1WOhM8a7Z6zSPNLSmCODGbMadzC6Ijzb9D1TNHZsOi6dpUvc2mBCZe9aU48N1C
+FMzUfZvuhJtIJkrYPLp/9tpbLlPUBMfL4Dprl4XVEf34V4i8QT+qNRwAeMukbXMr
+K6qRwkanZEd9B107WmG2Bf1pAoGACpld1g6tgabVe6D/kY52y0yGD2hy/Ef0Xyqn
+U6CmSWUwVWYehZDEwHoiYQEd8tRKWmsWb1kBeOMGkijz6xJEa1fmFwYAgca/RpnZ
+btHXiADbXzwt6kjXnMOEqLdvO3WGJLMeCDzhfyT/dP9M8V/rcNFSGcmOk4KZRDQ3
+G3IQZRECgYBqHqvxHeL087UHXE1tdAGFVfxOiYE1afksJbkV06VnO8XXr9sNSWwy
+YjXVY9k6U1BFo7jHrWr6TkeMkB45wyn/fasHKU7qsPt0joRFkXMCzwl376hto3Tg
+RGXQCA4RUQXkxaDctJ5TgcF7MhK7tAFd1aBVlxwGENLYUVL0ZPaMrw==
+-----END RSA PRIVATE KEY-----

data/spec/fixtures/server.crt

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDmjCCAoICCQD+dJ16wNIKnzANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28x
+EjAQBgNVBAoTCUNlbGx1bG9pZDEbMBkGA1UEAxMSc2VydmVyLmV4YW1wbGUuY29t
+MSEwHwYJKoZIhvcNAQkBFhJzZXJ2ZXJAZXhhbXBsZS5jb20wHhcNMTIxMTI1MTkx
+NjAwWhcNMjIxMTIzMTkxNjAwWjCBjjELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh
+bGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xEjAQBgNVBAoTCUNlbGx1
+bG9pZDEbMBkGA1UEAxMSc2VydmVyLmV4YW1wbGUuY29tMSEwHwYJKoZIhvcNAQkB
+FhJzZXJ2ZXJAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCpLs3Xg00RtoG4+SKaaNfw6Dve9d0Kkg0CNfU8AsxOgTIU1Qu8s+bzKkqe
+66NfCa6T8VPpk9VbIlF2ONdgY4o8muV1q+mS6j2HDAtWPiDjP+9YOwGf/DT3LhSb
+g8k+alL2cqe7B1XNUsNFEvQ+yQLlj9MWKb7nbYDM8aqdv46KGoDj9v9rfm4QiKwI
+B6u/KoQG22YF7sT4O44jU/u20xcm3rV1Elg0gC/UP/YqnuMPCZYcK/Z9vYGtDJ6G
+8OYDcPZSZBdkqlffhYBssSj3R7sTCqoh4ms08ukcGycbvUO+cWrPKnmySsGaCYtG
+kp7QsH1ec7QGA01hZL2yL8CuJMUbAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBABE4
+gYVSdC87NhpA49k0vcLLU7v7mU3a3no/vu1CIqQxzx8/xh26Qi3aGb1s9MgHpF2Z
+NiB1irXER2tyz/F3qCi8OCo7eNsndmDjj4GnkBjEPTtqRxH9imRWw4bJyqwqFHcu
+1kczCZa+2VFQFEL4ErGycPFKM59ppTcJ0IxbK7PCGzO75TRQoAl52+3Aob+oejPP
+qFbiqNlV1T3EKa5yLdvOC5sLrEcfm3iMxmOtNVzp9OBhjXfm8Q1zgYs4VyJXzLMK
+wf956w2YEbpTAAzNc53zly/Jhr4MnFsa9Mn1oYp9Rfjzw/qJtXw+a3PtEKrO4XNe
+TsKHsAkj8XvUrhliiNQ=
+-----END CERTIFICATE-----

data/spec/fixtures/server.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAqS7N14NNEbaBuPkimmjX8Og73vXdCpINAjX1PALMToEyFNUL
+vLPm8ypKnuujXwmuk/FT6ZPVWyJRdjjXYGOKPJrldavpkuo9hwwLVj4g4z/vWDsB
+n/w09y4Um4PJPmpS9nKnuwdVzVLDRRL0PskC5Y/TFim+522AzPGqnb+OihqA4/b/
+a35uEIisCAervyqEBttmBe7E+DuOI1P7ttMXJt61dRJYNIAv1D/2Kp7jDwmWHCv2
+fb2BrQyehvDmA3D2UmQXZKpX34WAbLEo90e7EwqqIeJrNPLpHBsnG71DvnFqzyp5
+skrBmgmLRpKe0LB9XnO0BgNNYWS9si/AriTFGwIDAQABAoIBAGKRoV4p4rIqOiQy
+CuYZpY53T8KUToeFFk0ucMXY/33RqgMXKTJ1Ql50SmuS8GlDs9IALZqOBiWFth6B
++YHwHK84s+2+DmUJUnWnH8fMhM7CBknKfyTeBWHqGBmPS6WwvstVe8HtASGSUbCh
+3WnjJWvoQtzLz6z4UK2XM4ea/ooY+hlcw6DM+jZuTstzLFE/9BPoHueaW8UemjaH
+ZUXMKm3+I3iIjHszUUWM59bS9pOBn/YvIJbVE5wMIVCP2YXDCgfpV2Z4nDiAHppn
+fnha2TzHzlPMgwhBpz06r6G8X+A6gJl98TDSK41nIMyXqiZ2aoALL3UOssAMfUHr
+2y9CGdECgYEA27F1IyUW3JgqCeqZ7eCeT4emhAvyohzM5pzWI7C8ZosF14zFRpek
+TgmjdTGMQ1EZVVkyj85RyvMm3MkcKOHetc5g2jJg3EkxvAV+PMs7yjpqg3itEjC6
+vIhXLoXdq+FuruA2h4O0hi6yuf1FCQYtpNLTe49qetjsaWzwwowHwlMCgYEAxSRo
+k+AdpoNXblnIhd0EaKjGAsHFrC039o7JqQe/mKAiXaGiidIDk5Vt/ChT6Qa6fiLq
+cdysCn+tSCt/DdRrELZohc0ipuy5/agQmJgWoW7oay8ldzxHP9VevWo4UuqVudW9
+evhKe0a9uXCrSimvZ5PJk91lmBx92FBeP6Y+qRkCgYAXQsvPQ88O3kGdOSzBJgY9
+D3TPCGDRT1FWnYaC0uSvysp8jxgYKFgqNxUKhIuAWSbghYg397VrUqFrwRNtNLUa
+9NYGZE0jJdDRQpeiIjaba+H5N57DjUtISPtKHrxgxYatl2nOoWBM0Mb1sF5N3UyZ
+5gSkUYQJq8wkQXegcakkpwKBgEdvvgV3vMbN6SyvlB4NzL8wCTCOjtapPBI4A5Mg
+n6jqvgk3vPI8C9e62jP5WQ6jxYhXlqTT1fOn+F6ihFO6mWFg99ckUl4ygeMMt5bT
+5b9xtP7CAs2GJjtXUhFJIEfLgZ3pedPJjRPGupEr5qXlHQ5nWzAdlebczC1KUhy2
+XRZhAoGAGA3SAAF79PK3c3+bOOviXxDFuH5TCBmbtEpJ+/jCbwR6Z8fMRswZJ3Gc
+l8eNMsB+Kfif+806xAgLxsyhYuyvF6rE/V34GKjW22T1gwk6gY/rOgFn42jo8lwl
+HFbSB+IG0+Go0m+0QmyRh7SyPvDNtyYzBFFdl9U8JYYGM0Nfgd0=
+-----END RSA PRIVATE KEY-----

data/spec/reel/connection_spec.rb

@@ -33,11 +33,11 @@ describe Reel::Connection do
       request.url.should     eq "/"
       request.version.should eq "1.1"
       request['Content-Length'].should eq body.length.to_s
-      request.body.should eq example_request.body
+      request.body.to_s.should eq example_request.body
     end
   end
 
-  it "serves static files" do
+  it "reads requests with large bodies" do
     with_socket_pair do |client, connection|
       client << ExampleRequest.new.to_s
       request = connection.request
@@ -53,18 +53,34 @@ describe Reel::Connection do
     end
   end
 
+  it "enumerates requests with #each_request" do
+    with_socket_pair do |client, connection|
+      client << ExampleRequest.new.to_s
+
+      request_count = 0
+      connection.each_request do |request|
+        request_count += 1
+        request.url.should eq "/"
+        request.respond :ok
+        client.close
+      end
+
+      request_count.should eq 1
+    end
+  end
+
   it "streams responses when transfer-encoding is chunked" do
     with_socket_pair do |client, connection|
       client << ExampleRequest.new.to_s
       request = connection.request
 
       # Sending transfer_encoding chunked without a body enables streaming mode
-      connection.respond :ok, :transfer_encoding => :chunked
+      request.respond :ok, :transfer_encoding => :chunked
 
       # This will send individual chunks
-      connection << "Hello"
-      connection << "World"
-      connection.finish_response # Write trailer and reset connection to header mode
+      request << "Hello"
+      request << "World"
+      request.finish_response # Write trailer and reset connection to header mode
       connection.close
 
       response = ""
@@ -95,7 +111,203 @@ describe Reel::Connection do
     end
   end
 
-  describe "Connection#read behaving like IO#read" do
+  it "raises an error trying to read two pipelines without responding first" do
+    with_socket_pair do |client, connection|
+      2.times do
+        client << ExampleRequest.new.to_s
+      end
+
+      lambda{
+        2.times do
+          request = connection.request
+        end
+      }.should raise_error(Reel::Connection::StateError)
+    end
+  end
+
+  it "reads pipelined requests without bodies" do
+    with_socket_pair do |client, connection|
+      3.times do
+        client << ExampleRequest.new.to_s
+      end
+
+      3.times do
+        request = connection.request
+
+        request.url.should     eq "/"
+        request.version.should eq "1.1"
+
+        request['Host'].should eq "www.example.com"
+        request['Connection'].should eq "keep-alive"
+        request['User-Agent'].should eq "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.78 S"
+        request['Accept'].should eq "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"
+        request['Accept-Encoding'].should eq "gzip,deflate,sdch"
+        request['Accept-Language'].should eq "en-US,en;q=0.8"
+        request['Accept-Charset'].should eq "ISO-8859-1,utf-8;q=0.7,*;q=0.3"
+        connection.respond :ok, {}, ""
+      end
+    end
+  end
+
+  it "reads pipelined requests with bodies" do
+    with_socket_pair do |client, connection|
+      3.times do |i|
+        body = "Hello, world number #{i}!"
+        example_request = ExampleRequest.new
+        example_request.body = body
+
+        client << example_request.to_s
+      end
+
+      3.times do |i|
+        request = connection.request
+
+        expected_body = "Hello, world number #{i}!"
+        request.url.should     eq "/"
+        request.version.should eq "1.1"
+        request['Content-Length'].should eq expected_body.length.to_s
+        request.body.to_s.should eq expected_body
+
+        connection.respond :ok, {}, ""
+      end
+    end
+  end
+
+  it "reads pipelined requests with streamed bodies" do
+    with_socket_pair(4) do |client, connection|
+      3.times do |i|
+        body = "Hello, world number #{i}!"
+        example_request = ExampleRequest.new
+        example_request.body = body
+
+        client << example_request.to_s
+      end
+
+      3.times do |i|
+        request = connection.request
+
+        expected_body = "Hello, world number #{i}!"
+        request.url.should     eq "/"
+        request.version.should eq "1.1"
+        request['Content-Length'].should eq expected_body.length.to_s
+        request.should_not be_finished_reading
+        new_content = ""
+        while chunk = request.body.readpartial(1)
+          new_content << chunk
+        end
+        new_content.should == expected_body
+        request.should be_finished_reading
+
+        connection.respond :ok, {}, ""
+      end
+    end
+  end
+
+  # This test will deadlock rspec waiting unless
+  # connection.request works properly
+  it "does not block waiting for body to read before handling request" do
+    with_socket_pair do |client, connection|
+      example_request = ExampleRequest.new
+      content = "Hi guys! Sorry I'm late to the party."
+      example_request['Content-Length'] = content.length
+      client << example_request.to_s
+
+      request = connection.request
+      request.should be_a(Reel::Request)
+      client << content
+      request.body.to_s.should == content
+    end
+  end
+
+  it "blocks on read until written" do
+    with_socket_pair do |client, connection|
+      example_request = ExampleRequest.new
+      content = "Hi guys! Sorry I'm late to the party."
+      example_request['Content-Length'] = content.length
+      client << example_request.to_s
+
+      request = connection.request
+      timers = Timers.new
+      timers.after(0.2){
+        client << content
+      }
+      read_body = ""
+      timers.after(0.1){
+        timers.wait # continue timers, the next bit will block waiting for content
+        read_body = request.read(8)
+      }
+      timers.wait
+
+      request.should be_a(Reel::Request)
+      read_body.should == content[0..7]
+    end
+  end
+
+  it "streams body properly with #read and buffered body" do
+    with_socket_pair do |client, connection|
+      example_request = ExampleRequest.new
+      content = "I'm data you can stream!"
+      example_request['Content-Length'] = content.length
+      client << example_request.to_s
+
+      request = connection.request
+      request.should be_a(Reel::Request)
+      request.should_not be_finished_reading
+      client << content
+      rebuilt = []
+      connection.readpartial(64) # Buffer some body
+      while chunk = request.read(8)
+        rebuilt << chunk
+      end
+      request.should be_finished_reading
+      rebuilt.should == ["I'm data", " you can", " stream!"]
+    end
+  end
+
+  context "#readpartial" do
+    it "streams request bodies" do
+      with_socket_pair(8) do |client, connection|
+        example_request = ExampleRequest.new
+        content = "I'm data you can stream!"
+        example_request['Content-Length'] = content.length
+        client << example_request.to_s
+
+        request = connection.request
+        request.should be_a(Reel::Request)
+        request.should_not be_finished_reading
+        client << content
+        rebuilt = []
+        while chunk = request.body.readpartial(8)
+          rebuilt << chunk
+        end
+        request.should be_finished_reading
+        rebuilt.should == ["I'm data", " you can", " stream!"]
+      end
+    end
+  end
+
+  context "#each" do
+    it "streams request bodies" do
+      with_socket_pair(8) do |client, connection|
+        example_request = ExampleRequest.new
+        content = "I'm data you can stream!"
+        example_request['Content-Length'] = content.length
+        client << example_request.to_s
+
+        request = connection.request
+        request.should be_a(Reel::Request)
+        request.should_not be_finished_reading
+        client << content
+
+        data = ""
+        request.body.each { |chunk| data << chunk }
+        request.should be_finished_reading
+        data.should == "I'm data you can stream!"
+      end
+    end
+  end
+
+  describe "IO#read duck typing" do
     it "raises an exception if length is a negative value" do
       with_socket_pair do |client, connection|
         example_request = ExampleRequest.new
@@ -118,6 +330,20 @@ describe Reel::Connection do
       end
     end
 
+    it "reads to EOF if length is nil, even small buffer" do
+      with_socket_pair(4) do |client, connection|
+        body = "Hello, world!"
+        example_request = ExampleRequest.new
+        example_request.body = body
+        connection.buffer_size.should == 4
+
+        client << example_request.to_s
+        request = connection.request
+
+        request.read.should eq "Hello, world!"
+      end
+    end
+
     it "reads to EOF if length is nil" do
       with_socket_pair do |client, connection|
         body = "Hello, world!"