protocol-rack 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6af833f22e0c72b843fb6abd8497a49177d41f964087c7dea8b7c5f4c9e7036
-  data.tar.gz: 9dd305e81599e12dce90c2a4f8f268f78e438c8268016914a373c22db15202ec
+  metadata.gz: 13aa77d7f39b9732297e162e2157d6c9b3dd579b70cedc06623cdc85eea32bac
+  data.tar.gz: eafafa88ee86951e68fe6cd46e28f925b252e9b077ebc774c4c9f3a647935b4d
 SHA512:
-  metadata.gz: 71724669695ee82106f8f454405aab15127a1e4a0f8e41607104bf7dee85d4f458cee2c4399f4ba8cde1dccd3a8a23daa278e33984f3e2fdbc8a4eedb16c3c2b
-  data.tar.gz: f498823e4ef6522b1c8f3bea9e58090c87c52163237a59d6ac257233bb13cc9c3430ec18792475ddfd6bac5a2cd51fae67c49b5261c1d51fd1b71fa62d24354b
+  metadata.gz: 7da7c63533c0623eb000b3b435bd6358f44278cc2bbffecf670969478b239d6501a8b1bf766a867761095baf71c87228bbed6be57b0a0952c4fe6e6d0bc60e8c
+  data.tar.gz: 9b1f1bc5f511119bbd03f6818b3deaed7263cd80fd062829a2fe23f2bb5b0b6b086fa4904120858dc45158e5d7ecb37fb26d4b198dc48cb39e51f5d062ffa131

data/context/index.yaml

@@ -3,6 +3,8 @@
 ---
 description: An implementation of the Rack protocol/specification.
 metadata:
+  bug_tracker_uri: https://github.com/socketry/protocol-rack/issues
+  changelog_uri: https://github.com/socketry/protocol-rack/blob/main/releases.md
   documentation_uri: https://socketry.github.io/protocol-rack/
   source_code_uri: https://github.com/socketry/protocol-rack.git
 files:

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

@@ -44,6 +44,10 @@ module Protocol
 					raise ArgumentError, "App must be callable!" unless @app.respond_to?(:call)
 				end
 				
+				# Rack does not define an application lifecycle hook, so there is nothing to close.
+				def close
+				end
+				
 				# The logger to use for this adapter.
 				# 
 				# @returns [Console] The console logger.

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2026, by Samuel Williams.
+
+require "rack"
+
+module Protocol
+	module Rack
+		module Adapter
+			# The version of Rack being used. Can be overridden using the PROTOCOL_RACK_ADAPTER_VERSION environment variable.
+			VERSION = ENV.fetch("PROTOCOL_RACK_ADAPTER_VERSION", ::Rack.release)
+		end
+	end
+end

data/lib/protocol/rack/adapter.rb

@@ -3,7 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2022-2026, by Samuel Williams.
 
-require "rack"
+require_relative "adapter/version"
 
 module Protocol
 	module Rack
@@ -16,9 +16,6 @@ module Protocol
 		# response = adapter.call(request)
 		# ```
 		module Adapter
-			# The version of Rack being used. Can be overridden using the PROTOCOL_RACK_ADAPTER_VERSION environment variable.
-			VERSION = ENV.fetch("PROTOCOL_RACK_ADAPTER_VERSION", ::Rack.release)
-			
 			if VERSION >= "3.1"
 				require_relative "adapter/rack31"
 				IMPLEMENTATION = Rack31

data/lib/protocol/rack/body/enumerable.rb

@@ -7,6 +7,8 @@ require "protocol/http/body/readable"
 require "protocol/http/body/buffered"
 require "protocol/http/body/file"
 
+require_relative "../adapter/version"
+
 module Protocol
 	module Rack
 		module Body
@@ -17,18 +19,30 @@ module Protocol
 				# The content-length header key.
 				CONTENT_LENGTH = "content-length".freeze
 				
-				# Wraps a Rack response body into an {Enumerable} instance.
-				# If the body is an Array, its total size is calculated automatically.
-				# 
-				# @parameter body [Object] The Rack response body that responds to `each`.
-				# @parameter length [Integer] Optional content length of the response body.
-				# @returns [Enumerable] A new enumerable body instance.
-				def self.wrap(body, length = nil)
-					if body.respond_to?(:to_ary)
-						# This avoids allocating an enumerator, which is more efficient:
-						return ::Protocol::HTTP::Body::Buffered.new(body.to_ary, length)
-					else
-						return self.new(body, length)
+				if Adapter::VERSION >= "3"
+					# Wraps a Rack response body into an {Enumerable} instance.
+					# If the body is an Array, its total size is calculated automatically.
+					# 
+					# @parameter body [Object] The Rack response body that responds to `each`.
+					# @parameter length [Integer] Optional content length of the response body.
+					# @returns [Enumerable] A new enumerable body instance.
+					def self.wrap(body, length = nil)
+						if body.respond_to?(:to_ary)
+							# This avoids allocating an enumerator, which is more efficient:
+							return ::Protocol::HTTP::Body::Buffered.new(body.to_ary, length)
+						else
+							return self.new(body, length)
+						end
+					end
+				else
+					def self.wrap(body, length = nil)
+						# Rack 2 does not specify or implement `to_ary` behaviour correctly, so the best we can do is check if it's an Array directly:
+						if body.is_a?(Array)
+							# This avoids allocating an enumerator, which is more efficient:
+							return ::Protocol::HTTP::Body::Buffered.new(body, length)
+						else
+							return self.new(body, length)
+						end
 					end
 				end
 				
