protocol-rack 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aabc09a18a32e49d2a964c0b736d1e8613532d21a814dd1301be60a4963c057
-  data.tar.gz: b229ee85cca50e1803421ef4cf831b15258210d93d1613ef3bd864861a5762d9
+  metadata.gz: e9ac7ef853c3b25a46b06d630fc29921d76e8ee0213554d94afa19efdb9ccd87
+  data.tar.gz: ce65dd607e37ee33c6f20ecd4b0fa5976634be40869ac9d0add4e197d43d8cd7
 SHA512:
-  metadata.gz: 2989f0116da4d5c66cc776f9fda9cc6e67e92744af61d7ab8cb326611829dd372bf10b8610cc3f61dc88e8d8989222a02adb787a3bd763986c057e0b213203ae
-  data.tar.gz: b0a371f9ec89ed91f2745a7590a601ddb62591d3e14161d16c24881aff90c08e43d46a4ca881916204e1819d47a4f3a5ab24620cc333a807c1b8a81a5a9806fc
+  metadata.gz: 7ea217d520678401acc7d89d5a592e958bc47bcffc07439c02f4f52e2df89c0cf0391e2f6fbb6c6a94be7e2f31a0b2757d2ccc389a7ae72311e3f7a30f388c47
+  data.tar.gz: a9e4587094746830e41a449892bc19c9fb43c7d5625529f321f8e5e72e0422908703719b0bdd983f96ea18f1a13f6697dbd06e254aa62e554cabf3356d97ba61

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

@@ -17,6 +17,11 @@ module Protocol
 					self.new(app)
 				end
 				
+				def self.parse_file(...)
+					# This is the old interface, which was changed in Rack 3.
+					::Rack::Builder.parse_file(...).first
+				end
+				
 				# Initialize the rack adaptor middleware.
 				# @parameter app [Object] The rack middleware.
 				def initialize(app)
@@ -26,9 +31,9 @@ module Protocol
 				end
 				
 				def logger
-					Console.logger
+					Console
 				end
-
+				
 				# Unwrap raw HTTP headers into the CGI-style expected by Rack middleware.
 				#
 				# Rack separates multiple headers with the same key, into a single field with multiple lines.
@@ -74,6 +79,7 @@ module Protocol
 					end
 					
 					if request.respond_to?(:hijack?) and request.hijack?
+						env[RACK_IS_HIJACK] = true
 						env[RACK_HIJACK] = proc{request.hijack!.io.dup}
 					end
 					
@@ -115,7 +121,7 @@ module Protocol
 					
 					return Response.wrap(env, status, headers, meta, body, request)
 				rescue => exception
-					Console.logger.error(self) {exception}
+					Console.error(self, exception)
 					
 					body&.close if body.respond_to?(:close)
 					

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

@@ -17,9 +17,6 @@ module Protocol
 				RACK_MULTIPROCESS = 'rack.multiprocess'
 				RACK_RUN_ONCE = 'rack.run_once'
 				
-				RACK_IS_HIJACK = 'rack.hijack?'
-				RACK_HIJACK = 'rack.hijack'
-				
 				def self.wrap(app)
 					Rewindable.new(self.new(app))
 				end
@@ -90,7 +87,7 @@ module Protocol
 					
 					return Response.wrap(env, status, headers, meta, body, request)
 				rescue => exception
-					Console.logger.error(self) {exception}
+					Console.error(self, exception)
 					
 					body&.close if body.respond_to?(:close)
 					

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

@@ -15,6 +15,10 @@ module Protocol
 					self.new(app)
 				end
 				
+				def self.parse_file(...)
+					::Rack::Builder.parse_file(...)
+				end
+				
 				def make_environment(request)
 					request_path, query_string = request.path.split('?', 2)
 					server_name, server_port = (request.authority || '').split(':', 2)

data/lib/protocol/rack/adapter.rb

@@ -24,6 +24,10 @@ module Protocol
 			def self.make_response(env, response)
 				IMPLEMENTATION.make_response(env, response)
 			end
+			
+			def self.parse_file(...)
+				IMPLEMENTATION.parse_file(...)
+			end
 		end
 	end
 end

data/lib/protocol/rack/constants.rb

@@ -36,5 +36,9 @@ module Protocol
 		RACK_URL_SCHEME = 'rack.url_scheme'
 		RACK_PROTOCOL = 'rack.protocol'
 		RACK_RESPONSE_FINISHED = 'rack.response_finished'
+		
+		# Rack hijack support:
+		RACK_IS_HIJACK = 'rack.hijack?'
+		RACK_HIJACK = 'rack.hijack'
 	end
 end

data/lib/protocol/rack/response.rb

@@ -43,7 +43,7 @@ module Protocol
 				ignored = headers.extract(HOP_HEADERS)
 				
 				unless ignored.empty?
-					Console.logger.warn(self, "Ignoring protocol-level headers: #{ignored.inspect}")
+					Console.warn(self, "Ignoring hop headers!", ignored: ignored)
 				end
 
 				if hijack_body = meta['rack.hijack']

data/lib/protocol/rack/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module Rack
-		VERSION = "0.4.0"
+		VERSION = "0.5.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-rack
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -38,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-12-11 00:00:00.000000000 Z
+date: 2024-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: An implementation of the Rack protocol/specification.