protocol-rack 0.15.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0994443c638a7cf147afcb7a8b88a1a6e5e8ab607071c10792d65c912fb9b37
-  data.tar.gz: 22a6c27089e34db868a7af15fac1061979791872c811aef51762b68435fb9346
+  metadata.gz: fbf78ac425bc2df269ede6fc0f60d0d674f11d0e6d3fe5dc07f8c766d534bedb
+  data.tar.gz: e348d48975f98d10401e7198a7a0317483c5b2b42641a78e46e771623c804a8b
 SHA512:
-  metadata.gz: 60caa82495eb534bfb3367009b7567304c1c36b2db646fbee99d7c68eaba810c9913ad8c847c7939e0d60bb29bd049bdfb67ff365f68f9142b65d6cf7a7bf8f8
-  data.tar.gz: 63313385d9603b0bdaddeb39410dbcf7a3485652478d886ffbb5e8ea926a1b5006bcbd21bdc3b6a3851e43f1f601ded523021d700cd00dd0d2ab252b529378fa
+  metadata.gz: f3d717f59f06f4348fc44eba9b650cd8e99ca29ce731f5b2265e835fb95e71e1abaee47a65689903e6de48c23d1bace99c145405ad5a70de7054e2399ed202ce
+  data.tar.gz: b3fa66486f434892b3d076457d3a762fbbe1d76923c46c91e18466b00415767bded9625d13dd52cb88899b0d978915c9e3fb5c5926168ace1b1d4074d570e24e

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

@@ -114,7 +114,7 @@ module Protocol
 					
 					if request.respond_to?(:hijack?) and request.hijack?
 						env[RACK_IS_HIJACK] = true
-						env[RACK_HIJACK] = proc{request.hijack!.io.dup}
+						env[RACK_HIJACK] = proc{request.hijack!.io}
 					end
 					
 					# HTTP/2 prefers `:authority` over `host`, so we do this for backwards compatibility.
@@ -188,7 +188,7 @@ module Protocol
 						# This is the newer mechanism for protocol upgrade:
 						if env["rack.protocol"]
 							headers["rack.protocol"] = protocol
-						
+							
 						# Older mechanism for protocol upgrade:
 						elsif env[CGI::HTTP_UPGRADE]
 							headers["upgrade"] = protocol

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

@@ -44,7 +44,7 @@ module Protocol
 						RACK_INPUT => Input.new(request.body),
 						RACK_ERRORS => $stderr,
 						RACK_LOGGER => self.logger,
-
+						
 						# The HTTP request method, such as "GET" or "POST". This cannot ever be an empty string, and so is always required.
 						CGI::REQUEST_METHOD => request.method,
 						
@@ -55,7 +55,7 @@ module Protocol
 						CGI::PATH_INFO => request_path,
 						CGI::REQUEST_PATH => request_path,
 						CGI::REQUEST_URI => request.path,
-
+						
 						# The portion of the request URL that follows the ?, if any. May be empty, but is always required!
 						CGI::QUERY_STRING => query_string || "",
 						
@@ -68,7 +68,7 @@ module Protocol
 						# I'm not sure what sane defaults should be here:
 						CGI::SERVER_NAME => server_name,
 					}
-
+					
 					# SERVER_PORT is optional but must not be set if it is not present.
 					if server_port
 						env[CGI::SERVER_PORT] = server_port
@@ -116,6 +116,11 @@ module Protocol
 					
 					body&.close if body.respond_to?(:close)
 					
+					# Rack 2 does not include `rack.response_finished` in the specification. However, if the application has set it, we will call the callbacks here as it would be extremely surprising to not do so.
+					env&.[](RACK_RESPONSE_FINISHED)&.each do |callback|
+						callback.call(env, status, headers, exception)
+					end
+					
 					return failure_response(exception)
 				end
 				

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

@@ -100,7 +100,7 @@ module Protocol
 				def stream?
 					!@body.respond_to?(:each)
 				end
-
+				
 				# Stream the response body to the given stream.
 				# The body is automatically closed after streaming.
 				# 
@@ -112,7 +112,7 @@ module Protocol
 				ensure
 					self.close(error)
 				end
-
+				
 				# Read the next chunk from the response body.
 				# Returns nil when there are no more chunks.
 				# 

data/lib/protocol/rack/request.rb

@@ -23,13 +23,13 @@ module Protocol
 			def self.[](env)
 				env["protocol.http.request"] ||= new(env)
 			end
