Add support for Body#discard + 100% test coverage.

Author: ioquatix

lib/protocol/http1/body/chunked.rb

@@ -26,15 +26,19 @@ def empty?
 					@stream.nil?
 				end
 
-				def close(error = nil)
-					if @stream
+				def discard
+					if stream = @stream
+						@stream = nil
+						
 						# We only close the connection if we haven't completed reading the entire body:
 						unless @finished
-							@stream.close_read
+							stream.close_read
 						end
-						
-						@stream = nil
 					end
+				end
+				
+				def close(error = nil)
+					self.discard
 
 					super
 				end
@@ -67,13 +71,18 @@ def read
 							# Read trailing CRLF:
 							chunk = @stream.read(length + 2)
 
-							# ...and chomp it off:
-							chunk.chomp!(CRLF)
-							
-							@length += length
-							@count += 1
-							
-							return chunk
+							if chunk.bytesize == length + 2
+								# ...and chomp it off:
+								chunk.chomp!(CRLF)
+								
+								@length += length
+								@count += 1
+								
+								return chunk
+							else
+								# The stream has been closed before we have read the requested length:
+								self.discard
+							end
 						end
 
 						# If the stream has been closed before we have read the final chunk, raise an error:

lib/protocol/http1/body/fixed.rb

@@ -23,15 +23,18 @@ def empty?
 					@stream.nil? or @remaining == 0
 				end
 
-				def close(error = nil)
-					if @stream
-						# If we are closing the body without fully reading it, the underlying connection is now in an undefined state.
+				def discard
+					if stream = @stream
+						@stream = nil
+						
 						if @remaining != 0
-							@stream.close_read
+							stream.close_read
 						end
-						
-						@stream = nil
 					end
+				end
+				
+				def close(error = nil)
+					self.discard
 
 					super
 				end
@@ -41,11 +44,11 @@ def read
 					if @remaining > 0
 						if @stream
 							# `readpartial` will raise `EOFError` if the stream is finished, or `IOError` if the stream is closed.
-							if chunk = @stream.readpartial(@remaining)
-								@remaining -= chunk.bytesize
-								
-								return chunk
-							end
+							chunk = @stream.readpartial(@remaining)
+							
+							@remaining -= chunk.bytesize
+							
+							return chunk
 						end
 
 						# If the stream has been closed before we have read the expected length, raise an error:

lib/protocol/http1/body/remainder.rb

@@ -21,12 +21,15 @@ def empty?
 					@stream.nil?
 				end
 
-				def close(error = nil)
-					if @stream
-						# We can't really do anything in this case except close the connection.
-						@stream.close_read
+				def discard
+					if stream = @stream
 						@stream = nil
+						stream.close_read
 					end
+				end
+				
+				def close(error = nil)
+					self.discard
 
 					super
 				end

test/protocol/http1/body/chunked.rb

@@ -82,5 +82,13 @@
 				expect{body.read}.to raise_exception(Protocol::HTTP1::BadHeader)
 			end
 		end
+		
+		with "invalid content length" do
+			let(:buffer) {StringIO.new("#{(content.bytesize + 1).to_s(16)}\r\n#{content}")}
+			
+			it "raises error" do
+				expect{body.read}.to raise_exception(EOFError)
+			end
+		end
 	end
 end

test/protocol/http1/body/fixed.rb

@@ -64,9 +64,10 @@
 			let(:body) {subject.new(buffer, 20)}
 
 			it "retrieves content up to provided length" do
+				body.read
+				
 				expect do
 					body.read
-					body.read
 				end.to raise_exception(EOFError)
 			end
 		end
@@ -88,4 +89,14 @@
 			)
 		end
 	end
+	
+	with "#discard" do
+		it "causes #read to raise EOFError" do
+			body.discard
+			
+			expect do
+				body.read
+			end.to raise_exception(EOFError)
+		end
+	end
 end