route_translator 13.1.1 → 13.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13ffed7aec8713246cd7e9866e95b58a74aa96ffb3d633abcb709577a82d3eb4
-  data.tar.gz: 917888bdb81c4b9f6f191e2855526b5a674d258b18204f31ed3b47d01eb5c14b
+  metadata.gz: b6fce16b25f253c530a462e14251479236768723b507359e93db129274ab14ae
+  data.tar.gz: 0fb41bf9534c717748acc18bd61213998a3648b7808b20ced17132694f84f135
 SHA512:
-  metadata.gz: 3d98eea935387e378734dea58b0483b1640d9b0680578c037be317dca02e5d187a4e11002c450114d4adb9c98433ad9777c6c38692c9c1e1768988ca32bffc61
-  data.tar.gz: ad9b23bddd7838864b73a3cbf53f222046ba82f649586f21223407fbe173bc0400c1c4c91f24305da9b7d932bc7475b7612b6112e4bbd35a2938490cfe65ace7
+  metadata.gz: 067e8efc0ef38001c0dee08bf2b7640f497edf0f69448448a0c596b63ac32c0110f906160d2fe34991d0c9f50895ef0f775e903f382c54748fedfae6de8df6eb
+  data.tar.gz: b5b62f4644dc3fd6ad6401927ce4af0b897572467d86ffaabb444254680e9adaf97194a2c3cc17b6bf9abdfdad1213bd350ddeb73c5e9c242c53baef93590387

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 13.2.1 / 2023-07-28
+
+* [BUGFIX] Fix deprecation on Rails Edge
+
+## 13.2.0 / 2023-07-28
+
+* [FEATURE] Add option for standard nested separator ([#285](https://github.com/enriclluelles/route_translator/pull/285))
+* [ENHANCEMENT] Update development dependencies
+
 ## 13.1.1 / 2023-07-01
 
 * [ENHANCEMENT] Better integration with ActionController::TestCase

data/README.md

@@ -280,7 +280,13 @@ end
 | `host_locales` | Sets `I18n.locale` based on `request.host`. Useful for apps accepting requests from more than one domain. See below for more details | `{}` |
 | `locale_param_key` | The param key used to set the locale to the newly generated routes | `:locale` |
 | `locale_segment_proc` | The locale segment of the url will by default be `locale.to_s.downcase`. You can supply your own mechanism via a Proc that takes `locale` as an argument, e.g. `->(locale) { locale.to_s.upcase }` | `false` |
+| `i18n_use_slash_separator` | Use the exact controller path `account/foo` for looking up translations instead of nested keys `account.foo` | `false` |
 
+#### Deprecated options
+
+- `i18n_use_slash_separator` is deprecated and will be forced to `true` in the next major release of Route Translator. This only
+  affects application with nested routes. Please set this option to `true` to remove the deprecation message and ensure
+  to convert nested routes like `people.products` to the new `people/products`.
 
 ### Host-based Locale
 

data/lib/route_translator/route.rb

@@ -16,7 +16,11 @@ module RouteTranslator
     def scope
       @scope ||=
         if mapping.defaults[:controller]
-          %i[routes controllers].concat mapping.defaults[:controller].split('/').map(&:to_sym)
+          if RouteTranslator.config.i18n_use_slash_separator
+            %i[routes controllers].push mapping.defaults[:controller]
+          else
+            %i[routes controllers].concat mapping.defaults[:controller].split('/').map(&:to_sym)
+          end
         else
           %i[routes controllers]
         end

data/lib/route_translator/version.rb

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

data/lib/route_translator.rb

@@ -5,6 +5,7 @@ require 'active_support'
 require 'route_translator/extensions'
 require 'route_translator/translator'
 require 'route_translator/host'
+require 'route_translator/version'
 
 module RouteTranslator
   extend RouteTranslator::Host
@@ -20,7 +21,8 @@ module RouteTranslator
     hide_locale:                         false,
     host_locales:                        {},
     locale_param_key:                    :locale,
-    locale_segment_proc:                 false
+    locale_segment_proc:                 false,
+    i18n_use_slash_separator:            false
   }.freeze
 
   Configuration = Struct.new(*DEFAULT_CONFIGURATION.keys)
@@ -34,6 +36,18 @@ module RouteTranslator
       @config.generate_unnamed_unlocalized_routes = false
       @config.hide_locale                         = true
     end
+
+    def check_deprecations
+      return if @config.i18n_use_slash_separator
+
+      deprecator.warn <<~MSG
+        `i18n_use_slash_separator` set to `false` is deprecated and will be
+        removed in the next major release of Route Translator to match
+        Rails' ActiveRecord nested model syntax.
+
+        More information at https://github.com/enriclluelles/route_translator/pull/285
+      MSG
+    end
   end
 
   module_function
@@ -48,6 +62,7 @@ module RouteTranslator
     yield @config if block_given?
 
     resolve_host_locale_config_conflicts if @config.host_locales.present?
+    check_deprecations
 
     @config
   end
@@ -76,4 +91,8 @@ module RouteTranslator
     locale = params[config.locale_param_key]&.to_sym
     locale if I18n.available_locales.include?(locale)
   end
+
+  def deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new(RouteTranslator::VERSION, 'RouteTranslator')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: route_translator
 version: !ruby/object:Gem::Version
-  version: 13.1.1
+  version: 13.2.1
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-01 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Translate your Rails routes in a simple manner