-
+			
 			# Initialize a new Request instance from a Rack environment.
 			# 
 			# @parameter env [Hash] The Rack environment hash.
 			def initialize(env)
 				@env = env
-
+				
 				super(
 					@env["rack.url_scheme"],
 					@env["HTTP_HOST"],
@@ -41,7 +41,7 @@ module Protocol
 					self.class.protocol(@env)
 				)
 			end
-
+			
 			# Extract the protocol list from the Rack environment.
 			# Checks both `rack.protocol` and `HTTP_UPGRADE` headers.
 			# 
@@ -54,7 +54,7 @@ module Protocol
 					return protocols.split(/\s*,\s*/)
 				end
 			end
-
+			
 			# Extract HTTP headers from the Rack environment.
 			# Converts Rack's `HTTP_*` environment variables to proper HTTP headers.
 			# 
@@ -68,7 +68,7 @@ module Protocol
 						headers[key[5..-1].gsub("_", "-").downcase] = value
 					end
 				end
-
+				
 				return headers
 			end
 		end

data/lib/protocol/rack/response.rb

@@ -45,11 +45,11 @@ module Protocol
 				unless ignored.empty?
 					Console.warn(self, "Ignoring hop headers!", ignored: ignored)
 				end
-
+				
 				if hijack_body = meta["rack.hijack"]
 					body = hijack_body
 				end
-
+				
 				body = Body.wrap(env, status, headers, body, request&.body, request&.head?)
 				
 				protocol = meta[RACK_PROTOCOL]

data/lib/protocol/rack/version.rb

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

data/readme.md

@@ -18,26 +18,26 @@ Please see the [project documentation](https://socketry.github.io/protocol-rack/
 Given a rack application, you can adapt it for use on `async-http`:
 
 ``` ruby
-require 'async'
-require 'async/http/server'
-require 'async/http/client'
-require 'async/http/endpoint'
-require 'protocol/rack/adapter'
+require "async"
+require "async/http/server"
+require "async/http/client"
+require "async/http/endpoint"
+require "protocol/rack/adapter"
 
 app = proc{|env| [200, {}, ["Hello World"]]}
 middleware = Protocol::Rack::Adapter.new(app)
 
 Async do
-  endpoint = Async::HTTP::Endpoint.parse("http://localhost:9292")
-  
-  server_task = Async(transient: true) do
-    server = Async::HTTP::Server.new(middleware, endpoint)
-    server.run
-  end
-  
-  client = Async::HTTP::Client.new(endpoint)
-  puts client.get("/").read
-  # "Hello World"
+	endpoint = Async::HTTP::Endpoint.parse("http://localhost:9292")
+	
+	server_task = Async(transient: true) do
+		server = Async::HTTP::Server.new(middleware, endpoint)
+		server.run
+	end
+	
+	client = Async::HTTP::Client.new(endpoint)
+	puts client.get("/").read
+		# "Hello World"
 end
 ```
 
@@ -46,27 +46,35 @@ end
 While not tested, in theory any Rack compatible server can host `Protocol::HTTP` compatible middlewares.
 
 ``` ruby
-require 'protocol/http/middleware'
-require 'protocol/rack'
+require "protocol/http/middleware"
+require "protocol/rack"
 
 # Your native application:
 middleware = Protocol::HTTP::Middleware::HelloWorld
 
-run proc{|env|
-  # Convert the rack request to a compatible rich request object:
-  request = Protocol::Rack::Request[env]
-  
-  # Call your application
-  response = middleware.call(request)
-  
-  Protocol::Rack::Adapter.make_response(env, response)
-}
+run do |env|
+	# Convert the rack request to a compatible rich request object:
+	request = Protocol::Rack::Request[env]
+	
+	# Call your application
+	response = middleware.call(request)
+	
+	Protocol::Rack::Adapter.make_response(env, response)
+end
 ```
 
 ## Releases
 
 Please see the [project releases](https://socketry.github.io/protocol-rack/releases/index) for all releases.
 
+### v0.17.0
+
+  - Support `rack.response_finished` in Rack 2 if it's present in the environment.
+
+### v0.16.0
+
+  - 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.

data/releases.md

@@ -1,5 +1,13 @@
 # Releases
 
+## v0.17.0
+
+  - Support `rack.response_finished` in Rack 2 if it's present in the environment.
+
+## v0.16.0
+
+  - 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.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-rack
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: An implementation of the Rack protocol/specification.
 test_files: []