eof? can and does block, so let's avoid it.

lib/protocol/http1/body/remainder.rb

@@ -14,15 +14,17 @@ class Remainder < HTTP::Body::Readable
 				# block_size may be removed in the future. It is better managed by stream.
 				def initialize(stream)
 					@stream = stream
+					@empty = false
 				end
 
 				def empty?
-					@stream.eof? or @stream.closed?
+					@empty or @stream.closed?
 				end
 
 				def close(error = nil)
 					# We can't really do anything in this case except close the connection.
 					@stream.close
+					@empty = true
 
 					super
 				end
@@ -31,6 +33,8 @@ def close(error = nil)
 				def read
 					@stream.readpartial(BLOCK_SIZE)
 				rescue EOFError, IOError
+					@empty = true
+
 					# I noticed that in some cases you will get EOFError, and in other cases IOError!?
 					return nil
 				end
@@ -45,6 +49,8 @@ def call(stream)
 
 				def join
 					@stream.read
+				ensure
+					@empty = true
 				end
 
 				def inspect

test/protocol/http1/body/remainder.rb

@@ -37,12 +37,11 @@
 
 	with "#read" do
 		it "retrieves chunks of content" do
+			expect(body).not.to be(:empty?)
+
 			expect(body.read).to be == "Hello World"
 			expect(body.read).to be == nil
-		end
-
-		it "updates number of bytes retrieved" do
-			body.read
+
 			expect(body).to be(:empty?)
 		end
 	end
@@ -57,12 +56,11 @@
 
 	with "#join" do
 		it "returns all content" do
+			expect(body).not.to be(:empty?)
+
 			expect(body.join).to be == "Hello World"
 			expect(body.join).to be == ""
-		end
-
-		it "updates number of bytes retrieved" do
-			body.read
+
 			expect(body).to be(:empty?)
 		end
 	end