protocol-rack 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 124bd6a30fd5deaa6da388f3696ab0c78e6449a4725c93c8c7ba2481e588c4c7
-  data.tar.gz: 0453b87af7991026fa5caedb55ab17bee73be495a1487dd19790ec2de54a2b68
+  metadata.gz: 253756f1f94918a43327d8f107e1a614414b6c7eee787d876135454697f3f108
+  data.tar.gz: bfe5453d726e362ac82c06a723d941991da8d6663749a924f8a81c919f6ca798
 SHA512:
-  metadata.gz: 5c51951538967417013133c28b8b45e38826d9620048aaacf97a2a1c7a9da8c28e19ba28e28f1297dbdabece59efef43d33f9130aacd817f04053953f4d6fbc4
-  data.tar.gz: 7ae670685d6e90520cb889a7f03e76620ad13349e0fb94a97d3a57236bdef7f476c0378533f47ac958d13fad03a8134d5318040bfa9136c23ac9f5aa74fcf9a1
+  metadata.gz: 990b93f88c80068cdcf57c36ed0ff8bfeeb0e79044dab843668bf93db4eff71ce4117da113b0cac812625d178603c815ca121d8b233945772a0af289690e053c
+  data.tar.gz: f84b64ec28519ab67db3770d6e2dce6ee86387cbc730a283fe7fa83811da2bb0d6ff831fd05f41ca5c2e8f15b33c92e7864e6ab17ad8335ba965ff3be24505a2

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

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022-2024, by Samuel Williams.
+# Copyright, 2022-2025, by Samuel Williams.
+# Copyright, 2025, by Francisco Mejia.
 
 require "console"
 
@@ -59,8 +60,12 @@ module Protocol
 						
 						# I'm not sure what sane defaults should be here:
 						CGI::SERVER_NAME => server_name,
-						CGI::SERVER_PORT => server_port,
 					}
+
+					# SERVER_PORT is optional but must not be set if it is not present.
+					if server_port
+						env[CGI::SERVER_PORT] = server_port
+					end
 					
 					self.unwrap_request(request, env)
 					

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

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022-2024, by Samuel Williams.
+# Copyright, 2022-2025, by Samuel Williams.
+# Copyright, 2025, by Francisco Mejia.
 
 require "console"
 
@@ -55,8 +56,12 @@ module Protocol
 						
 						# I'm not sure what sane defaults should be here:
 						CGI::SERVER_NAME => server_name,
-						CGI::SERVER_PORT => server_port,
 					}
+
+					# SERVER_PORT is optional but must not be set if it is not present.
+					if server_port
+						env[CGI::SERVER_PORT] = server_port
+					end
 					
 					self.unwrap_request(request, env)
 					

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

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022-2024, by Samuel Williams.
+# Copyright, 2024-2025, by Samuel Williams.
+# Copyright, 2025, by Francisco Mejia.
 
 require "console"
 
@@ -46,8 +47,17 @@ module Protocol
 						
 						# I'm not sure what sane defaults should be here:
 						CGI::SERVER_NAME => server_name,
-						CGI::SERVER_PORT => server_port,
 					}
+
+					# SERVER_PORT is optional but must not be set if it is not present.
+					if server_port
+						env[CGI::SERVER_PORT] = server_port
+					end
+					
+					# The request protocol, either from the upgrade header or the HTTP/2 pseudo header of the same name.
+					if protocol = request.protocol
+						env[RACK_PROTOCOL] = protocol
+					end
 					
 					if body = request.body
 						if body.empty?

data/lib/protocol/rack/body.rb

@@ -5,6 +5,7 @@
 
 require_relative "body/streaming"
 require_relative "body/enumerable"
+require_relative "constants"
 require "protocol/http/body/completable"
 
 module Protocol
@@ -12,6 +13,10 @@ module Protocol
 		module Body
 			CONTENT_LENGTH = "content-length"
 			
+			def self.no_content?(status)
+				status == 204 or status == 205 or status == 304
+			end
+			
 			def self.wrap(env, status, headers, body, input = nil)
 				# In no circumstance do we want this header propagating out:
 				if length = headers.delete(CONTENT_LENGTH)
@@ -33,12 +38,29 @@ module Protocol
 					end
 				elsif body.respond_to?(:each)
 					body = Body::Enumerable.wrap(body, length)
-				else
+				elsif body
 					body = Body::Streaming.new(body, input)
+				else
+					Console.warn(self, "Rack response body was nil, ignoring!")
 				end
 				
-				if response_finished = env[RACK_RESPONSE_FINISHED] and response_finished.any?
-					body = ::Protocol::HTTP::Body::Completable.new(body, completion_callback(response_finished, env, status, headers))
+				if body and no_content?(status)
+					unless body.empty?
+						Console.warn(self, "Rack response body was not empty, and status code indicates no content!", body: body, status: status)
+					end
+					
+					body.close
+					body = nil
+				end
+				
+				response_finished = env[RACK_RESPONSE_FINISHED]
+				
+				if response_finished&.any?
+					if body
+						body = ::Protocol::HTTP::Body::Completable.new(body, completion_callback(response_finished, env, status, headers))
+					else
+						completion_callback(response_finished, env, status, headers).call(nil)
+					end
 				end
 				
 				return body

data/lib/protocol/rack/version.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022-2024, by Samuel Williams.
+# Copyright, 2022-2025, by Samuel Williams.
 
 module Protocol
 	module Rack
-		VERSION = "0.11.1"
+		VERSION = "0.12.0"
 	end
 end

data/license.md

@@ -1,7 +1,8 @@
 # MIT License
 
-Copyright, 2022-2024, by Samuel Williams.  
+Copyright, 2022-2025, by Samuel Williams.  
 Copyright, 2023, by Genki Takiuchi.  
+Copyright, 2025, by Francisco Mejia.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/readme.md

@@ -11,6 +11,8 @@ Provides abstractions for working with the Rack specification on top of [`Protoc
 
 ## Usage
 
+Please see the [project documentation](https://socketry.github.io/protocol-rack/) for more details.
+
 ### Application Adapter
 
 Given a rack application, you can adapt it for use on `async-http`:
@@ -61,6 +63,14 @@ run proc{|env|
 }
 ```
 
+## Releases
+
+Please see the [project releases](https://socketry.github.io/protocol-rack/releases/index) for all releases.
+
+### v0.11.2
+
+  - Stop setting `env["SERVER_PORT"]` to `nil` if not present.
+
 ## Contributing
 
 We welcome contributions to this project.

data/releases.md

@@ -0,0 +1,5 @@
+# Releases
+
+## v0.11.2
+
+  - Stop setting `env["SERVER_PORT"]` to `nil` if not present.

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: protocol-rack
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Samuel Williams
+- Francisco Mejia
 - Genki Takiuchi
-autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -38,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http
@@ -68,8 +68,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-description:
-email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -92,13 +90,13 @@ files:
 - lib/protocol/rack/version.rb
 - license.md
 - readme.md
+- releases.md
 homepage: https://github.com/socketry/protocol-rack
 licenses:
 - MIT
 metadata:
   documentation_uri: https://socketry.github.io/protocol-rack/
   source_code_uri: https://github.com/socketry/protocol-rack.git
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,15 +104,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: An implementation of the Rack protocol/specification.
 test_files: []