route_translator 15.0.0 → 15.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a393716835c2c542d7f158782dcf1dcbaf163185bb4a1f85ff1be5507accbbf
-  data.tar.gz: 9ea86dcbebec6a9cea19b280da5a821cfccd6951e5d4c5b79ca43582053c8869
+  metadata.gz: 13e7ca36c52b904acf706a63b2cc0b352ed0206010b69dbf65eba016ab2fefdb
+  data.tar.gz: 6721c17d101b7528a9a603ff196c0fabdc49d4b0ca54a42e3b842213ef585ead
 SHA512:
-  metadata.gz: b1fe1869d56070ea8de79618f8c6cd8fe5e6360b6be50637ac94ac9a13db13d6ce44f807a4745b4973cef5126049b1d7314d2c46401d7aa6af1d081cb63c9f84
-  data.tar.gz: d91df79e0dabed0f438757b364e467d85c1d1691c324e9098b5c1446805e6735a594e5d425d48345c47dcdb01f6438a30358a09a52195de93a46c425b5ccc944
+  metadata.gz: 4837bc35c697c191a1219d42c5e8a6a05241aaa2cce847dfee6e000acfb460335b6007c1d499c1a049ece53cbff466a3647385e1a5b85c8ff9e6b65f7da98cbc
+  data.tar.gz: 2fe7754133ec168a03208316f98ea24696700dc03766d9b86bbbee25785e77f85d0445f82fedebc45fd43a8b51f4fc28bbae57d817d0f1bb206a0bc0b82fcb9b

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 15.2.0 / 2025-07-06
+
+* [FEATURE] Rails 8.1 edge support ([#344](https://github.com/enriclluelles/route_translator/pull/344))
+
+## 15.1.0 / 2025-06-15
+
+* [BUGFIX] Ensure `@localized` is always reset after yield ([#333](https://github.com/enriclluelles/route_translator/issues/333))
+* [ENHANCEMENT] Optimize host locale detection ([#337](https://github.com/enriclluelles/route_translator/pull/337))
+* [ENHANCEMENT] Add `locale_from_request` method ([#340](https://github.com/enriclluelles/route_translator/pull/340))
+
 ## 15.0.0 / 2025-06-12
 
 * [FEATURE] Drop Ruby < 3.1 support

data/README.md

@@ -385,6 +385,39 @@ scope ':country/:locale' do
 end
 ```
 
+## Using RouteTranslator with Devise
+
+When using RouteTranslator with Devise, you may notice that some authentication-related flash messages (such as errors after failed logins) are shown in the wrong language. This happens because Devise builds some messages in middleware, after your controller’s actions have completed. If you use RouteTranslator’s `around_action` (or legacy `around_filter`) to set the locale, the locale is reset after the controller yields, and middleware like Devise will see the default locale.
+
+This only affects you if Devise is mounted inside a localized block (for example, `localized { devise_for :users }`). If you do not use localized Devise routes, you do not need to change anything.
+
+To ensure Devise’s middleware uses the correct locale, some users suggest replacing RouteTranslator’s `around_action` with a `before_action`. However, this is discouraged, as it can leave your application in the wrong locale after the request and may cause subtle bugs.
+
+A better approach is to explicitly set the locale for Devise’s failure responses. Starting from Devise version 4.9.4, you can customize how Devise determines the locale for error messages, thanks to the ability to override the `i18n_locale` method in the failure app. This allows you to set the locale for Devise’s middleware without changing RouteTranslator’s recommended usage.
+
+Here’s an example:
+
+```rb
+# config/initializers/devise.rb
+
+Devise.setup do |config|
+  # ...
+
+  ActiveSupport.on_load(:devise_failure_app) do
+    def i18n_locale
+      RouteTranslator.locale_from_request(request)
+    end
+  end
+end
+```
+
+### Summary
+
+- You only need this workaround if Devise is mounted in a localized block.
+- Do not replace RouteTranslator’s `around_action` with a `before_action`.
+- Instead, set the locale for Devise failure responses as shown above.
+- The solution above requires Devise version 4.9.4 or higher, which allows customizing the `i18n_locale` method in the failure app.
+
 ## Testing
 Testing your controllers with routes-translator is easy, just add a locale parameter as `String` for your localized routes. Otherwise, an `ActionController::UrlGenerationError` will raise.
 

data/lib/route_translator/extensions/action_controller.rb

@@ -9,7 +9,8 @@ module RouteTranslator
     private
 
     def set_locale_from_url
-      locale_from_url = RouteTranslator.locale_from_params(params) || RouteTranslator::Host.locale_from_host(request.host)
+      locale_from_url = RouteTranslator.locale_from_request(request)
+
       if locale_from_url
         old_locale  = I18n.locale
         I18n.locale = locale_from_url

data/lib/route_translator/extensions/legacy/mapper.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module ActionDispatch
+  module Routing
+    class Mapper
+      def localized
+        @localized = true
+        yield
+      ensure
+        @localized = false
+      end
+
+      # rubocop:disable Lint/UnderscorePrefixedVariableName, Metrics/PerceivedComplexity
+      def add_route(action, controller, options, _path, to, via, formatted, anchor, options_constraints) # :nodoc:
+        return super unless @localized
+
+        path = path_for_action(action, _path)
+        raise ArgumentError, 'path is required' if path.blank?
+
+        action = action.to_s
+
+        default_action = options.delete(:action) || @scope[:action]
+
+        if %r{^[\w\-\/]+$}.match?(action)
+          default_action ||= action.tr('-', '_') unless action.include?('/')
+        else
+          action = nil
+        end
+
+        as = if options.fetch(:as, true)
+               name_for_action(options.delete(:as), action)
+             else
+               options.delete(:as)
+             end
+
+        path = Mapping.normalize_path URI::DEFAULT_PARSER.escape(path), formatted
+        ast = Journey::Parser.parse path
+
+        mapping = Mapping.build(@scope, @set, ast, controller, default_action, to, via, formatted, options_constraints, anchor, options)
+        @set.add_localized_route(mapping, as, anchor, @scope, path, controller, default_action, to, via, formatted, options_constraints, options)
+      end
+      # rubocop:enable Lint/UnderscorePrefixedVariableName, Metrics/PerceivedComplexity
+
+      private
+
+      def define_generate_prefix(app, name)
+        return super unless @localized
+
+        RouteTranslator::Translator.available_locales.each do |locale|
+          super(app, "#{name}_#{locale.to_s.underscore}")
+        end
+      end
+    end
+  end
+end

data/lib/route_translator/extensions/legacy/route_set.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module ActionDispatch
+  module Routing
+    class RouteSet
+      def add_localized_route(mapping, name, anchor, scope, path, controller, default_action, to, via, formatted, options_constraints, options)
+        route = RouteTranslator::Route.new(self, path, name, options_constraints, options, mapping)
+
+        RouteTranslator::Translator.translations_for(route) do |locale, translated_name, translated_path, translated_options_constraints, translated_options|
+          translated_path_ast = ::ActionDispatch::Journey::Parser.parse(translated_path)
+          translated_mapping  = translate_mapping(locale, self, translated_options, translated_path_ast, scope, controller, default_action, to, formatted, via, translated_options_constraints, anchor)
+
+          add_route translated_mapping, translated_name
+        end
+
+        if RouteTranslator.config.generate_unnamed_unlocalized_routes
+          add_route mapping, nil
+        elsif RouteTranslator.config.generate_unlocalized_routes
+          add_route mapping, name
+        end
+      end
+
+      private
+
+      def translate_mapping(locale, route_set, translated_options, translated_path_ast, scope, controller, default_action, to, formatted, via, translated_options_constraints, anchor)
+        scope_params = {
+          blocks:      (scope[:blocks] || []).dup,
+          constraints: scope[:constraints] || {},
+          defaults:    scope[:defaults] || {},
+          module:      scope[:module],
+          options:     scope[:options] ? scope[:options].merge(translated_options) : translated_options
+        }
+
+        if RouteTranslator.config.host_locales.present?
+          scope_params[:blocks].push RouteTranslator::Host.lambdas_for_locale(locale)
+        end
+
+        ::ActionDispatch::Routing::Mapper::Mapping.build scope_params, route_set, translated_path_ast, controller, default_action, to, via, formatted, translated_options_constraints, anchor, translated_options
+      end
+    end
+  end
+end

data/lib/route_translator/extensions/mapper.rb

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
-require 'action_dispatch'
-
 module ActionDispatch
   module Routing
     class Mapper
       def localized
         @localized = true
         yield
+      ensure
         @localized = false
       end
 
       # rubocop:disable Lint/UnderscorePrefixedVariableName, Metrics/PerceivedComplexity
-      def add_route(action, controller, options, _path, to, via, formatted, anchor, options_constraints) # :nodoc:
+      def add_route(action, controller, as, options_action, _path, to, via, formatted, anchor, options_constraints, internal, options_mapping) # :nodoc:
         return super unless @localized
 
         path = path_for_action(action, _path)
@@ -20,25 +19,20 @@ module ActionDispatch
 
         action = action.to_s
 
-        default_action = options.delete(:action) || @scope[:action]
+        default_action = options_action || @scope[:action]
 
-        if %r{^[\w\-\/]+$}.match?(action)
+        if %r{^[\w\-/]+$}.match?(action)
           default_action ||= action.tr('-', '_') unless action.include?('/')
         else
           action = nil
         end
 
-        as = if options.fetch(:as, true)
-               name_for_action(options.delete(:as), action)
-             else
-               options.delete(:as)
-             end
-
-        path = Mapping.normalize_path URI::DEFAULT_PARSER.escape(path), formatted
-        ast = Journey::Parser.parse path
+        as   = name_for_action(as, action) if as
+        path = Mapping.normalize_path URI::RFC2396_PARSER.escape(path), formatted
+        ast  = Journey::Parser.parse path
 
-        mapping = Mapping.build(@scope, @set, ast, controller, default_action, to, via, formatted, options_constraints, anchor, options)
-        @set.add_localized_route(mapping, as, anchor, @scope, path, controller, default_action, to, via, formatted, options_constraints, options)
+        mapping = Mapping.build(@scope, @set, ast, controller, default_action, to, via, formatted, options_constraints, anchor, internal, options_mapping)
+        @set.add_localized_route(mapping, as, anchor, @scope, path, controller, default_action, to, via, formatted, options_constraints, internal, options_mapping)
       end
       # rubocop:enable Lint/UnderscorePrefixedVariableName, Metrics/PerceivedComplexity
 

data/lib/route_translator/extensions/route_set.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require 'action_dispatch'
-
 module ActionDispatch
   module Routing
     class RouteSet
-      def add_localized_route(mapping, name, anchor, scope, path, controller, default_action, to, via, formatted, options_constraints, options)
-        route = RouteTranslator::Route.new(self, path, name, options_constraints, options, mapping)
+      def add_localized_route(mapping, name, anchor, scope, path, controller, default_action, to, via, formatted, options_constraints, internal, options_mapping)
+        route = RouteTranslator::Route.new(self, path, name, options_constraints, options_mapping, mapping)
 
         RouteTranslator::Translator.translations_for(route) do |locale, translated_name, translated_path, translated_options_constraints, translated_options|
           translated_path_ast = ::ActionDispatch::Journey::Parser.parse(translated_path)
-          translated_mapping  = translate_mapping(locale, self, translated_options, translated_path_ast, scope, controller, default_action, to, formatted, via, translated_options_constraints, anchor)
+          translated_mapping  = translate_mapping(locale, self, translated_options, translated_path_ast, scope, controller, default_action, to, formatted, via, translated_options_constraints, anchor, internal)
 
           add_route translated_mapping, translated_name
         end
@@ -24,7 +22,7 @@ module ActionDispatch
 
       private
 
-      def translate_mapping(locale, route_set, translated_options, translated_path_ast, scope, controller, default_action, to, formatted, via, translated_options_constraints, anchor)
+      def translate_mapping(locale, route_set, translated_options, translated_path_ast, scope, controller, default_action, to, formatted, via, translated_options_constraints, anchor, internal)
         scope_params = {
           blocks:      (scope[:blocks] || []).dup,
           constraints: scope[:constraints] || {},
@@ -37,7 +35,7 @@ module ActionDispatch
           scope_params[:blocks].push RouteTranslator::Host.lambdas_for_locale(locale)
         end
 
-        ::ActionDispatch::Routing::Mapper::Mapping.build scope_params, route_set, translated_path_ast, controller, default_action, to, via, formatted, translated_options_constraints, anchor, translated_options
+        ::ActionDispatch::Routing::Mapper::Mapping.build scope_params, route_set, translated_path_ast, controller, default_action, to, via, formatted, translated_options_constraints, anchor, internal, translated_options
       end
     end
   end

data/lib/route_translator/extensions.rb

@@ -1,5 +1,14 @@
 # frozen_string_literal: true
 
-require_relative 'extensions/mapper'
-require_relative 'extensions/route_set'
+require 'action_dispatch'
+
+# TODO: Remove `else` branch when dropping Rails < 8.1 support
+if ActionDispatch::Routing::Mapper.instance_method(:add_route).arity == 12
+  require_relative 'extensions/mapper'
+  require_relative 'extensions/route_set'
+else
+  require_relative 'extensions/legacy/mapper'
+  require_relative 'extensions/legacy/route_set'
+end
+
 require_relative 'extensions/action_controller'

data/lib/route_translator/host.rb

@@ -18,11 +18,11 @@ module RouteTranslator
     module_function
 
     def locale_from_host(host)
-      locales = RouteTranslator.config.host_locales.each_with_object([]) do |(pattern, locale), result|
-        result << locale.to_sym if host&.match?(regex_for(pattern))
-      end
-      locales &= I18n.available_locales
-      locales.first&.to_sym
+      available_locales = I18n.available_locales
+
+      RouteTranslator.config.host_locales.find do |pattern, locale|
+        host&.match?(regex_for(pattern)) && available_locales.include?(locale&.to_sym)
+      end&.last&.to_sym
     end
 
     def lambdas_for_locale(locale)

data/lib/route_translator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RouteTranslator
-  VERSION = '15.0.0'
+  VERSION = '15.2.0'
 end

data/lib/route_translator.rb

@@ -81,6 +81,10 @@ module RouteTranslator
     locale if I18n.available_locales.include?(locale)
   end
 
+  def locale_from_request(request)
+    locale_from_params(request.params) || Host.locale_from_host(request.host)
+  end
+
   def deprecator
     @deprecator ||= ActiveSupport::Deprecation.new(RouteTranslator::VERSION, 'RouteTranslator')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: route_translator
 version: !ruby/object:Gem::Version
-  version: 15.0.0
+  version: 15.2.0
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -56,6 +56,8 @@ files:
 - lib/route_translator.rb
 - lib/route_translator/extensions.rb
 - lib/route_translator/extensions/action_controller.rb
+- lib/route_translator/extensions/legacy/mapper.rb
+- lib/route_translator/extensions/legacy/route_set.rb
 - lib/route_translator/extensions/mapper.rb
 - lib/route_translator/extensions/route_set.rb
 - lib/route_translator/extensions/test_case.rb
@@ -88,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Translate your Rails routes in a simple manner
 test_files: []