@@ -89,7 +103,7 @@ module Protocol
 				# @yields {|chunk| ...}
 				# 	@parameter chunk [String] A chunk of the response body.
 				def each(&block)
-					@body.each(&block)
+					@body&.each(&block)
 				rescue => error
 					raise
 				ensure

data/lib/protocol/rack/input.rb

@@ -60,10 +60,7 @@ module Protocol
 			#
 			# @returns [Boolean] Whether the body could be rewound.
 			def rewind
-				if @body and @body.respond_to?(:rewind)
-					# If the body is not rewindable, this will fail.
-					@body.rewind
-					
+				if @body&.rewind
 					@finished = false
 					@closed = false
 					

data/lib/protocol/rack/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module Rack
-		VERSION = "0.22.0"
+		VERSION = "0.23.0"
 	end
 end

data/readme.md

@@ -21,6 +21,16 @@ Please see the [project documentation](https://socketry.github.io/protocol-rack/
 
 Please see the [project releases](https://socketry.github.io/protocol-rack/releases/index) for all releases.
 
+### v0.23.0
+
+  - Respect the result of rewinding the underlying request body.
+  - Avoid enumerating a response body after it has been closed.
+  - Add the missing `console` runtime dependency.
+
+### v0.22.1
+
+  - Rack 2 should not use `to_ary`.
+
 ### v0.22.0
 
   - Prefer `Protocol::HTTP::Body::Buffered` where possible for enumerable bodies, mainly to avoid creating `Enumerable`s.
@@ -54,23 +64,31 @@ Please see the [project releases](https://socketry.github.io/protocol-rack/relea
 
   - Hijacked IO is no longer duped, as it's not retained by the original connection, and `SSLSocket` does not support duping.
 
-### 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.
-
 ## Contributing
 
 We welcome contributions to this project.
 
-1.  Fork it.
+1.  Fork the repository.
 2.  Create your feature branch (`git checkout -b my-new-feature`).
-3.  Commit your changes (`git commit -am 'Add some feature'`).
+3.  Commit your changes (`git commit -am 'Add some feature.'`).
 4.  Push to the branch (`git push origin my-new-feature`).
-5.  Create new Pull Request.
+5.  Create a new pull request.
+
+### Running Tests
+
+To run the test suite:
+
+``` bash
+$ bundle exec sus
+```
+
+### Making Releases
+
+To make a new release:
+
+``` bash
+$ bundle exec bake gem:release:patch # or minor or major
+```
 
 ### Developer Certificate of Origin
 

data/releases.md

@@ -1,5 +1,15 @@
 # Releases
 
+## v0.23.0
+
+  - Respect the result of rewinding the underlying request body.
+  - Avoid enumerating a response body after it has been closed.
+  - Add the missing `console` runtime dependency.
+
+## v0.22.1
+
+  - Rack 2 should not use `to_ary`.
+
 ## v0.22.0
 
   - Prefer `Protocol::HTTP::Body::Buffered` where possible for enumerable bodies, mainly to avoid creating `Enumerable`s.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-rack
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.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: console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: io-stream
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +109,7 @@ files:
 - lib/protocol/rack/adapter/rack2.rb
 - lib/protocol/rack/adapter/rack3.rb
 - lib/protocol/rack/adapter/rack31.rb
+- lib/protocol/rack/adapter/version.rb
 - lib/protocol/rack/body.rb
 - lib/protocol/rack/body/enumerable.rb
 - lib/protocol/rack/body/input_wrapper.rb
@@ -112,6 +127,8 @@ homepage: https://github.com/socketry/protocol-rack
 licenses:
 - MIT
 metadata:
+  bug_tracker_uri: https://github.com/socketry/protocol-rack/issues
+  changelog_uri: https://github.com/socketry/protocol-rack/blob/main/releases.md
   documentation_uri: https://socketry.github.io/protocol-rack/
   source_code_uri: https://github.com/socketry/protocol-rack.git
 rdoc_options: []
@@ -128,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.10
 specification_version: 4
 summary: An implementation of the Rack protocol/specification.
 test_files: []