Merge branch 'master' into develop

* master:
  Update version and changelog
  Improve dummy app configuration

CHANGELOG.md

@@ -1,5 +1,9 @@
 # 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))

lib/route_translator.rb

@@ -5,6 +5,7 @@
 require 'route_translator/extensions'
 require 'route_translator/translator'
 require 'route_translator/host'
+require 'route_translator/version'
 
 module RouteTranslator
   extend RouteTranslator::Host
@@ -39,7 +40,7 @@ def resolve_host_locale_config_conflicts
     def check_deprecations
       return if @config.i18n_use_slash_separator
 
-      ActiveSupport::Deprecation.warn <<~MSG
+      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.
@@ -90,4 +91,8 @@ def locale_from_params(params)
     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

lib/route_translator/version.rb

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

test/dummy/config/application.rb

@@ -8,5 +8,6 @@ module Dummy
   class Application < Rails::Application
     config.active_support.deprecation = :log
     config.eager_load = false
+    config.active_support.cache_format_version = 7.0 if Rails.version >= '7.0'
   end
 end

test/integration/i18n_slash_separator_test.rb

@@ -10,23 +10,23 @@ def teardown
   end
 
   def test_deprecation_when_default
-    assert_deprecated('i18n_use_slash_separator') do
+    assert_deprecated('i18n_use_slash_separator', RouteTranslator.deprecator) do
       RouteTranslator.config
     end
   end
 
   def test_deprecation_when_false
     config_i18n_use_slash_separator false
 
-    assert_deprecated('i18n_use_slash_separator') do
+    assert_deprecated('i18n_use_slash_separator', RouteTranslator.deprecator) do
       RouteTranslator.config
     end
   end
 
   def test_no_deprecation_when_true
     config_i18n_use_slash_separator true
 
-    assert_not_deprecated do
+    assert_not_deprecated(RouteTranslator.deprecator) do
       RouteTranslator.config
     end
   end