protocol-rack 0.2.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b6a6be852ed5686a4a29416d5e7f308a0b8fecdac08945f7a94c654fe961295
-  data.tar.gz: e0afd920038faa59a9739eb0780acc7d517d34fdd9bc336c80069c39b06892e4
+  metadata.gz: a51b0412866f66870722a8f62008d4e76df2ba1d613af62b94eea1a30618bd97
+  data.tar.gz: 0cc84245f1dbb289cb1081f4c7c291a0bb3d69498b2d822290937418af7dc532
 SHA512:
-  metadata.gz: 6d289be5ff94b209e23de3cb3569cfe76df31356daf072e2caf22ec34e22f3dce6e2e46cc027548b515c83ecd6186c1318f74a1bebaed388618ed7c221b704f4
-  data.tar.gz: 36c188b1011e436f29fdbf2c317d0c81ed46ae1831a1439cad18248492a005f735d14f2babc5855fd455940018c5f26719978878a697794c17d2d35d1846216d
+  metadata.gz: ed7a6592a103ecc2f285aa51a83427f29b15fe95cd7488ce57f59878598b833765774db65c5f8563d67e2ac7fe1da01a5f6c58dda6c0e09b34cbdc5fa12d5384
+  data.tar.gz: 8182ea7a512bec710d122cdf5ee4f4538b263ef03d2b7eb99130102126c536a58cd2057cf986a9336cad9169eabcffe61ed3c9560d912445a980cdc384311ee8

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2023, by Samuel Williams.
 
 require 'console'
 
@@ -68,6 +68,16 @@ module Protocol
 					
 					self.unwrap_headers(request.headers, env)
 					
+					# For the sake of compatibility, we set the `HTTP_UPGRADE` header to the requested protocol.
+					if protocol = request.protocol and request.version.start_with?('HTTP/1')
+						env[CGI::HTTP_UPGRADE] = Array(protocol).join(",")
+					end
+					
+					if request.respond_to?(:hijack?) and request.hijack?
+						env[RACK_IS_HIJACK] = true
+						env[RACK_HIJACK] = proc{request.hijack!.io.dup}
+					end
+					
 					# HTTP/2 prefers `:authority` over `host`, so we do this for backwards compatibility.
 					env[CGI::HTTP_HOST] ||= request.authority
 								
@@ -78,6 +88,12 @@ module Protocol
 					end
 				end
 				
+				def make_environment(request)
+					{
+						request: request
+					}
+				end
+				
 				# Build a rack `env` from the incoming request and apply it to the rack middleware.
 				#
 				# @parameter request [Protocol::HTTP::Request] The incoming request.
@@ -86,6 +102,16 @@ module Protocol
 					
 					status, headers, body = @app.call(env)
 					
+					# The status must always be an integer.
+					unless status.is_a?(Integer)
+						raise ArgumentError, "Status must be an integer!"
+					end
+					
+					# Headers must always be a hash or equivalent.
+					unless headers
+						raise ArgumentError, "Headers must not be nil!"
+					end
+					
 					headers, meta = self.wrap_headers(headers)
 					
 					return Response.wrap(env, status, headers, meta, body, request)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2023, by Samuel Williams.
 
 require 'console'
 
@@ -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
@@ -108,10 +105,12 @@ module Protocol
 						
 						if key.start_with?('rack.')
 							meta[key] = value
-						else
+						elsif value.is_a?(String)
 							value.split("\n").each do |value|
 								headers[key] = value
 							end
+						else
+							headers[key] = value
 						end
 					end
 					
@@ -124,7 +123,6 @@ module Protocol
 					
 					if protocol = response.protocol
 						headers['rack.protocol'] = protocol
-						# headers['upgrade'] = protocol
 					end
 					
 					if body = response.body and body.stream?

data/lib/protocol/rack/adapter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2023, by Samuel Williams.
 
 require 'rack'
 
@@ -11,7 +11,7 @@ require_relative 'adapter/rack3'
 module Protocol
 	module Rack
 		module Adapter
-			if ::Rack::RELEASE >= "3"
+			if ::Rack.release >= "3"
 				IMPLEMENTATION = Rack3
 			else
 				IMPLEMENTATION = Rack2

