protocol-http 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb1197435097557cab74b1b61b92fe0a15a938892dd07486ee9f9db06360decd
-  data.tar.gz: 78bcbbd73817b03ce63b55b2bbd4408afeaeaa127e3c19f9dfd5d6ddb120f05d
+  metadata.gz: b60538bc2a8f661748e6a70b92bf46932440e56f69e0cb22348fa14b0c59706f
+  data.tar.gz: 9a6629a169c0afff229eed8b660fc94c918cc9f0a953e5251b5f5f283e4e28fa
 SHA512:
-  metadata.gz: 34db4e5940f59773708692bc080706be457f9f41445b6858e01da474f0ba36aba31d8d8c2f3ccd329f2120f412d9c4bcc42c568c057db3e0cef816c83ab34db1
-  data.tar.gz: 23baab35d26b5b367fa556d4a302f81680b944fef07b2ca0a581fab7b36ac8320cb3c4a62cdc50f8cfd21efb408eee01e348c06b4c538a5cfbcf8cd6ce99b28f
+  metadata.gz: 707f195fa9b7b2bfe446b6a2132dfe608570ec8fed696c8df558686e80da07c5026fac90941109dc7d743e3806daf8fdfb4d28ce051ba1412242b8fde4f45a99
+  data.tar.gz: 41a940d1dee93bc30d90fc0ae63fa34103d82379862c502a2ec11ec6f06521491e8eb6586ef43707957ff8ebc7f7016e893ad3b88751e93fdcf14976de8227d2

data/lib/protocol/http/body/stream.rb

@@ -273,8 +273,8 @@ module Protocol
 				
 				# Close the input and output bodies.
 				def close(error = nil)
-					self.close_read
-					self.close_write
+					self.close_read(error)
+					self.close_write(error)
 					
 					return nil
 				ensure

data/lib/protocol/http/body/streamable.rb

@@ -17,20 +17,12 @@ module Protocol
 			#
 			# When invoking `call(stream)`, the stream can be read from and written to, and closed. However, the stream is only guaranteed to be open for the duration of the `call(stream)` call. Once the method returns, the stream **should** be closed by the server.
 			module Streamable
-				def self.new(*arguments)
-					if arguments.size == 1
-						DeferredBody.new(*arguments)
-					else
-						Body.new(*arguments)
-					end
-				end
-				
 				def self.request(&block)
-					DeferredBody.new(block)
+					RequestBody.new(block)
 				end
 				
 				def self.response(request, &block)
-					Body.new(block, request.body)
+					ResponseBody.new(block, request.body)
 				end
 				
 				class Output
@@ -109,32 +101,37 @@ module Protocol
 						raise
 					end
 					
-					# Closing a stream indicates we are no longer interested in reading from it.
-					def close(error = nil)
-						if output = @output
-							@output = nil
-							# Closing the output here may take some time, as it may need to finish handling the stream:
-							output.close(error)
-						end
-						
+					def close_input(error = nil)
 						if input = @input
 							@input = nil
 							input.close(error)
 						end
 					end
+					
+					def close_output(error = nil)
+						@output&.close(error)
+					end
 				end
 				
-				# A deferred body has an extra `stream` method which can be used to stream data into the body, as the response body won't be available until the request has been sent.
-				class DeferredBody < Body
+				# A response body is used on the server side to generate the response body using a block.
+				class ResponseBody < Body
+					def close(error = nil)
+						# Close will be invoked when all the output is written.
+						self.close_output(error)
+					end
+				end
+				
+				# A request body is used on the client side to generate the request body using a block.
+				#
+				# As the response body isn't available until the request is sent, the response body must be {stream}ed into the request body.
+				class RequestBody < Body
 					def initialize(block)
 						super(block, Writable.new)
 					end
 					
-					# Closing a stream indicates we are no longer interested in reading from it, but in this case that does not mean that the output block is finished generating data.
 					def close(error = nil)
-						if error
-							super
-						end
+						# Close will be invoked when all the input is read.
+						self.close_input(error)
 					end
 					
 					# Stream the response body into the block's input.
@@ -143,7 +140,6 @@ module Protocol
 							@input.write(chunk)
 						end
 					rescue => error
-						raise
 					ensure
 						@input.close_write(error)
 					end

data/lib/protocol/http/body/writable.rb

@@ -55,7 +55,14 @@ module Protocol
 						raise @error
 					end
 					
-					@queue.pop
+					# This operation may result in @error being set.
+					chunk = @queue.pop
+					
+					if @error
+						raise @error
+					end
+					
+					return chunk
 				end
 				
 				# Write a single chunk to the body. Signal completion by calling `#finish`.
@@ -118,7 +125,11 @@ module Protocol
 				end
 				
 				def inspect
-					"\#<#{self.class} #{@count} chunks written, #{status}>"
+					if @error
+						"\#<#{self.class} #{@count} chunks written, #{status}, error=#{@error}>"
+					else
+						"\#<#{self.class} #{@count} chunks written, #{status}>"
+					end
 				end
 				
 				private

data/lib/protocol/http/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module HTTP
-		VERSION = "0.34.0"
+		VERSION = "0.35.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -47,7 +47,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-09-16 00:00:00.000000000 Z
 dependencies: []
 description:
 email: