route_translator 15.1.0 → 15.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cca7e784d193668fe69a3b9eae57116700bc4699c1930a79f720de4ce206fbe
-  data.tar.gz: a852fa9a6c8c00bad0223199b1e3ec8159f5bf70774a5bf7b531519c25ccaf4c
+  metadata.gz: 13e7ca36c52b904acf706a63b2cc0b352ed0206010b69dbf65eba016ab2fefdb
+  data.tar.gz: 6721c17d101b7528a9a603ff196c0fabdc49d4b0ca54a42e3b842213ef585ead
 SHA512:
-  metadata.gz: d85e32c58543f4ef062777a7257f5377f661acc37e4a003c05076824d487020f0c70742c7256262b824596b4247f88fab3ab3ae2f12edccd1610c3cff3236091
-  data.tar.gz: bc6d14c007375d9e0196f965781431c890793588293a23fe4e8ea95c669eca7afab4488e9a3bee3b0f95be72c044081b68fc1f0c5da4651ad68eca5eac64979f
+  metadata.gz: 4837bc35c697c191a1219d42c5e8a6a05241aaa2cce847dfee6e000acfb460335b6007c1d499c1a049ece53cbff466a3647385e1a5b85c8ff9e6b65f7da98cbc
+  data.tar.gz: 2fe7754133ec168a03208316f98ea24696700dc03766d9b86bbbee25785e77f85d0445f82fedebc45fd43a8b51f4fc28bbae57d817d0f1bb206a0bc0b82fcb9b

data/CHANGELOG.md

@@ -1,10 +1,14 @@
 # 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 ([#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
 

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,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'action_dispatch'
-
 module ActionDispatch
   module Routing
     class Mapper
@@ -13,7 +11,7 @@ module ActionDispatch
       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)
@@ -21,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: route_translator
 version: !ruby/object:Gem::Version
-  version: 15.1.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