Modernize code.

ioquatix · ioquatix · commit f90c812bd2ac · 2025-08-02T17:37:45.000+12:00
diff --git a/.github/workflows/documentation-coverage.yaml b/.github/workflows/documentation-coverage.yaml
@@ -6,7 +6,6 @@ permissions:
   contents: read
 
 env:
-  CONSOLE_OUTPUT: XTerm
   COVERAGE: PartialSummary
 
 jobs:
@@ -17,7 +16,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.4"
+        ruby-version: ruby
         bundler-cache: true
     
     - name: Validate coverage
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -17,7 +17,6 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CONSOLE_OUTPUT: XTerm
   BUNDLE_WITH: maintenance
 
 jobs:
@@ -29,7 +28,7 @@ jobs:
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.4"
+        ruby-version: ruby
         bundler-cache: true
     
     - name: Installing packages
diff --git a/.github/workflows/rubocop.yaml b/.github/workflows/rubocop.yaml
@@ -5,9 +5,6 @@ on: [push, pull_request]
 permissions:
   contents: read
 
-env:
-  CONSOLE_OUTPUT: XTerm
-
 jobs:
   check:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -6,7 +6,6 @@ permissions:
   contents: read
 
 env:
-  CONSOLE_OUTPUT: XTerm
   COVERAGE: PartialSummary
 
 jobs:
@@ -56,7 +55,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.4"
+        ruby-version: ruby
         bundler-cache: true
     
     - uses: actions/download-artifact@v4
diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml
@@ -5,9 +5,6 @@ on: [push, pull_request]
 permissions:
   contents: read
 
-env:
-  CONSOLE_OUTPUT: XTerm
-
 jobs:
   test:
     name: ${{matrix.ruby}} on ${{matrix.os}}
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -5,9 +5,6 @@ on: [push, pull_request]
 permissions:
   contents: read
 
-env:
-  CONSOLE_OUTPUT: XTerm
-
 jobs:
   test:
     name: ${{matrix.ruby}} on ${{matrix.os}} ${{matrix.gemfile}}
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
-/.bundle/
-/pkg/
+/.bundle
+/.context
+/pkg
 /gems.locked
 /.covered.db
 /external
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,6 +1,12 @@
+plugins:
+  - rubocop-socketry
+
 AllCops:
   DisabledByDefault: true
 
+Layout/ConsistentBlankLineIndentation:
+  Enabled: true
+
 Layout/IndentationStyle:
   Enabled: true
   EnforcedStyle: tabs
@@ -48,6 +54,15 @@ Layout/EmptyLinesAroundModuleBody:
 Layout/EmptyLineAfterMagicComment:
    Enabled: true
 
+Layout/SpaceInsideBlockBraces:
+  Enabled: true
+  EnforcedStyle: no_space
+  SpaceBeforeBlockParameters: false
+
+Layout/SpaceAroundBlockParameters:
+  Enabled: true
+  EnforcedStyleInsidePipes: no_space
+
 Style/FrozenStringLiteralComment:
   Enabled: true
 
diff --git a/examples/puma/config.ru b/examples/puma/config.ru
@@ -9,9 +9,9 @@ middleware = Protocol::HTTP::Middleware::HelloWorld
 run proc{|env|
 	# Convert the rack request to a compatible rich request object:
 	request = Protocol::Rack::Request[env]
-		
+	
 	# Call your application
 	response = middleware.call(request)
-		
+	
 	Protocol::Rack::Adapter.make_response(env, response)
 }
diff --git a/examples/rewind-bug/config.ru b/examples/rewind-bug/config.ru
@@ -7,18 +7,18 @@ class BodyTestApp
 	def call(env)
 		# Get the request body
 		body = env["rack.input"]
-
+		
 		# First read
 		body.rewind
 		first_read = body.read
-
+		
 		# Second read
 		body.rewind
 		second_read = body.read
-
+		
 		# Response showing both reads
 		response_body = "First read: #{first_read.inspect}\n\nSecond read: #{second_read.inspect}"
