otto 2.0.0.pre10 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5e7fb7a7177b6488a5a3cdacc8e3a929d58f92d44fb03bb506effca3f6c3550
-  data.tar.gz: 351a23a9c8e12aff50296cde108e73478dac7cf052d687deb5855f3ccb35cd79
+  metadata.gz: 8539a9a6889a7976aa6ceb87ea3d7d489cb82b65e283cb57d7d731e2f2247159
+  data.tar.gz: d5c025e966063e8f1eb618c1a6aa28782db50e7f55769f322b557a0be4725d4b
 SHA512:
-  metadata.gz: 651edcf79562877a2046132ccc876f747545d1bed8f4821352af4c16f8e795bec5d02e82afcf27320b368af9e25853df3c71d26c4fa6b6f81878704322d0f29d
-  data.tar.gz: e763f2d28e2ff4dd0d16a98ff8ab9eda6d495d32e7be10b31a1c21516a075fb1f49a44464eeaf66d92f701821ab3fce91ab72c25d18430efa70e65b2a435cb94
+  metadata.gz: 06dc04e8f9ada60160c87c48c32a31e34fbab8b29a0f1755fa9f7bf2878aebe7ea1491110018cfcdc2e689be8de41ec17ae2f413cc0f38ff9136c0d039104f78
+  data.tar.gz: c12c1236b295148a9f1f1b31f7fb22aeace22494703e49ec4c47421d7455f74ea0ebcb017019ebe799b5b930cd4a907d5bf6b7ed3f6e58bcac7920432d7ada90

data/.github/workflows/code-smells.yml

@@ -71,7 +71,7 @@ jobs:
         continue-on-error: true
 
       - name: Upload Reek report as artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: always()
         with:
           name: reek-report

data/CHANGELOG.rst

@@ -7,6 +7,21 @@ The format is based on `Keep a Changelog <https://keepachangelog.com/en/1.1.0/>`
 
    <!--scriv-insert-here-->
 
+.. _changelog-2.0.0:
+
+2.0.0 — 2026-03-14
+==================
+
+Added
+-----
+
+- Optional ``fallback_locale`` configuration for ``Otto::Locale::Middleware`` and ``Locale::Config``, enabling custom locale fallback chains between exact region match and primary code resolution
+
+Fixed
+-----
+
+- Locale middleware now tries exact region match (``fr-FR`` → ``fr_FR``) before falling back to primary language code, fixing locale resolution for region-qualified ``available_locales`` entries (#117)
+
 .. _changelog-2.0.0.pre10:
 
 2.0.0.pre10 — 2025-12-09

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    otto (2.0.0.pre10)
+    otto (2.0.0)
       concurrent-ruby (~> 1.3, < 2.0)
       facets (~> 3.1)
       ipaddr (~> 1, < 2.0)
@@ -16,7 +16,7 @@ GEM
   specs:
     ast (2.4.3)
     benchmark (0.5.0)
-    bigdecimal (3.2.3)
+    bigdecimal (3.3.1)
     concurrent-ruby (1.3.5)
     crass (1.0.6)
     date (3.4.1)
@@ -63,7 +63,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.16.0)
-    json_schemer (2.4.0)
+    json_schemer (2.5.0)
       bigdecimal
       hana (~> 1.3)
       regexp_parser (~> 2.0)

data/lib/otto/locale/config.rb

@@ -24,15 +24,17 @@ class Otto
     class Config
       include Otto::Core::Freezable
 
-      attr_accessor :available_locales, :default_locale
+      attr_accessor :available_locales, :default_locale, :fallback_locale
 
       # Initialize locale configuration
       #
       # @param available_locales [Hash, nil] Hash of locale codes to names
       # @param default_locale [String, nil] Default locale code
-      def initialize(available_locales: nil, default_locale: nil)
+      # @param fallback_locale [Hash, nil] Hash of locale codes to fallback chains
+      def initialize(available_locales: nil, default_locale: nil, fallback_locale: nil)
         @available_locales = available_locales
         @default_locale = default_locale
+        @fallback_locale = fallback_locale
       end
 
       # Convert to hash for compatibility with existing code
@@ -41,7 +43,8 @@ class Otto
       def to_h
         {
           available_locales: @available_locales,
-          default_locale: @default_locale,
+             default_locale: @default_locale,
+            fallback_locale: @fallback_locale,
         }.compact
       end
 

data/lib/otto/locale/middleware.rb

@@ -37,11 +37,13 @@ class Otto
       # @param app [#call] Rack application
       # @param available_locales [Hash<String, String>] Hash of locale codes to language names
       # @param default_locale [String] Default locale code
+      # @param fallback_locale [Hash, nil] Hash of locale codes to fallback chains
       # @param debug [Boolean] Enable debug logging
-      def initialize(app, available_locales:, default_locale:, debug: false)
+      def initialize(app, available_locales:, default_locale:, fallback_locale: nil, debug: false)
         @app = app
         @available_locales = available_locales
         @default_locale = default_locale
+        @fallback_locale = fallback_locale
         @debug = debug
 
         validate_config!
@@ -90,7 +92,13 @@ class Otto
       # Handles formats like:
       # - "en-US,en;q=0.9,fr;q=0.8" → finds first available from [en, en, fr]
       # - "es,en;q=0.9" → returns "en" if "es" unavailable but "en" is
-      # - "fr-CA" → "fr"
+      # - "fr-FR" → "fr_FR" (exact match with region) or "fr" (fallback)
+      # - "pt-BR,en;q=0.9" → "pt_BR" if available
+      #
+      # Resolution order per tag (via resolve_locale):
+      # 1. Exact match with region (fr-FR → fr_FR)
+      # 2. Fallback chain (if configured)
+      # 3. Primary language code (fr-FR → fr)
       #
       # Respects q-values (quality factors) and returns the highest-priority
       # available locale instead of just the first language tag.
