Tidy up header implementation + tests.

Author: ioquatix

lib/protocol/grpc/header.rb

@@ -4,120 +4,16 @@
 # Copyright, 2025, by Samuel Williams.
 
 require "protocol/http"
-require "uri"
 
 require_relative "status"
+require_relative "header/status"
+require_relative "header/message"
+require_relative "header/metadata"
 
 module Protocol
 	module GRPC
 		# @namespace
 		module Header
-			# The `grpc-status` header represents the gRPC status code.
-			#
-			# The `grpc-status` header contains a numeric status code (0-16) indicating the result of the RPC call.
-			# Status code 0 indicates success (OK), while other codes indicate various error conditions.
-			# This header can appear both as an initial header (for trailers-only responses) and as a trailer.
-			class Status
-				# Initialize the status header with the given value.
-				#
-				# @parameter value [String, Integer, Array] The status code as a string, integer, or array (takes first element).
-				def initialize(value)
-					@value = normalize_value(value)
-				end
-				
-				# Get the status code as an integer.
-				#
-				# @returns [Integer] The status code.
-				def to_i
-					@value
-				end
-				
-				# Serialize the status code to a string.
-				#
-				# @returns [String] The status code as a string.
-				def to_s
-					@value.to_s
-				end
-				
-				# Merge another status value (takes the new value, as status should only appear once)
-				# @parameter value [String, Integer, Array] The new status code
-				def <<(value)
-					@value = normalize_value(value)
-					self
-				end
-				
-			private
-				
-				# Normalize a value to an integer status code.
-				# Handles arrays (from external clients), strings, and integers.
-				# @parameter value [String, Integer, Array] The raw value
-				# @returns [Integer] The normalized status code
-				def normalize_value(value)
-					# Handle Array case (may occur with external clients)
-					actual_value = value.is_a?(Array) ? value.flatten.compact.first : value
-					actual_value.to_i
-				end
-				
-				# Whether this header is acceptable in HTTP trailers.
-				# The `grpc-status` header can appear in trailers as per the gRPC specification.
-				# @returns [Boolean] `true`, as grpc-status can appear in trailers.
-				def self.trailer?
-					true
-				end
-			end
-			
-			# The `grpc-message` header represents the gRPC status message.
-			#
-			# The `grpc-message` header contains a human-readable error message, URL-encoded according to RFC 3986.
-			# This header is optional and typically only present when there's an error (non-zero status code).
-			# This header can appear both as an initial header (for trailers-only responses) and as a trailer.
-			class Message < String
-				# Initialize the message header with the given value.
-				#
-				# @parameter value [String] The message value (will be URL-encoded if not already encoded).
-				def initialize(value)
-					super(value.to_s)
-				end
-				
-				# Decode the URL-encoded message.
-				#
-				# @returns [String] The decoded message.
-				def decode
-					URI.decode_www_form_component(self)
-				end
-				
-				# Encode the message for use in headers.
-				#
-				# @parameter message [String] The message to encode.
-				# @returns [String] The URL-encoded message.
-				def self.encode(message)
-					URI.encode_www_form_component(message).gsub("+", "%20")
-				end
-				
-				# Merge another message value (takes the new value, as message should only appear once)
-				# @parameter value [String] The new message value
-				def <<(value)
-					replace(value.to_s)
-					self
-				end
-				
-				# Whether this header is acceptable in HTTP trailers.
-				# The `grpc-message` header can appear in trailers as per the gRPC specification.
-				# @returns [Boolean] `true`, as grpc-message can appear in trailers.
-				def self.trailer?
-					true
-				end
-			end
-			
-			# Base class for custom gRPC metadata (allowed in trailers).
-			class Metadata < Protocol::HTTP::Header::Split
-				# Whether this header is acceptable in HTTP trailers.
-				# The `grpc-metadata` header can appear in trailers as per the gRPC specification.
-				# @returns [Boolean] `true`, as grpc-metadata can appear in trailers.
-				def self.trailer?
-					true
-				end
-			end
 		end
 
 		# Custom header policy for gRPC.

lib/protocol/grpc/header/message.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2025, by Samuel Williams.
+
+require "uri"
+
+module Protocol
+	module GRPC
+		module Header
+			# The `grpc-message` header represents the gRPC status message.
+			#
+			# The `grpc-message` header contains a human-readable error message, URL-encoded according to RFC 3986.
+			# This header is optional and typically only present when there's an error (non-zero status code).
+			# This header can appear both as an initial header (for trailers-only responses) and as a trailer.
+			class Message < String
+				def self.parse(value)
+					new(value)
+				end
+				
+				# Initialize the message header with the given value.
+				#
+				# @parameter value [String] The message value (will be URL-encoded if not already encoded).
+				def initialize(value)
+					super(value)
+				end
+				
+				# Decode the URL-encoded message.
+				#
+				# @returns [String] The decoded message.
+				def decode
+					::URI.decode_www_form_component(self)
+				end
+				
+				# Encode the message for use in headers.
+				#
+				# @parameter message [String] The message to encode.
+				# @returns [String] The URL-encoded message.
+				def self.encode(message)
+					URI.encode_www_form_component(message).gsub("+", "%20")
+				end
+				
+				# Merge another message value (takes the new value, as message should only appear once)
+				# @parameter value [String] The new message value
+				def <<(value)
+					replace(value.to_s)
+					
+					return self
+				end
+				
+				# Whether this header is acceptable in HTTP trailers.
+				# The `grpc-message` header can appear in trailers as per the gRPC specification.
+				# @returns [Boolean] `true`, as grpc-message can appear in trailers.
+				def self.trailer?
+					true
+				end
+			end
+		end
+	end
+end