data/lib/protocol/rack/constants.rb

@@ -11,6 +11,7 @@ module Protocol
 		# CGI keys <https://tools.ietf.org/html/rfc3875#section-4.1>:
 		module CGI
 			HTTP_HOST = 'HTTP_HOST'
+			HTTP_UPGRADE = "HTTP_UPGRADE"
 			PATH_INFO = 'PATH_INFO'
 			REQUEST_METHOD = 'REQUEST_METHOD'
 			REQUEST_PATH = 'REQUEST_PATH'
@@ -35,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/input.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2023, by Samuel Williams.
+# Copyright, 2023, by Genki Takiuchi.
 
 require 'async/io/buffer'
 require 'protocol/http/body/stream'
@@ -18,6 +19,7 @@ module Protocol
 			# @parameter body [Protocol::HTTP::Body::Readable]
 			def initialize(body)
 				@body = body
+				@closed = false
 				
 				# Will hold remaining data in `#read`.
 				@buffer = nil
@@ -46,6 +48,8 @@ module Protocol
 			
 			# Close the input and output bodies.
 			def close(error = nil)
+				@closed = true
+				
 				if @body
 					@body.close(error)
 					@body = nil
@@ -74,7 +78,7 @@ module Protocol
 			
 			# Whether the stream has been closed.
 			def closed?
-				@body.nil?
+				@closed or @body.nil?
 			end
 			
 			# Whether there are any input chunks remaining?
@@ -87,7 +91,7 @@ module Protocol
 			def read_next
 				if @body
 					@body.read
-				else
+				elsif @closed
 					raise IOError, "Stream is not readable, input has been closed!"
 				end
 			end

data/lib/protocol/rack/request.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2023, by Samuel Williams.
 
 require 'protocol/http/request'
 require 'protocol/http/headers'
 
+require_relative 'constants'
 require_relative 'body/input_wrapper'
 
 module Protocol
@@ -30,19 +31,17 @@ module Protocol
 				)
 			end
 
-			HTTP_UPGRADE = 'HTTP_UPGRADE'
-
 			def self.protocol(env)
 				if protocols = env['rack.protocol']
 					return Array(protocols)
-				elsif protocols = env[HTTP_UPGRADE]
+				elsif protocols = env[CGI::HTTP_UPGRADE]
 					return protocols.split(/\s*,\s*/)
 				end
 			end
 
 			def self.headers(env)
 				headers = ::Protocol::HTTP::Headers.new
-				env.each do |key, value|			
+				env.each do |key, value|
 					if key.start_with?('HTTP_')
 						next if key == 'HTTP_HOST'
 						headers[key[5..-1].gsub('_', '-').downcase] = value

data/lib/protocol/rack/version.rb

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

data/license.md

@@ -1,6 +1,7 @@
 # MIT License
 
-Copyright, 2022, by Samuel Williams.  
+Copyright, 2022-2023, by Samuel Williams.  
+Copyright, 2023, by Genki Takiuchi.  
 
 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

@@ -71,6 +71,14 @@ We welcome contributions to this project.
 4.  Push to the branch (`git push origin my-new-feature`).
 5.  Create new Pull Request.
 
+### Developer Certificate of Origin
+
+This project uses the [Developer Certificate of Origin](https://developercertificate.org/). All contributors to this project must agree to this document to have their contributions accepted.
+
+### Contributor Covenant
+
+This project is governed by [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
+
 ## See Also
 
   - [protocol-http](https://github.com/socketry/protocol-http) — General abstractions for HTTP client/server implementations.

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: protocol-rack
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.4.1
 platform: ruby
 authors:
 - Samuel Williams
+- Genki Takiuchi
 autorequire:
 bindir: bin
 cert_chain:
@@ -37,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http
@@ -67,90 +68,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: async-http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.59'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.59'
-- !ruby/object:Gem::Dependency
-  name: bake-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: bake-test-external
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: covered
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
-- !ruby/object:Gem::Dependency
-  name: sus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-- !ruby/object:Gem::Dependency
-  name: sus-fixtures-async-http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 description:
 email:
 executables: []
@@ -186,14 +103,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: An implementation of the Rack protocol/specification.