@@ -102,20 +110,19 @@ class Otto
 
         # Parse all language tags with their q-values
         # Format: "en-US,en;q=0.9,fr;q=0.8" → [[en-US, 1.0], [en, 0.9], [fr, 0.8]]
-        languages = header.split(',').map do |tag|
+        languages = header.split(',').each_with_index.map do |tag, idx|
           # Split on semicolon and extract q-value
           parts = tag.strip.split(/\s*;\s*q\s*=\s*/)
           locale_str = parts[0]
           q_value = parts[1] ? parts[1].to_f : 1.0
-          [locale_str, q_value]
+          [locale_str, q_value, idx]
         end
 
-        # Sort by q-value descending (highest preference first)
-        # and find the first locale that matches available_locales
-        languages.sort_by { |_, q| -q }.each do |lang_tag, _|
-          # Extract primary language code: "en-US" → "en", "fr" → "fr"
-          locale_code = lang_tag.split('-').first.downcase
-          return locale_code if valid_locale?(locale_code)
+        # Sort by q-value descending (highest preference first),
+        # using original header position as tiebreaker for stable ordering
+        languages.sort_by { |_, q, i| [-q, i] }.each do |lang_tag, _, _|
+          resolved = resolve_locale(lang_tag)
+          return resolved if resolved
         end
 
         nil # No matching locale found
@@ -124,6 +131,61 @@ class Otto
         nil
       end
 
+      # Resolve a single language tag against available locales
+      #
+      # Resolution order:
+      # 1. Exact match with region (fr-FR → fr_FR)
+      # 2. Fallback chain (if configured)
+      # 3. Primary language code (fr-FR → fr)
+      #
+      # @param lang_tag [String] BCP 47 language tag (e.g. "fr-FR", "en")
+      # @return [String, nil] Matched locale code or nil
+      def resolve_locale(lang_tag)
+        # Step 1: Exact match — convert HTTP format to locale format (fr-FR → fr_FR)
+        normalized = lang_tag.strip.tr('-', '_')
+        return normalized if valid_locale?(normalized)
+
+        downcased = normalized.downcase
+        return downcased if downcased != normalized && valid_locale?(downcased)
+
+        # Step 1b: Try BCP 47 canonical form (lowercase language, uppercase region)
+        parts = normalized.split('_', 2)
+        if parts.length == 2
+          canonical = "#{parts[0].downcase}_#{parts[1].upcase}"
+          return canonical if canonical != normalized && canonical != downcased && valid_locale?(canonical)
+        end
+
+        # Step 2: Fallback chain (if configured)
+        resolved = resolve_fallback_chain(normalized)
+        return resolved if resolved
+
+        # Step 3: Primary language code (fr-FR → fr)
+        primary = lang_tag.split('-').first.downcase
+        return primary if valid_locale?(primary)
+
+        nil
+      end
+
+      # Consult fallback chain for a normalized locale tag
+      #
+      # @param normalized [String] Normalized locale tag (e.g. "fr_FR")
+      # @return [String, nil] First matching fallback locale or nil
+      def resolve_fallback_chain(normalized)
+        return nil unless @fallback_locale
+
+        chain = @fallback_locale[normalized] || @fallback_locale[normalized.downcase]
+        if !chain
+          parts = normalized.split('_', 2)
+          if parts.length == 2
+            canonical = "#{parts[0].downcase}_#{parts[1].upcase}"
+            chain = @fallback_locale[canonical]
+          end
+        end
+        return nil unless chain
+
+        chain.find { |fallback| valid_locale?(fallback) }
+      end
+
       # Check if locale is valid
       #
       # @param locale [String, nil] Locale code to validate
@@ -140,6 +202,12 @@ class Otto
         raise ArgumentError, 'available_locales must be a Hash' unless @available_locales.is_a?(Hash)
         raise ArgumentError, 'available_locales cannot be empty' if @available_locales.empty?
         raise ArgumentError, 'default_locale must be in available_locales' unless @available_locales.key?(@default_locale)
+        return unless @fallback_locale
+
+        raise ArgumentError, 'fallback_locale must be a Hash' unless @fallback_locale.is_a?(Hash)
+        @fallback_locale.each do |key, chain|
+          raise ArgumentError, "fallback_locale values must be Arrays, got #{chain.class} for key '#{key}'" unless chain.is_a?(Array)
+        end
       end
 
       # Log debug information about locale detection

data/lib/otto/version.rb

@@ -3,5 +3,5 @@
 # frozen_string_literal: true
 
 class Otto
-  VERSION = '2.0.0.pre10'
+  VERSION = '2.0.0'
 end

data/otto.gemspec

@@ -5,7 +5,7 @@ require_relative 'lib/otto/version'
 Gem::Specification.new do |spec|
   spec.name          = 'otto'
   spec.version       = Otto::VERSION.to_s
-  spec.summary       = 'Auto-define your rack-apps in plaintext.'
+  spec.summary       = 'Define your rack-apps in plaintext.'
   spec.description   = "Otto: #{spec.summary}"
   spec.email         = 'gems@solutious.com'
   spec.authors       = ['Delano Mandelbaum']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: otto
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre10
+  version: 2.0.0
 platform: ruby
 authors:
 - Delano Mandelbaum
@@ -145,7 +145,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.20'
-description: 'Otto: Auto-define your rack-apps in plaintext.'
+description: 'Otto: Define your rack-apps in plaintext.'
 email: gems@solutious.com
 executables: []
 extensions: []
@@ -346,5 +346,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.7.2
 specification_version: 4
-summary: Auto-define your rack-apps in plaintext.
+summary: Define your rack-apps in plaintext.
 test_files: []