lib/protocol/grpc/header/metadata.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2025, by Samuel Williams.
+
+require "protocol/http"
+
+module Protocol
+	module GRPC
+		module Header
+			# Base class for custom gRPC metadata (allowed in trailers).
+			class Metadata < Protocol::HTTP::Header::Split
+				# Whether this header is acceptable in HTTP trailers.
+				# The `grpc-metadata` header can appear in trailers as per the gRPC specification.
+				# @returns [Boolean] `true`, as grpc-metadata can appear in trailers.
+				def self.trailer?
+					true
+				end
+			end
+		end
+	end
+end

lib/protocol/grpc/header/status.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2025, by Samuel Williams.
+
+module Protocol
+	module GRPC
+		module Header
+			# The `grpc-status` header represents the gRPC status code.
+			#
+			# The `grpc-status` header contains a numeric status code (0-16) indicating the result of the RPC call.
+			# Status code 0 indicates success (OK), while other codes indicate various error conditions.
+			# This header can appear both as an initial header (for trailers-only responses) and as a trailer.
+			class Status
+				def self.parse(value)
+					new(value.to_i)
+				end
+				
+				# Initialize the status header with the given value.
+				#
+				# @parameter value [String, Integer] The status code as a string or integer.
+				def initialize(value)
+					@value = value.to_i
+				end
+				
+				# Get the status code as an integer.
+				#
+				# @returns [Integer] The status code.
+				def to_i
+					@value
+				end
+				
+				# Serialize the status code to a string.
+				#
+				# @returns [String] The status code as a string.
+				def to_s
+					@value.to_s
+				end
+				
+				# Merge another status value (takes the new value, as status should only appear once)
+			# @parameter value [String, Integer] The new status code
+				def <<(value)
+					@value = value.to_i
+					
+					return self
+				end
+				
+				# Whether this header is acceptable in HTTP trailers.
+				# The `grpc-status` header can appear in trailers as per the gRPC specification.
+				# @returns [Boolean] `true`, as grpc-status can appear in trailers.
+				def self.trailer?
+					true
+				end
+			end
+		end
+	end
+end

test/protocol/grpc/header.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2025, by Samuel Williams.
+
+require "protocol/grpc/header"
+
+describe Protocol::GRPC::HEADER_POLICY do
+	it "includes grpc-status mapping" do
+		expect(subject["grpc-status"]).to be == Protocol::GRPC::Header::Status
+	end
+	
+	it "includes grpc-message mapping" do
+		expect(subject["grpc-message"]).to be == Protocol::GRPC::Header::Message
+	end
+	
+	it "is frozen" do
+		expect(subject).to be(:frozen?)
+	end
+end

test/protocol/grpc/header/message.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2025, by Samuel Williams.
+
+require "protocol/grpc/header/message"
+
+describe Protocol::GRPC::Header::Message do
+	with ".parse" do
+		it "parses string value" do
+			message = subject.parse("Error%20occurred")
+			expect(message).to be == "Error%20occurred"
+		end
+	end
+	
+	with "#initialize" do
+		it "accepts string value" do
+			message = subject.new("Test message")
+			expect(message).to be == "Test message"
+		end
+	end
+	
+	with "#decode" do
+		it "decodes URL-encoded message" do
+			message = subject.new("Error%20occurred")
+			expect(message.decode).to be == "Error occurred"
+		end
+		
+		it "decodes special characters" do
+			message = subject.new("Error%3A%20not%20found")
+			expect(message.decode).to be == "Error: not found"
+		end
+		
+		it "handles unencoded message" do
+			message = subject.new("Simple error")
+			expect(message.decode).to be == "Simple error"
+		end
+	end
+	
+	with ".encode" do
+		it "encodes message for headers" do
+			encoded = subject.encode("Error occurred")
+			expect(encoded).to be == "Error%20occurred"
+		end
+		
+		it "encodes special characters" do
+			encoded = subject.encode("Error: not found")
+			expect(encoded).to be == "Error%3A%20not%20found"
+		end
+		
+		it "does not use plus for spaces" do
+			encoded = subject.encode("Test message")
+			expect(encoded).not.to be =~ /\+/
+			expect(encoded).to be =~ /%20/
+		end
+	end
+	
+	with "#<<" do
+		it "merges new string value" do
+			message = subject.new("Old message")
+			message << "New message"
+			expect(message).to be == "New message"
+		end
+		
+		it "converts non-string to string" do
+			message = subject.new("Old")
+			message << 123
+			expect(message).to be == "123"
+		end
+		
+		it "returns self for chaining" do
+			message = subject.new("Old")
+			result = message << "New"
+			expect(result).to be_equal(message)
+		end
+	end
+	
+	with ".trailer?" do
+		it "returns true as grpc-message can appear in trailers" do
+			expect(subject).to be(:trailer?)
+		end
+	end
+end

test/protocol/grpc/header/metadata.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2025, by Samuel Williams.
+
+require "protocol/grpc/header/metadata"
+
+describe Protocol::GRPC::Header::Metadata do
+	with ".trailer?" do
+		it "returns true as grpc-metadata can appear in trailers" do
+			expect(subject).to be(:trailer?)
+		end
+	end
+end