-
+		
 		[200, { "Content-Type" => "text/plain" }, [response_body]]
 	end
 end
diff --git a/examples/server/server.rb b/examples/server/server.rb
@@ -15,12 +15,12 @@
 
 Async do
 	endpoint = Async::HTTP::Endpoint.parse("http://localhost:9292")
-		
+	
 	server_task = Async(transient: true) do
 		server = Async::HTTP::Server.new(middleware, endpoint)
 		server.run
 	end
-		
+	
 	client = Async::HTTP::Client.new(endpoint)
 	pp client.get("/").read
 end
diff --git a/gems.rb b/gems.rb
@@ -19,7 +19,9 @@
 	gem "sus"
 	gem "covered"
 	gem "decode"
+	
 	gem "rubocop"
+	gem "rubocop-socketry"
 	
 	gem "sus-fixtures-async"
 	gem "sus-fixtures-async-http"
diff --git a/lib/protocol/rack/adapter/generic.rb b/lib/protocol/rack/adapter/generic.rb
@@ -188,7 +188,7 @@ def self.extract_protocol(env, response, headers)
 						# 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
diff --git a/lib/protocol/rack/adapter/rack2.rb b/lib/protocol/rack/adapter/rack2.rb
@@ -44,7 +44,7 @@ def make_environment(request)
 						RACK_INPUT => Input.new(request.body),
 						RACK_ERRORS => $stderr,
 						RACK_LOGGER => self.logger,
-
+						
 						# The HTTP request method, such as "GET" or "POST". This cannot ever be an empty string, and so is always required.
 						CGI::REQUEST_METHOD => request.method,
 						
@@ -55,7 +55,7 @@ def make_environment(request)
 						CGI::PATH_INFO => request_path,
 						CGI::REQUEST_PATH => request_path,
 						CGI::REQUEST_URI => request.path,
-
+						
 						# The portion of the request URL that follows the ?, if any. May be empty, but is always required!
 						CGI::QUERY_STRING => query_string || "",
 						
@@ -68,7 +68,7 @@ def make_environment(request)
 						# I'm not sure what sane defaults should be here:
 						CGI::SERVER_NAME => server_name,
 					}
-
+					
 					# SERVER_PORT is optional but must not be set if it is not present.
 					if server_port
 						env[CGI::SERVER_PORT] = server_port
diff --git a/lib/protocol/rack/body/enumerable.rb b/lib/protocol/rack/body/enumerable.rb
@@ -100,7 +100,7 @@ def each(&block)
 				def stream?
 					!@body.respond_to?(:each)
 				end
-
+				
 				# Stream the response body to the given stream.
 				# The body is automatically closed after streaming.
 				# 
@@ -112,7 +112,7 @@ def call(stream)
 				ensure
 					self.close(error)
 				end
-
+				
 				# Read the next chunk from the response body.
 				# Returns nil when there are no more chunks.
 				# 
diff --git a/lib/protocol/rack/request.rb b/lib/protocol/rack/request.rb
@@ -23,13 +23,13 @@ class Request < ::Protocol::HTTP::Request
 			def self.[](env)
 				env["protocol.http.request"] ||= new(env)
 			end
-
+			
 			# Initialize a new Request instance from a Rack environment.
 			# 
 			# @parameter env [Hash] The Rack environment hash.
 			def initialize(env)
 				@env = env
-
+				
 				super(
 					@env["rack.url_scheme"],
 					@env["HTTP_HOST"],
@@ -41,7 +41,7 @@ def initialize(env)
 					self.class.protocol(@env)
 				)
 			end
-
+			
 			# Extract the protocol list from the Rack environment.
 			# Checks both `rack.protocol` and `HTTP_UPGRADE` headers.
 			# 
@@ -54,7 +54,7 @@ def self.protocol(env)
 					return protocols.split(/\s*,\s*/)
 				end
 			end
