Remove the http-accept dependency.

Assisted-By: devx/b3414b50-d642-461b-95a8-8f773c4d087b

Author: samuel-williams-shopify

lib/utopia/http.rb

@@ -3,15 +3,11 @@
 # Released under the MIT License.
 # Copyright, 2010-2026, by Samuel Williams.
 
-require "http/accept"
 require "protocol/http/status"
 
 module Utopia
 	# HTTP protocol implementation.
 	module HTTP
-		# Pull in {::HTTP::Accept} for parsing.
-		Accept = ::HTTP::Accept
-		
 		# A list of commonly used HTTP status codes.
 		# For help choosing the right status code, see http://racksburg.com/choosing-an-http-status-code/
 		STATUS_CODES = {

lib/utopia/localization.rb

@@ -4,6 +4,7 @@
 # Copyright, 2009-2025, by Samuel Williams.
 
 require_relative "localization/preferences"
+require_relative "localization/locales"
 require_relative "localization/resolver"
 require_relative "localization/middleware"
 

lib/utopia/localization/locales.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2026, by Samuel Williams.
+
+module Utopia
+	module Localization
+		# Matches configured locales against language ranges.
+		class Locales
+			# Expand a locale into progressively less specific language ranges.
+			# @parameter locale [String] The locale to expand.
+			# @parameter patterns [Hash] The destination language-range mapping.
+			def self.expand(locale, patterns)
+				parts = locale.split("-")
+				
+				while parts.any?
+					pattern = parts.join("-")
+					patterns[pattern] ||= locale
+					parts.pop
+				end
+			end
+			
+			# Initialize the configured locales.
+			# @parameter names [Array(String)] The locale names, in preference order.
+			def initialize(names)
+				@names = names
+				@patterns = {}
+				
+				@names.each do |name|
+					self.class.expand(name, @patterns)
+				end
+				
+				freeze
+			end
+			
+			# Freeze this object and its internal state.
+			# @returns [self] This object.
+			def freeze
+				return self if frozen?
+				
+				@names.freeze
+				@patterns.freeze
+				
+				return super
+			end
+			
+			attr :names
+			attr :patterns
+			
+			# Select configured locales matching the given language ranges.
+			# @parameter languages [Enumerable] Preferred language ranges.
+			# @returns [Array(String)] Matching locale names in language preference order.
+			def match(languages)
+				languages.filter_map do |language|
+					@patterns[language.name]
+				end
+			end
+		end
+	end
+end

lib/utopia/localization/middleware.rb

@@ -4,11 +4,13 @@
 # Copyright, 2025-2026, by Samuel Williams.
 
 require_relative "preferences"
+require_relative "locales"
 require_relative "../middleware"
 require_relative "../request"
 require_relative "../response"
 
 require "set"
+require "protocol/http/header/accept_language"
 
 module Utopia
 	module Localization
@@ -22,7 +24,7 @@ class Middleware < Protocol::HTTP::Middleware
 			def initialize(app, locales:, default_locale: nil, default_locales: nil, hosts: {}, ignore: [])
 				super(app)
 
-				@all_locales = HTTP::Accept::Languages::Locales.new(locales)
+				@all_locales = Locales.new(locales)
 
 				# Locales here are represented as an array of strings, e.g. ['en', 'ja', 'cn', 'de'] and are used in order if no locale is specified by the user.
 				unless @default_locales = default_locales
@@ -125,17 +127,17 @@ def extract_path_locale(request)
 			# @parameter request [Utopia::Request] The application request.
 			# @returns [Array(String)] Supported locales accepted by the browser, in preference order.
 			def browser_preferred_locales(request)
-				accept_languages = request.headers["accept-language"]&.to_s
+				accept_languages = request.headers["accept-language"]
 
 				# No user prefered languages:
 				return [] unless accept_languages
 
 				# Extract the ordered list of languages:
-				languages = HTTP::Accept::Languages.parse(accept_languages)
+				languages = accept_languages.preferred_languages
 
 				# Returns available languages based on the order languages:
-				return @all_locales & languages
-			rescue HTTP::Accept::ParseError
+				return @all_locales.match(languages)
+			rescue Protocol::HTTP::Header::AcceptLanguage::ParseError
 				# If we fail to parse the browser Accept-Language header, we ignore it (silently).
 				return []
 			end

readme.md

@@ -57,7 +57,6 @@ Please see the [project releases](https://socketry.github.io/utopia/releases/ind
   - [Utopia::Gallery](https://github.com/ioquatix/utopia-gallery) — A fast photo gallery based on [libvips](https://github.com/jcupitt/libvips).
   - [Utopia::Project](https://github.com/socketry/utopia-project) — A Ruby project documentation tool.
   - [Utopia::Analytics](https://github.com/ioquatix/utopia-analytics) — Simple integration with Google Analytics.
-  - [HTTP::Accept](https://github.com/ioquatix/http-accept) — RFC compliant header parser.
   - [Samovar](https://github.com/ioquatix/samovar) — Command line parser used by Utopia.
   - [Mapping](https://github.com/ioquatix/mapping) — Provide structured conversions for web interfaces.
 

releases.md

@@ -3,7 +3,7 @@
 ## Unreleasd
 
   - **Security** Fix handling of redirects that start with `//` to prevent open redirect vulnerabilities.
-  - Use `protocol-media` for response negotiation.
+  - Use `protocol-media` and `protocol-http` for response and language negotiation, removing the `http-accept` dependency.
 
 ## v2.31.0
 

setup/site/pages/welcome/index.xnode

@@ -17,7 +17,7 @@
 		<div>
 			<i class="fa fa-code"></i>
 			<h2>Well tested and maintained</h2>
-			<p>Utopia comprises a <a href="https://github.com/ioquatix/utopia">core gem</a> and several supporting libraries, the main ones being <a href="https://github.com/ioquatix/trenni">trenni</a> for templates and parsing, and <a href="https://github.com/ioquatix/http-accept">http-accept</a> for HTTP header processing. Together, these gems have over 90% test coverage.</p>
+			<p>Utopia comprises a <a href="https://github.com/ioquatix/utopia">core gem</a> and several supporting libraries, including <a href="https://github.com/socketry/xrb">XRB</a> for templates and markup parsing and <a href="https://github.com/socketry/protocol-http">Protocol HTTP</a> for HTTP protocol handling.</p>
 		</div>
 
 		<div>

test/utopia/localization.rb

@@ -76,6 +76,24 @@
 		expect(last_response.headers["content-location"].to_s).to be == "/ja/localized.txt"
 	end
 
+	it "matches less specific accepted languages" do
+		application = Utopia::Application.build(Protocol::HTTP::Middleware.for do |request|
+			Utopia::Response.text(request.localization.preferred_locales.compact.join(","))
+		end) do
+			use Utopia::Localization, locales: ["en-NZ", "en-US"], default_locale: "en-NZ"
+		end
+		
+		response = application.call(Protocol::HTTP::Request["GET", "/", {"accept-language" => "en"}])
+		
+		expect(response.read).to be == "en-NZ"
+	end
+	
+	it "ignores malformed accepted languages" do
+		client.get "/localized.txt", {"accept-language" => "not a language"}
+		
+		expect(last_response.read).to be == "localized.en.txt"
+	end
+	
 	it "resolves localized content templates" do
 		client.get "/page", {"accept-language" => "ja,en"}
 

utopia.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "bake", "~> 0.20"
 	spec.add_dependency "concurrent-ruby", "~> 1.2"
 	spec.add_dependency "console", "~> 1.24"
-	spec.add_dependency "http-accept", "~> 2.1"
 	spec.add_dependency "irb"
 	spec.add_dependency "mail", "~> 2.6"
 	spec.add_dependency "mime-types", "~> 3.0"