async-io 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b298c4c118c511eaabda86500a8d08bf02b01cd156e0858cb962f4d3005ce665
-  data.tar.gz: 1a231a883488b441d599991043409204b2f282df470fdd8b15d18afa6f9b8e06
+  metadata.gz: a8d2a5bb8ab12fac26be40774eb239426d8533b68b42d95866884e03fda6e824
+  data.tar.gz: 1cf9d4063d70649b936354195b83bd25eb49ff53b7a76d33178d2b80269cd319
 SHA512:
-  metadata.gz: 8b87b6ca52a9e6164e4c6e549eaa2581d2c71908488f1f8235f0a2a8bbe25dd6e551a419b65f9ebd4be6b5c0182e99315c552cf36cc309777d311cd79397accc
-  data.tar.gz: 1cd79fdb63398e13ce10041b4facf4bb1dc5498065c18eac8f3265cd2f842f6360b6f31e2b41acf11df29c62096810940050f4e51a7bceb4e9e242af9cfbf81d
+  metadata.gz: 7b58035212d0d4b063e5c511bfce3ded7f02e5e8524e4b0c47d2e654ca447d92f8f65441cd5ab577c413eacfff71e3ec1dd26c224fd72bf18decc00fcd791334
+  data.tar.gz: 3570983e37a2d827b5ead5bc7d0c2b36a2522bb95241ec54334923e999d2a51ec3829649ccd8eae9af1a501695d5f11c9b1d1469f0bb04508a5ccb2b4a0be938

data/lib/async/io/ssl_socket.rb

@@ -75,6 +75,9 @@ module Async
 			def self.wrap(socket, context)
 				io = @wrapped_klass.new(socket.to_io, context)
 				
+				# We detach the socket from the reactor, otherwise it's possible to add the file descriptor to the selector twice, which is bad.
+				socket.reactor = nil
+				
 				# This ensures that when the internal IO is closed, it also closes the internal socket:
 				io.sync_close = true
 				

data/lib/async/io/stream.rb

@@ -24,7 +24,11 @@ require_relative 'generic'
 module Async
 	module IO
 		class Stream
-			def initialize(io, block_size: 1024*8, sync: true)
+			# The default block size for IO buffers.
+			# BLOCK_SIZE = ENV.fetch('BLOCK_SIZE', 1024*16).to_i
+			BLOCK_SIZE = 1024*8
+			
+			def initialize(io, block_size: BLOCK_SIZE, sync: true)
 				@io = io
 				@eof = false
 				
@@ -45,11 +49,7 @@ module Async
 				return '' if size == 0
 				
 				if size
-					if size <= @block_size
-						fill_read_buffer until @eof or @read_buffer.size >= size
-					else
-						fill_read_buffer(size - @read_buffer.size) until @eof or @read_buffer.size >= size
-					end
+					fill_read_buffer until @eof or @read_buffer.size >= size
 				else
 					fill_read_buffer until @eof
 				end
@@ -68,6 +68,28 @@ module Async
 				return consume_read_buffer(size)
 			end
 			
+			# Efficiently read data from the stream until encountering pattern.
+			# @param pattern [String] The pattern to match.
+			# @return [String] The contents of the stream up until the pattern, which is consumed but not returned.
+			def read_until(pattern, offset = 0)
+				until index = @read_buffer.index(pattern, offset)
+					offset = @read_buffer.size
+					
+					return unless fill_read_buffer
+				end
+				
+				matched = @read_buffer.slice!(0, index)
+				@read_buffer.slice!(0, pattern.bytesize)
+				
+				return matched
+			end
+			
+			def peek
+				until yield(@read_buffer) || @eof
+					fill_read_buffer
+				end
+			end
+			
 			# Writes `string` to the buffer. When the buffer is full or #sync is true the
 			# buffer is flushed to the underlying `io`.
 			# @param string the string to write to the buffer.
@@ -79,7 +101,8 @@ module Async
 					@write_buffer << string
 					
 					if @write_buffer.size >= @block_size
-						flush
+						syswrite(@write_buffer)
+						@write_buffer.clear
 					end
 				end
 				
@@ -117,8 +140,8 @@ module Async
 
 			# Closes the stream and flushes any unwritten data.
 			def close
-				flush rescue nil
-				
+				flush
+			ensure
 				@io.close
 			end
 
@@ -131,41 +154,24 @@ module Async
 			
 			alias eof eof?
 			
-			# Efficiently read data from the stream until encountering pattern.
-			# @param pattern [String] The pattern to match.
-			# @return [String] The contents of the stream up until the pattern, which is consumed but not returned.
-			def read_until(pattern)
-				index = @read_buffer.index(pattern)
-				
-				until index
-					offset = @read_buffer.size
-
-					fill_read_buffer
-					
-					return if @eof
-
-					index = @read_buffer.index(pattern, offset)
-				end
-				
-				matched = @read_buffer.slice!(0, index)
-				@read_buffer.slice!(0, pattern.bytesize)
-				
-				return matched
-			end
-			
-			def peek
-				until yield(@read_buffer) || @eof
-					fill_read_buffer
-				end
-			end
-			
 			private
 			
 			# Fills the buffer from the underlying stream.
-			def fill_read_buffer(size = @block_size)
-				if !sysread(size, @read_buffer)
-					@eof = true
+			def fill_read_buffer
+				Async.logger.debug(self){"fill_read_buffer..."}
+				
+				# Can we read directly into the buffer? (Ruby doesn't support append, only replace):
+				if chunk = @io.read(@block_size)
+					Async.logger.debug(self){"@io.read -> #{chunk.size} bytes"}
+					@read_buffer << chunk
+					return true
 				end
+				
+				Async.logger.debug(self){"@io.read -> #{chunk.inspect}"}
+				
+				# We didn't read anything, so we must be at eof:
+				@eof = true
+				return false
 			end
 
 			# Consumes at most `size` bytes from the buffer.
@@ -209,15 +215,6 @@ module Async
 				
 				return written
 			end
-			
-			# Read to 
-			def sysread(size, buffer)
-				if buffer.empty?
-					@io.read(size, buffer)
-				elsif chunk = @io.read(size)
-					buffer << chunk
-				end
-			end
 		end
 	end
 end

data/lib/async/io/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module IO
-		VERSION = "1.8.0"
+		VERSION = "1.8.1"
 	end
 end

data/spec/async/io/stream_spec.rb

@@ -49,6 +49,17 @@ RSpec.describe Async::IO::Stream do
 		end
 	end
 	
+	describe '#read_until' do
+		it "can read a line" do
+			io.write("hello\nworld\n")
+			io.seek(0)
+			
+			expect(stream.read_until("\n")).to be == 'hello'
+			expect(stream.read_until("\n")).to be == 'world'
+			expect(stream.read_until("\n")).to be_nil
+		end
+	end
+	
 	describe '#flush' do
 		it "should not call write if write buffer is empty" do
 			expect(io).to_not receive(:write)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async