protocol-rack 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8eef2db46dd32a4307561b5d6d05b5b3874971473f0a01f669122bba02aa2f4
-  data.tar.gz: 24f7ce0dec015114a5d6a984ef3b3075446fee220975b1a9060100588124d262
+  metadata.gz: abae8a03873e4b82fb2d64d88e0a3014a9fd8c0d9eacca1aeb419fb4651f32f8
+  data.tar.gz: 1d1ae6ec253f7fe688907563ed0cdd16cc2e482325344d36384cd6647b403227
 SHA512:
-  metadata.gz: aaf3f413e3667955841c43dfbd66d0ed930bf0454a9fda0740af3d24ee2cab7055fa3dbe4807f4aa4d7684747e96567216eb9490a412ed68bc6c2a94c125fe60
-  data.tar.gz: b8055752788740184967b2ab59a9c9c612659451797aadadc956358b661e876afe7e8465dfc2ae72e5f4d27be27514a5a70ad76cd726460036ef1c41bc986d58
+  metadata.gz: 65c3cfc64676c05b7c7c380a89d4c1f6ab3fa196899877651a574437c6587dab36c75c46f3a1031afb6e13a2e5bedc3cbbf7d39111bbf873b7875bec0ef43a81
+  data.tar.gz: b8f67ded7fc90df8893e98873f3300ba9e2af062d368917216e6f13447e41737c2ed0ae339557932cdf73008df64c4ad5a6a2423af9655bdb96921bb29d06f6d

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

@@ -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

@@ -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

@@ -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/body/streaming.rb

@@ -22,22 +22,38 @@ module Protocol
 				class Output
 					def initialize(input, block)
 						stream = ::Protocol::HTTP::Body::Stream.new(input, self)
-						@fiber = Fiber.new do
+						
+						@from = nil
+						
+						@fiber = Fiber.new do |from|
+							@from = from
 							block.call(stream)
 							@fiber = nil
 						end
 					end
 					
 					def write(chunk)
-						Fiber.yield(chunk)
+						if from = @from
+							@from = nil
+							@from = from.transfer(chunk)
+						else
+							raise RuntimeError, "Stream is not being read!"
+						end
 					end
 					
 					def close
 						@fiber = nil
+						
+						if from = @from
+							@from = nil
+							from.transfer(nil)
+						end
 					end
 					
 					def read
-						@fiber&.resume
+						raise RuntimeError, "Stream is already being read!" if @from
+						
+						@fiber&.transfer(Fiber.current)
 					end
 				end
 				

data/lib/protocol/rack/constants.rb

@@ -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

@@ -30,8 +30,6 @@ module Protocol
 			
 			include Protocol::HTTP::Body::Stream::Reader
 			
-			alias gets read_partial
-			
 			# Enumerate chunks of the request body.
 			# @yields {|chunk| ...}
 			# 	@parameter chunk [String]

data/lib/protocol/rack/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module Rack
-		VERSION = "0.5.1"
+		VERSION = "0.7.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-rack
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -38,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-04-24 00:00:00.000000000 Z
+date: 2024-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.27'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: An implementation of the Rack protocol/specification.