-
+			
 			# Extract HTTP headers from the Rack environment.
 			# Converts Rack's `HTTP_*` environment variables to proper HTTP headers.
 			# 
@@ -68,7 +68,7 @@ def self.headers(env)
 						headers[key[5..-1].gsub("_", "-").downcase] = value
 					end
 				end
-
+				
 				return headers
 			end
 		end
diff --git a/lib/protocol/rack/response.rb b/lib/protocol/rack/response.rb
@@ -45,11 +45,11 @@ def self.wrap(env, status, headers, meta, body, request = nil)
 				unless ignored.empty?
 					Console.warn(self, "Ignoring hop headers!", ignored: ignored)
 				end
-
+				
 				if hijack_body = meta["rack.hijack"]
 					body = hijack_body
 				end
-
+				
 				body = Body.wrap(env, status, headers, body, request&.body, request&.head?)
 				
 				protocol = meta[RACK_PROTOCOL]
diff --git a/test/protocol/rack/adapter.rb b/test/protocol/rack/adapter.rb
@@ -25,23 +25,23 @@
 		it "can make a response" do
 			response = Protocol::HTTP::Response[200, headers: {}, body: ["Hello World!"]]
 			status, headers, body = subject.make_response(env, response)
-
+			
 			expect(status).to be == 200
 			expect(headers).to be == {}
 			expect(body.join).to be == "Hello World!"
 		end
-
+		
 		it "can make a streaming response" do
 			stream_proc = lambda do |stream|
 				stream.write("Hello Streaming World")
 				stream.close
 			end
-
+			
 			body = Protocol::Rack::Body::Streaming.new(stream_proc)
 			
 			response = Protocol::HTTP::Response[200, headers: {}, body: body]
 			status, headers, body = subject.make_response(env, response)
-
+			
 			expect(status).to be == 200
 			if headers.include?(Protocol::Rack::RACK_HIJACK)
 				hijack_proc = headers[Protocol::Rack::RACK_HIJACK]
@@ -50,31 +50,31 @@
 				expect(body).to be(:respond_to?, :call)
 			end
 		end
-
+		
 		it "can wrap headers" do
 			response = Protocol::HTTP::Response[200, headers: {"x-custom" => "123"}, body: ["Hello World!"]]
 			status, headers, body = subject.make_response(env, response)
-
+			
 			x_custom = headers["x-custom"]
-
+			
 			expect(x_custom).to (be == "123").or(be == ["123"])
 		end
-
+		
 		it "can wrap multi-value headers" do
 			response = Protocol::HTTP::Response[200, headers: [["x-custom", "a=b"], ["x-custom", "x=y"]], body: ["Hello World!"]]
 			
 			status, headers, body = subject.make_response(env, response)
 			
 			x_custom = headers["x-custom"]
-
+			
 			if subject::VERSION < "3"
 				expect(x_custom).to be == "a=b\nx=y"
 			else
 				expect(x_custom).to be == ["a=b", "x=y"]
 			end
 		end
 	end
-
+	
 	AnApplication = Sus::Shared("an application") do
 		include Protocol::Rack::ServerContext
 		
diff --git a/test/protocol/rack/adapter/generic.rb b/test/protocol/rack/adapter/generic.rb
diff --git a/test/protocol/rack/adapter/rack2.rb b/test/protocol/rack/adapter/rack2.rb
diff --git a/test/protocol/rack/adapter/rack3.rb b/test/protocol/rack/adapter/rack3.rb
diff --git a/test/protocol/rack/adapter/rack31.rb b/test/protocol/rack/adapter/rack31.rb
diff --git a/test/protocol/rack/body.rb b/test/protocol/rack/body.rb
diff --git a/test/protocol/rack/body/enumerable.rb b/test/protocol/rack/body/enumerable.rb
diff --git a/test/protocol/rack/input.rb b/test/protocol/rack/input.rb
diff --git a/test/protocol/rack/request.rb b/test/protocol/rack/request.rb
diff --git a/test/protocol/rack/response.rb b/test/protocol/rack/response.rb
