protocol-http 0.23.2 → 0.23.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 947e9baba3d2edfe763209d4e035c7f985a03ca820340c7ea3175ff309176c5c
-  data.tar.gz: af8d0fb37ac0c458fc4cf4cb314de5c6f0a4167e46a29687b76845a75d12c815
+  metadata.gz: 647e0b3ea883053a0181b4a47623893d9cf9a9effdbe4ebb001fc4788ac504fc
+  data.tar.gz: a8b9f1d185f320acc1f84c5af015bc28ac0cbd165bb2c92ab8c6b9f950e311db
 SHA512:
-  metadata.gz: 133527d39a2eb474635e0cc56a0912c3812b7035bb4e6594a02f392e2275fd014028157198604da3359593351d7b2016ce83db0a28247a0af3f19c01822f004a
-  data.tar.gz: 9d342750268c9cb5e1d33ce339417f5930cc28a3efb3f2f9be0bb608ca751208619f3b11ea598fa022199d7e01512b50445a29c0c2d1dc0fe1616c15fe434568
+  metadata.gz: 7193d7634fb0a006320f6199ba3a2ac1985412f9dfe46bc6610745741088045c14ef561efb5d9efa4e9de42ac797fe4d778f28eb6c5442ae482c733a8f273e4b
+  data.tar.gz: 03c36e9c6f5010bdcdbc1dc4c26ea19e55169897eba6efb0b1bf0fe98498f205c364093045f44307d15c4f65bac7ccc05e4a0d4624427b319e7b9b138ea9cd39

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

@@ -56,7 +56,6 @@ module Protocol
 					@length = length
 					
 					@index = 0
-					@digest = nil
 				end
 				
 				attr :chunks
@@ -87,7 +86,6 @@ module Protocol
 				end
 				
 				def write(chunk)
-					@digest&.update(chunk)
 					@chunks << chunk
 				end
 				

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

@@ -41,100 +41,107 @@ module Protocol
 				attr :input
 				attr :output
 				
-				# rack.hijack_io must respond to:
-				# read, write, read_nonblock, write_nonblock, flush, close, close_read, close_write, closed?
-				
-				# read behaves like IO#read. Its signature is read([length, [buffer]]). If given, length must be a non-negative Integer (>= 0) or nil, and buffer must be a String and may not be nil. If length is given and not nil, then this method reads at most length bytes from the input stream. If length is not given or nil, then this method reads all data until EOF. When EOF is reached, this method returns nil if length is given and not nil, or “” if length is not given or is nil. If buffer is given, then the read data will be placed into buffer instead of a newly created String object.
-				# @param length [Integer] the amount of data to read
-				# @param buffer [String] the buffer which will receive the data
-				# @return a buffer containing the data
-				def read(length = nil, buffer = nil)
-					return '' if length == 0
-					
-					buffer ||= Async::IO::Buffer.new
-
-					# Take any previously buffered data and replace it into the given buffer.
-					if @buffer
-						buffer.replace(@buffer)
-						@buffer = nil
-					end
+				# This provides a read-only interface for data, which is surprisingly tricky to implement correctly.
+				module Reader
+					# rack.hijack_io must respond to:
+					# read, write, read_nonblock, write_nonblock, flush, close, close_read, close_write, closed?
 					
-					if length
-						while buffer.bytesize < length and chunk = read_next
-							buffer << chunk
-						end
+					# read behaves like IO#read. Its signature is read([length, [buffer]]). If given, length must be a non-negative Integer (>= 0) or nil, and buffer must be a String and may not be nil. If length is given and not nil, then this method reads at most length bytes from the input stream. If length is not given or nil, then this method reads all data until EOF. When EOF is reached, this method returns nil if length is given and not nil, or “” if length is not given or is nil. If buffer is given, then the read data will be placed into buffer instead of a newly created String object.
+					# @param length [Integer] the amount of data to read
+					# @param buffer [String] the buffer which will receive the data
+					# @return a buffer containing the data
+					def read(length = nil, buffer = nil)
+						return '' if length == 0
 						
-						# This ensures the subsequent `slice!` works correctly.
-						buffer.force_encoding(Encoding::BINARY)
+						buffer ||= Async::IO::Buffer.new
 
-						# This will be at least one copy:
-						@buffer = buffer.byteslice(length, buffer.bytesize)
-						
-						# This should be zero-copy:
-						buffer.slice!(length)
-						
-						if buffer.empty?
-							return nil
+						# Take any previously buffered data and replace it into the given buffer.
+						if @buffer
+							buffer.replace(@buffer)
+							@buffer = nil
 						else
-							return buffer
-						end
-					else
-						while chunk = read_next
-							buffer << chunk
+							buffer.clear
 						end
 						
-						return buffer
-					end
-				end
-				
-				# Read at most `length` bytes from the stream. Will avoid reading from the underlying stream if possible.
-				def read_partial(length = nil)
-					if @buffer
-						buffer = @buffer
-						@buffer = nil
-					else
-						buffer = read_next
-					end
-					
-					if buffer and length
-						if buffer.bytesize > length
+						if length
+							while buffer.bytesize < length and chunk = read_next
+								buffer << chunk
+							end
+							
 							# This ensures the subsequent `slice!` works correctly.
 							buffer.force_encoding(Encoding::BINARY)
 
+							# This will be at least one copy:
 							@buffer = buffer.byteslice(length, buffer.bytesize)
-							buffer.slice!(length)
+							
+							# This should be zero-copy:
+							buffer.slice!(length, buffer.bytesize)
+							
+							if buffer.empty?
+								return nil
+							else
+								return buffer
+							end
+						else
+							while chunk = read_next
+								buffer << chunk
+							end
+							
+							return buffer
 						end
 					end
 					
-					return buffer
-				end
-				
-				def read_nonblock(length, buffer = nil)
-					@buffer ||= read_next
-					chunk = nil
-					
-					unless @buffer
-						buffer&.clear
-						return
-					end
-					
-					if @buffer.bytesize > length
-						chunk = @buffer.byteslice(0, length)
-						@buffer = @buffer.byteslice(length, @buffer.bytesize)
-					else
-						chunk = @buffer
-						@buffer = nil
+					# Read at most `length` bytes from the stream. Will avoid reading from the underlying stream if possible.
+					def read_partial(length = nil)
+						if @buffer
+							buffer = @buffer
+							@buffer = nil
+						else
+							buffer = read_next
+						end
+						
+						if buffer and length
+							if buffer.bytesize > length
+								# This ensures the subsequent `slice!` works correctly.
+								buffer.force_encoding(Encoding::BINARY)
+
+								@buffer = buffer.byteslice(length, buffer.bytesize)
+								buffer.slice!(length, buffer.bytesize)
+							end
+						end
+						
+						return buffer
 					end
 					
-					if buffer
-						buffer.replace(chunk)
-					else
-						buffer = chunk
+					def read_nonblock(length, buffer = nil)
+						@buffer ||= read_next
+						chunk = nil
+						
+						unless @buffer
+							buffer&.clear
+							return
+						end
+						
+						if @buffer.bytesize > length
+							chunk = @buffer.byteslice(0, length)
+							@buffer = @buffer.byteslice(length, @buffer.bytesize)
+						else
+							chunk = @buffer
+							@buffer = nil
+						end
+						
+						if buffer
+							buffer.replace(chunk)
+						else
+							buffer = chunk
+						end
+						
+						return buffer
 					end
-					
-					return buffer
 				end
 				
+				include Reader
+				
 				def write(buffer)
 					if @output
 						@output.write(buffer)

data/lib/protocol/http/middleware/builder.rb

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../headers'
+require_relative '../middleware'
 
 module Protocol
 	module HTTP

data/lib/protocol/http/middleware.rb

@@ -67,6 +67,15 @@ module Protocol
 					Response[200, Headers['content-type' => 'text/plain'], ["Hello World!"]]
 				end
 			end
+			
+			module NotFound
+				def self.close
+				end
+				
+				def self.call(request)
+					Response[404, Headers[], []]
+				end
+			end
 		end
 	end
 end

data/lib/protocol/http/version.rb

@@ -22,6 +22,6 @@
 
 module Protocol
 	module HTTP
-		VERSION = "0.23.2"
+		VERSION = "0.23.5"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http
 version: !ruby/object:Gem::Version
-  version: 0.23.2
+  version: 0.23.5
 platform: ruby
 authors:
 - Samuel Williams
@@ -41,7 +41,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-08-13 00:00:00.000000000 Z
+date: 2022-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler