protocol-rack 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d3039968903e553afd725e0d5452f7d4b3975c9596b20ebbe2eeba354e83dba
-  data.tar.gz: 2b692f3676d057dc9c5b380bf13a5c1f79fc23df08f952b2a7b8d79786cb0713
+  metadata.gz: a0994443c638a7cf147afcb7a8b88a1a6e5e8ab607071c10792d65c912fb9b37
+  data.tar.gz: 22a6c27089e34db868a7af15fac1061979791872c811aef51762b68435fb9346
 SHA512:
-  metadata.gz: b839c48ff5275a8599c4cc98feb27501e4c84815d0945a9a78f239391cae24cbfb2eaf25142986deaccc6b95a184e6e4a9638d6634d210e02021388ddba3d172
-  data.tar.gz: f26a5aed151fcb2a253a36b9ffed7116665f8c16aac2d17523c6da3f5afc868331e038f2fd4c187e50fd21452cf2daacecbae376d4d80ce3832659f05b353fb6
+  metadata.gz: 60caa82495eb534bfb3367009b7567304c1c36b2db646fbee99d7c68eaba810c9913ad8c847c7939e0d60bb29bd049bdfb67ff365f68f9142b65d6cf7a7bf8f8
+  data.tar.gz: 63313385d9603b0bdaddeb39410dbcf7a3485652478d886ffbb5e8ea926a1b5006bcbd21bdc3b6a3851e43f1f601ded523021d700cd00dd0d2ab252b529378fa

data/lib/protocol/rack/adapter/generic.rb

@@ -119,7 +119,7 @@ module Protocol
 					
 					# HTTP/2 prefers `:authority` over `host`, so we do this for backwards compatibility.
 					env[CGI::HTTP_HOST] ||= request.authority
-								
+					
 					if peer = request.peer
 						env[CGI::REMOTE_ADDR] = peer.ip_address
 					end

data/lib/protocol/rack/input.rb

@@ -4,7 +4,7 @@
 # Copyright, 2022-2025, by Samuel Williams.
 # Copyright, 2023, by Genki Takiuchi.
 
-require "protocol/http/body/stream"
+require "io/stream/readable"
 
 module Protocol
 	module Rack
@@ -14,22 +14,21 @@ module Protocol
 		#
 		# This implementation is not always rewindable, to avoid buffering the input when handling large uploads. See {Rewindable} for more details.
 		class Input
+			include IO::Stream::Readable
+			
 			# Initialize the input wrapper.
 			# @parameter body [Protocol::HTTP::Body::Readable]
-			def initialize(body)
+			def initialize(body, ...)
 				@body = body
 				@closed = false
 				
-				# Will hold remaining data in `#read`.
-				@buffer = nil
+				super(...)
 			end
 			
 			# The input body.
 			# @attribute [Protocol::HTTP::Body::Readable]
 			attr :body
 			
-			include Protocol::HTTP::Body::Stream::Reader
-			
 			# Enumerate chunks of the request body.
 			# @yields {|chunk| ...}
 			# 	@parameter chunk [String]
@@ -65,7 +64,6 @@ module Protocol
 					# If the body is not rewindable, this will fail.
 					@body.rewind
 					
-					@buffer = nil
 					@finished = false
 					@closed = false
 					
@@ -87,7 +85,11 @@ module Protocol
 			
 			private
 			
-			def read_next
+			def flush
+				# No-op.
+			end
+			
+			def sysread(size, buffer = nil)
 				if @body
 					# User's may forget to call #close...
 					if chunk = @body.read
@@ -98,7 +100,15 @@ module Protocol
 							@closed = true
 						end
 						
-						return chunk
+						if buffer
+							# If a buffer is provided, we copy the chunk into it:
+							buffer.replace(chunk)
+						else
+							# Otherwise we return the chunk directly:
+							buffer = chunk
+						end
+						
+						return buffer
 					else
 						unless @closed
 							# So if we are at the end of the stream, we close it automatically:

data/lib/protocol/rack/response.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022-2024, by Samuel Williams.
+# Copyright, 2022-2025, by Samuel Williams.
 
 require_relative "body"
 require_relative "constants"

data/lib/protocol/rack/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module Rack
-		VERSION = "0.14.0"
+		VERSION = "0.15.0"
 	end
 end

data/readme.md

@@ -67,6 +67,10 @@ run proc{|env|
 
 Please see the [project releases](https://socketry.github.io/protocol-rack/releases/index) for all releases.
 
+### v0.15.0
+
+  - Use `IO::Stream::Readable` for the input body, which is a better tested and more robust interface.
+
 ### v0.14.0
 
   - Handling of `HEAD` requests is now more robust.

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v0.15.0
+
+  - Use `IO::Stream::Readable` for the input body, which is a better tested and more robust interface.
+
 ## v0.14.0
 
   - Handling of `HEAD` requests is now more robust.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-rack
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -40,6 +40,20 @@ cert_chain:
   -----END CERTIFICATE-----
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: io-stream
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: protocol-http
   requirement: !ruby/object:Gem::Requirement