Modernize code.

ioquatix · ioquatix · commit fef444c88377 · 2025-03-01T08:37:16.000+13:00
diff --git a/.github/workflows/documentation-coverage.yaml b/.github/workflows/documentation-coverage.yaml
@@ -17,7 +17,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.3"
+        ruby-version: "3.4"
         bundler-cache: true
     
     - name: Validate coverage
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -29,7 +29,7 @@ jobs:
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.3"
+        ruby-version: "3.4"
         bundler-cache: true
     
     - name: Installing packages
diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -21,7 +21,7 @@ jobs:
           - macos
         
         ruby:
-          - "3.3"
+          - "3.4"
     
     steps:
     - uses: actions/checkout@v4
@@ -49,7 +49,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.3"
+        ruby-version: "3.4"
         bundler-cache: true
     
     - uses: actions/download-artifact@v4
diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml
@@ -23,6 +23,7 @@ jobs:
           - "3.1"
           - "3.2"
           - "3.3"
+          - "3.4"
     
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -26,6 +26,7 @@ jobs:
           - "3.1"
           - "3.2"
           - "3.3"
+          - "3.4"
         
         gemfile:
           - gems/rack-v1.rb
diff --git a/gems/rack-v30.rb b/gems/rack-v30.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022-2023, by Samuel Williams.
+# Copyright, 2022-2025, by Samuel Williams.
 
 eval_gemfile("gems.rb")
 
diff --git a/gems/rack-v31.rb b/gems/rack-v31.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022-2023, by Samuel Williams.
+# Copyright, 2024-2025, by Samuel Williams.
 
 eval_gemfile("gems.rb")
 
diff --git a/lib/protocol/rack/adapter/rack2.rb b/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"
 
diff --git a/lib/protocol/rack/adapter/rack3.rb b/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"
 
diff --git a/lib/protocol/rack/adapter/rack31.rb b/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"
 
@@ -53,6 +54,11 @@ def make_environment(request)
 						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?
 							body.close
diff --git a/license.md b/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
diff --git a/protocol-rack.gemspec b/protocol-rack.gemspec
@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
 	spec.version = Protocol::Rack::VERSION
 	
 	spec.summary = "An implementation of the Rack protocol/specification."
-	spec.authors = ["Samuel Williams", "Genki Takiuchi"]
+	spec.authors = ["Samuel Williams", "Francisco Mejia", "Genki Takiuchi"]
 	spec.license = "MIT"
 	
 	spec.cert_chain  = ["release.cert"]
diff --git a/test/protocol/rack/adapter/generic.rb b/test/protocol/rack/adapter/generic.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 "protocol/rack/adapter/generic"
 require "protocol/http/request"
@@ -37,16 +38,16 @@
 	end
 
 	with "app server without SERVER_PORT" do
-    let(:request) do
-      Protocol::HTTP::Request.new("https", "example.com", "GET", "/", "http/1.1", Protocol::HTTP::Headers[{"accept" => "text/html"}], nil)
-    end
+		let(:request) do
+			Protocol::HTTP::Request.new("https", "example.com", "GET", "/", "http/1.1", Protocol::HTTP::Headers[{"accept" => "text/html"}], nil)
+		end
 
-    it "does not include SERVER_PORT in the Rack environment" do
-      env = adapter.make_environment(request)
-      
-      expect(env).not.to have_keys(Protocol::Rack::CGI::SERVER_PORT)
-    end
-  end
+		it "does not include SERVER_PORT in the Rack environment" do
+			env = adapter.make_environment(request)
+						
+			expect(env).not.to have_keys(Protocol::Rack::CGI::SERVER_PORT)
+		end
+	end
 	
 	with "a app that returns nil" do
 		include DisableConsoleContext

-Original file line number
+Diff line change
           - "3.1"
           - "3.2"
           - "3.3"
 +          - "3.4"
     steps:
     - uses: actions/checkout@v4