io-stream 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0a5f918cac3b8ad0a5f88281f74f2ba71b1f37e3b0504bab234fc7139ae22c9
-  data.tar.gz: ce06b6c063777952df3f6e911807e7377983e15450259d269d05d69ac8e073fa
+  metadata.gz: fe1cb88a44b5750ca8841631a3031da7ff06004e21d5dccf319012f0a0f1151f
+  data.tar.gz: 30d66da77b2887c16024511e907a8b30fdf1b24c53ee548f3a9171b54ff45ee1
 SHA512:
-  metadata.gz: b74b95787f49071ba75c4b17ab6683b14fa24c2a83c8cc8b896cc4f23ba684ab0657b5dd0db7d6701b65e2da276619e6539a120918f079b23dbdef53b9bd6b93
-  data.tar.gz: d254f93d0561271c7406f2a00269e53776ef6548ea1814b169fdee5dc661bed4230eefef734ceb463a0561f255e8c9c8c0f76bd20419213ac49cc18b11ccf7e0
+  metadata.gz: e2ad4475b779c7c421fb7143fac491243790e210c12dac89d37e885753353c78d1305bd08144e12204a13d4c068c7cf16a9133462fe0a5f19a5eecd49e839fc7
+  data.tar.gz: edef464bbf54fdfd662850aca4b7fcc522caca32566a2201b2ee8c68460c5eff9ae67d5e645e255b2e60ba951b88d10703648393e65c4f1b58f12ccffc8cd6cb

data/lib/io/stream/buffered.rb

@@ -22,7 +22,7 @@ module IO::Stream
 		def self.wrap(io, **options)
 			if io.respond_to?(:buffered=)
 				io.buffered = false
-			else
+			elsif io.respond_to?(:sync=)
 				io.sync = true
 			end
 			

data/lib/io/stream/generic.rb

@@ -29,7 +29,6 @@ module IO::Stream
 			
 			@read_buffer = StringBuffer.new
 			@write_buffer = StringBuffer.new
-			@drain_buffer = StringBuffer.new
 			
 			# Used as destination buffer for underlying reads.
 			@input_buffer = StringBuffer.new
@@ -129,20 +128,21 @@ module IO::Stream
 			read_until(separator, **options)
 		end
 		
+		private def drain(buffer)
+			begin
+				syswrite(buffer)
+			ensure
+				# If the write operation fails, we still need to clear this buffer, and the data is essentially lost.
+				buffer.clear
+			end
+		end
+		
 		# Flushes buffered data to the stream.
 		def flush
 			return if @write_buffer.empty?
 			
 			@writing.synchronize do
-				# Flip the write buffer and drain buffer:
-				@write_buffer, @drain_buffer = @drain_buffer, @write_buffer
-				
-				begin
-					syswrite(@drain_buffer)
-				ensure
-					# If the write operation fails, we still need to clear this buffer, and the data is essentially lost.
-					@drain_buffer.clear
-				end
+				self.drain(@write_buffer)
 			end
 		end
 		
@@ -150,11 +150,15 @@ module IO::Stream
 		# buffer is flushed to the underlying `io`.
 		# @param string the string to write to the buffer.
 		# @return the number of bytes appended to the buffer.
-		def write(string)
-			@write_buffer << string
-			
-			if @write_buffer.bytesize >= @block_size
-				flush
+		def write(string, flush: false)
+			@writing.synchronize do
+				@write_buffer << string
+				
+				flush |= @write_buffer.bytesize >= @block_size
+				
+				if flush
+					self.drain(@write_buffer)
+				end
 			end
 			
 			return string.bytesize
@@ -168,11 +172,15 @@ module IO::Stream
 		end
 		
 		def puts(*arguments, separator: $/)
-			arguments.each do |argument|
-				@write_buffer << argument << separator
-			end
+			return if arguments.empty?
 			
-			flush
+			@writing.synchronize do
+				arguments.each do |argument|
+					@write_buffer << argument << separator
+				end
+				
+				self.drain(@write_buffer)
+			end
 		end
 		
 		def closed?
@@ -266,13 +274,13 @@ module IO::Stream
 			
 			if @read_buffer.empty?
 				if sysread(size, @read_buffer)
-					# Console.logger.debug(self, name: "read") {@read_buffer.inspect}
+					# Console.info(self, name: "read") {@read_buffer.inspect}
 					return true
 				end
 			else
 				if chunk = sysread(size, @input_buffer)
 					@read_buffer << chunk
-					# Console.logger.debug(self, name: "read") {@read_buffer.inspect}
+					# Console.info(self, name: "read") {@read_buffer.inspect}
 					
 					return true
 				end

data/lib/io/stream/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2023-2024, by Samuel Williams.
 
 module IO::Stream
-	VERSION = "0.4.1"
+	VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-stream
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies: []
 description:
 email: