Handling of reads at EOF, consistent with stdlib.

Author: ioquatix

lib/io/stream/readable.rb

@@ -254,7 +254,14 @@ def gets(separator = $/, limit = nil, chomp: false)
 				end
 
 				# If we can't read any more data, we should return what we have:
-				return consume_read_buffer unless fill_read_buffer
+				# gets should return nil at EOF when no more data is available
+				unless fill_read_buffer
+					if @read_buffer.empty?
+						return nil
+					else
+						return consume_read_buffer
+					end
+				end
 			end
 
 			# If the index of the separator was beyond the limit:
@@ -358,12 +365,19 @@ def fill_read_buffer(size = @minimum_read_size)
 		def consume_read_buffer(size = nil, buffer = nil)
 			# If we are at done, and the read buffer is empty, we can't consume anything.
 			if @done && @read_buffer.empty?
-				# Clear the buffer even when returning nil
 				if buffer
 					buffer.clear
 					buffer.force_encoding(Encoding::BINARY)
 				end
-				return nil
+				
+				# When reading a specific size, return nil at EOF
+				if size
+					buffer = nil
+				else
+					buffer ||= String.new(encoding: Encoding::BINARY)
+				end
+				
+				return buffer
 			end
 
 			result = nil

test/io/stream/buffered.rb

@@ -714,7 +714,7 @@ def before
 	with "#close" do
 		it "should close the stream" do
 			server.close
-			expect(client.read).to be_nil
+			expect(client.read).to be == ""
 
 			expect(server.closed?).to be_truthy
 			expect(client.closed?).to be_falsey