protocol-rack 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9ac7ef853c3b25a46b06d630fc29921d76e8ee0213554d94afa19efdb9ccd87
-  data.tar.gz: ce65dd607e37ee33c6f20ecd4b0fa5976634be40869ac9d0add4e197d43d8cd7
+  metadata.gz: 63abbb92ce268dc594b9464a931bb846808788db40a11a5c5aae81b64552eb30
+  data.tar.gz: bd369d97c603d06cce3088f6d2f785c12fb20c52cc038d31d860d107cabd301c
 SHA512:
-  metadata.gz: 7ea217d520678401acc7d89d5a592e958bc47bcffc07439c02f4f52e2df89c0cf0391e2f6fbb6c6a94be7e2f31a0b2757d2ccc389a7ae72311e3f7a30f388c47
-  data.tar.gz: a9e4587094746830e41a449892bc19c9fb43c7d5625529f321f8e5e72e0422908703719b0bdd983f96ea18f1a13f6697dbd06e254aa62e554cabf3356d97ba61
+  metadata.gz: d7058394c8f576c1cbff70179dcde738d6c31036c01ef264178056281dac28195e2dc19a14c21242b22c00f8db695fd73a8836c0125e9e60c4f37010ed537c15
+  data.tar.gz: 8c73f392e0bb354693eb2a5063f5add1d5feccf13d5155991870b9d216f59dad31ae4831b5825cd0a47871799b4433eedc36e64b01d6656cefe157eb519882d4

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022-2023, by Samuel Williams.
+# Copyright, 2022-2024, by Samuel Williams.
 
 require 'console'
 
@@ -45,7 +45,11 @@ module Protocol
 						http_key = "HTTP_#{key.upcase.tr('-', '_')}"
 						
 						if current_value = env[http_key]
-							env[http_key] = "#{current_value};#{value}"
+							if http_key == CGI::HTTP_COOKIE
+								env[http_key] = "#{current_value};#{value}"
+							else
+								env[http_key] = "#{current_value},#{value}"
+							end
 						else
 							env[http_key] = value
 						end
@@ -138,6 +142,20 @@ module Protocol
 				def failure_response(exception)
 					Protocol::HTTP::Response.for_exception(exception)
 				end
+				
+				def self.extract_protocol(env, response, headers)
+					if protocol = response.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
+							headers['connection'] = 'upgrade'
+						end
+					end
+				end
 			end
 		end
 	end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022-2023, by Samuel Williams.
+# Copyright, 2022-2024, by Samuel Williams.
 
 require 'console'
 
@@ -11,7 +11,7 @@ require_relative '../rewindable'
 module Protocol
 	module Rack
 		module Adapter
-			class Rack2	< Generic
+			class Rack2 < Generic
 				RACK_VERSION = 'rack.version'
 				RACK_MULTITHREAD = 'rack.multithread'
 				RACK_MULTIPROCESS = 'rack.multiprocess'
@@ -121,9 +121,7 @@ module Protocol
 					# These interfaces should be largely compatible:
 					headers = response.headers.to_h
 					
-					if protocol = response.protocol
-						headers['rack.protocol'] = protocol
-					end
+					self.extract_protocol(env, response, headers)
 					
 					if body = response.body and body.stream?
 						if env[RACK_IS_HIJACK]

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2024, by Samuel Williams.
 
 require 'console'
 
@@ -92,9 +92,8 @@ module Protocol
 				def self.make_response(env, response)
 					# These interfaces should be largely compatible:
 					headers = response.headers.to_h
-					if protocol = response.protocol
-						headers['rack.protocol'] = protocol
-					end
+					
+					self.extract_protocol(env, response, headers)
 					
 					if body = response.body and body.stream?
 						# Force streaming response:

data/lib/protocol/rack/adapter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022-2023, by Samuel Williams.
+# Copyright, 2022-2024, by Samuel Williams.
 
 require 'rack'
 

data/lib/protocol/rack/constants.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2024, by Samuel Williams.
 
 module Protocol
 	module Rack
@@ -25,6 +25,8 @@ module Protocol
 			CONTENT_TYPE = 'CONTENT_TYPE'
 			CONTENT_LENGTH = 'CONTENT_LENGTH'
 			
+			HTTP_COOKIE = 'HTTP_COOKIE'
+			
 			# Header constants:
 			HTTP_X_FORWARDED_PROTO = 'HTTP_X_FORWARDED_PROTO'
 		end

data/lib/protocol/rack/input.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022-2023, by Samuel Williams.
+# Copyright, 2022-2024, by Samuel Williams.
 # Copyright, 2023, by Genki Takiuchi.
 
-require 'async/io/buffer'
 require 'protocol/http/body/stream'
 
 module Protocol

data/lib/protocol/rack/response.rb

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

data/lib/protocol/rack/version.rb

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

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright, 2022-2023, by Samuel Williams.  
+Copyright, 2022-2024, by Samuel Williams.  
 Copyright, 2023, by Genki Takiuchi.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/readme.md

@@ -77,7 +77,7 @@ This project uses the [Developer Certificate of Origin](https://developercertifi
 
 ### Contributor Covenant
 
-This project is governed by [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
+This project is governed by the [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
 
 ## See Also
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-rack
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -38,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-04-03 00:00:00.000000000 Z
+date: 2024-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http
@@ -94,7 +94,9 @@ files:
 homepage: https://github.com/socketry/protocol-rack
 licenses:
 - MIT
-metadata: {}
+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:
@@ -103,14 +105,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: An implementation of the Rack protocol/specification.