protocol-http 0.28.1 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a890dc1781e2ea174d0f534394aa9f22fe4324b8bdffca39960e3e6d74f555aa
-  data.tar.gz: 44d2ff083bce62bd4f33c3310734b09565abda466c976cb84b92c984c25b9642
+  metadata.gz: e5839d2adb8415083224423beb2d5a3c0a50e22090a75424276e1a0939cc800a
+  data.tar.gz: 0517ecffe3b1f6c486b1cba2b5cbf4b3b7a8daf2cb11469b73d0d61cb5492cb1
 SHA512:
-  metadata.gz: 00cfd9adcdd9cf55455bc0e87a1729b721d7db85b858d83f3695e160c8541c76b719ed0d2d2f9b04eb458cc1d4b829a8e9f075cf4eab39275081b29152d28b3c
-  data.tar.gz: b01e10053404dfa78f2d20ed6fa9fd320623efc2b3fe255ad30864153207d00ba58b0b829898c7f7b900a7506ec7ad0126b1aefc4da22a9811ed23401f6e6e73
+  metadata.gz: 5fe865bc6ae53bfbd34ca9e43c6c38d2dcb3874b0655b1960936960b690cfefc0203ecde64ea7ea3af17a8a1093382d98f419e5d88b24708af99ef210a282e7e
+  data.tar.gz: 5c576ba8d79c0c6d21022d224b936f307640e2a785685cb82ec2eb0da588fcc8cbb215d2b7a05572ab91274978acc1f3a39edc0dfb5946fbef32dafa51389296

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

@@ -11,25 +11,29 @@ module Protocol
 		module Body
 			# A body which buffers all it's contents.
 			class Buffered < Readable
-				# Wraps an array into a buffered body.
+				# Tries to wrap an object in a {Buffered} instance.
 				#
 				# For compatibility, also accepts anything that behaves like an `Array(String)`.
 				#
 				# @parameter body [String | Array(String) | Readable | nil] the body to wrap.
 				# @returns [Readable | nil] the wrapped body or nil if nil was given.
-				def self.wrap(body)
-					if body.is_a?(Readable)
-						return body
-					elsif body.is_a?(Array)
-						return self.new(body)
-					elsif body.is_a?(String)
-						return self.new([body])
-					elsif body
-						return self.for(body)
+				def self.wrap(object)
+					if object.is_a?(Readable)
+						return object
+					elsif object.is_a?(Array)
+						return self.new(object)
+					elsif object.is_a?(String)
+						return self.new([object])
+					elsif object
+						return self.read(object)
 					end
 				end
 				
-				def self.for(body)
+				# Read the entire body into a buffered representation.
+				#
+				# @parameter body [Readable] the body to read.
+				# @returns [Buffered] the buffered body.
+				def self.read(body)
 					chunks = []
 					
 					body.each do |chunk|
@@ -77,8 +81,14 @@ module Protocol
 					@chunks << chunk
 				end
 				
+				def rewindable?
+					true
+				end
+				
 				def rewind
 					@index = 0
+					
+					return true
 				end
 				
 				def inspect

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

@@ -24,6 +24,14 @@ module Protocol
 					@callback = callback
 				end
 				
+				def rewindable?
+					false
+				end
+				
+				def rewind
+					false
+				end
+				
 				def finish
 					super.tap do
 						if @callback

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

@@ -29,6 +29,14 @@ module Protocol
 					false
 				end
 				
+				def rewindable?
+					false
+				end
+				
+				def rewind
+					false
+				end
+				
 				def length
 					nil
 				end
@@ -58,7 +66,7 @@ module Protocol
 				# @returns [Buffered] The buffered body.
 				def finish
 					# Internally, this invokes `self.each` which then invokes `self.close`.
-					Buffered.for(self)
+					Buffered.read(self)
 				end
 				
 				# Enumerate all chunks until finished, then invoke `#close`.

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

@@ -11,6 +11,16 @@ module Protocol
 		module Body
 			# A body which buffers all it's contents as it is `#read`.
 			class Rewindable < Wrapper
+				def self.wrap(message)
+					if body = message.body
+						if body.rewindable?
+							body
+						else
+							message.body = self.new(body)
+						end
+					end
+				end
+				
 				def initialize(body)
 					super(body)
 					
@@ -26,7 +36,9 @@ module Protocol
 					(@index < @chunks.size) || super
 				end
 				
-				# A rewindable body wraps some other body. Convert it to a buffered body 
+				# A rewindable body wraps some other body. Convert it to a buffered body. The buffered body will share the same chunks as the rewindable body.
+				#
+				# @returns [Buffered] the buffered body. 
 				def buffered
 					Buffered.new(@chunks)
 				end
@@ -54,6 +66,10 @@ module Protocol
 					@index = 0
 				end
 				
+				def rewindable?
+					true
+				end
+				
 				def inspect
 					"\#<#{self.class} #{@index}/#{@chunks.size} chunks read>"
 				end

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

@@ -89,12 +89,25 @@ module Protocol
 					# Will avoid reading from the underlying stream if there is buffered data available.
 					#
 					# @parameter length [Integer] The maximum number of bytes to read.
-					def read_partial(length = nil)
+					def read_partial(length = nil, buffer = nil)
 						if @buffer
-							buffer = @buffer
+							if buffer
+								buffer.replace(@buffer)
+							else
+								buffer = @buffer
+							end
 							@buffer = nil
 						else
-							buffer = read_next
+							if chunk = read_next
+								if buffer
+									buffer.replace(chunk)
+								else
+									buffer = chunk
+								end
+							else
+								buffer&.clear
+								buffer = nil
+							end
 						end
 						
 						if buffer and length
@@ -111,8 +124,8 @@ module Protocol
 					end
 					
 					# Similar to {read_partial} but raises an `EOFError` if the stream is at EOF.
-					def readpartial(length)
-						read_partial(length) or raise EOFError, "End of file reached!"
+					def readpartial(length, buffer = nil)
+						read_partial(length, buffer) or raise EOFError, "End of file reached!"
 					end
 					
 					# Read data from the stream without blocking if possible.

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

@@ -10,6 +10,10 @@ module Protocol
 		module Body
 			# Wrapping body instance. Typically you'd override `#read`.
 			class Wrapper < Readable
+				# Wrap the body of the given message in a new instance of this class.
+				#
+				# @parameter message [Request | Response] the message to wrap.
+				# @returns [Wrapper | nil] the wrapped body or nil if the body was nil.
 				def self.wrap(message)
 					if body = message.body
 						message.body = self.new(body)
@@ -42,6 +46,14 @@ module Protocol
 					@body.ready?
 				end
 				
+				def rewind
+					@body.rewind
+				end
+				
+				def rewindable?
+					@body.rewindable?
+				end
+				
 				def length
 					@body.length
 				end

data/lib/protocol/http/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module HTTP
-		VERSION = "0.28.1"
+		VERSION = "0.29.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.29.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -47,7 +47,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-07-19 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies: []
 description:
 email: