io-stream 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22ab50a346a6b3a70840063e6c89b136be1bf6a1a1368a2350bc43613249863e
-  data.tar.gz: f797366850b5e7924f371ee6356331277626940e421eaff48ccce49c13a4b4af
+  metadata.gz: f6a65103b45022f50d46603a178bb87f7bf8a11ab24da10e855dd7c18233a261
+  data.tar.gz: d0870c42173b4e87388ea1f3c56e68323c394cac7bf4ea1d90cd879d1c02b8a4
 SHA512:
-  metadata.gz: b9baea0d3389daf96359f4865dac6e3fad380f706c579815bfb8d818f09593b9a09a04f0d44d18a21c7e63449963e3d3c6ea5dcfffc2421e0a6b91c4db80b7a4
-  data.tar.gz: 59e2865c43bb179598e431592222d76e45906cc12be1013831e43306cd46d88795a92ee132aface5c12bc87457b2f3e9a7e942bedf0b3e47d4db73e03cbf9db2
+  metadata.gz: 97d1162cf543a3b604a1fe1873525d8c6278c1adac118fe165e0d1066a8421b06a4932e96e46276bc7abe8f618fe0bc89f45c5f13dd262d52c2e58e65cd5f878
+  data.tar.gz: 0c7db373575894a7271133aa1f610246efad907e7e168114ba677c64fbfb7a0695fd80dd286585ebdfe5af6e88f44d1f2a2c3ecf339fda540eb8ac913a2f181a

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-Y�]ˏ����	�T��5��m~9�S�'J.G֝��
�괻���0W���e�S���	�"���.�{����`�Cy����
"��\���^�։��sv�Z�t��j���T�>8�n�&�Є4�a9jX�GsˎN�?y�;�V52��7��8��W�p3�Ǟ�C��=�j�?90r��8f5�ByS�UŨ����y�����H�j�6�r�ʶ��W�"
R|#;�ȃ>%0�[.���`���?|��$���4M���S� F�_�3Mj��M�T)�.T�Jg�/F�I�N���S�ޕ�ðFkA��LA{��4��Q�cV>{K�b �Ĕ�z�'���`�A\xknK����2q=��%��
-�i�)y�WI��~i��U~
+\^�l�m/���������Zع�ol��Rs�7W�$ |�#�
 ��W�ѕ`�dG���%ҹ����oV�:�IO�Oa�Cȍ*a^+�ZQ�~�;��]-�x��.S�L��%�l��.�b�*J��!f`V[��b���s�|b��fP����Di��F;������5vO�Gu,�8h
+�OEX0`U)z��^8�.jN�c�Ǟ)<�~�+Fd}�ff����ٻ�oUT�@@Bs�_ȶd�B�4�7���{�6:�����f�p�4Y��+/��-.I�����^�Ot�U���ND2��@g

data/lib/io/stream/buffered.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023-2024, by Samuel Williams.
+# Copyright, 2024, by Samuel Williams.
 
 require_relative 'generic'
 
@@ -41,6 +41,11 @@ module IO::Stream
 			super(...)
 			
 			@io = io
+			if io.respond_to?(:timeout)
+				@timeout = io.timeout
+			else
+				@timeout = nil
+			end
 		end
 		
 		attr :io
@@ -70,7 +75,25 @@ module IO::Stream
 		end
 		
 		def syswrite(buffer)
-			@io.write(buffer)
+			# This fails due to re-entrancy issues with a concurrent call to `sysclose`.
+			# return @io.write(buffer)
+			
+			while true
+				result = @io.write_nonblock(buffer, exception: false)
+				
+				case result
+				when :wait_readable
+					@io.wait_readable(@io.timeout) or raise ::IO::TimeoutError, "read timeout"
+				when :wait_writable
+					@io.wait_writable(@io.timeout) or raise ::IO::TimeoutError, "write timeout"
+				else
+					if result == buffer.bytesize
+						return
+					else
+						buffer = buffer.byteslice(result, buffer.bytesize)
+					end
+				end
+			end
 		end
 		
 		# Reads data from the underlying stream as efficiently as possible.
@@ -81,9 +104,9 @@ module IO::Stream
 				
 				case result
 				when :wait_readable
-					@io.wait_readable
+					@io.wait_readable(@io.timeout) or raise ::IO::TimeoutError, "read timeout"
 				when :wait_writable
-					@io.wait_writable
+					@io.wait_writable(@io.timeout) or raise ::IO::TimeoutError, "write timeout"
 				else
 					return result
 				end

data/lib/io/stream/generic.rb

@@ -5,8 +5,9 @@
 
 require_relative 'string_buffer'
 
-require_relative '../buffered'
-require_relative '../readable'
+require_relative 'shim/buffered'
+require_relative 'shim/readable'
+require_relative 'shim/timeout'
 
 require_relative 'openssl'
 

data/lib/io/stream/openssl.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
 require 'openssl'
 
 module OpenSSL
@@ -26,6 +31,18 @@ module OpenSSL
 					to_io.wait_writable(...)
 				end
 			end
+			
+			unless method_defined?(:timeout)
+				def timeout
+					to_io.timeout
+				end
+			end
+			
+			unless method_defined?(:timeout=)
+				def timeout=(value)
+					to_io.timeout = value
+				end
+			end
 		end
 	end
 end

data/lib/io/stream/shim/shim.md

@@ -0,0 +1,4 @@
+# Shims
+
+Several shims are included for compatibility.
+

data/lib/io/stream/shim/timeout.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class IO
+	unless const_defined?(:TimeoutError)
+		# Compatibility shim.
+		class TimeoutError < IOError
+		end
+	end
+	
+	unless method_defined?(:timeout)
+		# Compatibility shim.
+		attr_accessor :timeout
+	end
+end

data/lib/io/stream/version.rb

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

data/lib/io/stream.rb

@@ -4,7 +4,7 @@
 # Copyright, 2023-2024, by Samuel Williams.
 
 require_relative 'stream/version'
-require_relative 'stream/buffered_stream'
+require_relative 'stream/buffered'
 
 class IO
 	module Stream

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-stream
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -45,12 +45,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/io/buffered.rb
-- lib/io/readable.rb
 - lib/io/stream.rb
 - lib/io/stream/buffered.rb
 - lib/io/stream/generic.rb
 - lib/io/stream/openssl.rb
+- lib/io/stream/shim/buffered.rb
+- lib/io/stream/shim/readable.rb
+- lib/io/stream/shim/shim.md
+- lib/io/stream/shim/timeout.rb
 - lib/io/stream/string_buffer.rb
 - lib/io/stream/version.rb
 - license.md