Merge branch 'master' into update-workflows

* master: Revert "Bump to 1.14.2" Raise when translated entry contains interpolations for reserved keywords and no substitutions provided Update `mocha` gem condense to TOKENIZER Speed up INTERPOLATION_SYNTAX Improve TOKENIZER by 23%
ruby-i18n · Mar 5, 2024 · b736751 · b736751
2 parents 442d3c0 + 8cc95fc
commit b736751
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 17 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'mocha', '~> 1.7.0'
+gem 'mocha', '~> 2.1.0'
 gem 'test_declarative', '0.0.6'
 gem 'rake', '~> 13'
 gem 'minitest', '~> 5.14'

diff --git a/gemfiles/Gemfile.rails-6.0.x b/gemfiles/Gemfile.rails-6.0.x
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec :path => '..'
 
 gem 'activesupport', '~> 6.0.0'
-gem 'mocha', '~> 2'
+gem 'mocha', '~> 2.1.0'
 gem 'test_declarative', '0.0.6'
 gem 'rake'
 gem 'minitest', '~> 5.14'

diff --git a/gemfiles/Gemfile.rails-6.1.x b/gemfiles/Gemfile.rails-6.1.x
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec :path => '..'
 
 gem 'activesupport', '~> 6.1'
-gem 'mocha', '~> 2'
+gem 'mocha', '~> 2.1.0'
 gem 'test_declarative', '0.0.6'
 gem 'rake'
 gem 'minitest', '~> 5.14'

diff --git a/gemfiles/Gemfile.rails-7.0.x b/gemfiles/Gemfile.rails-7.0.x
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec :path => '..'
 
 gem 'activesupport', '~> 7.0'
-gem 'mocha', '~> 2'
+gem 'mocha', '~> 2.1.0'
 gem 'test_declarative', '0.0.6'
 gem 'rake'
 gem 'minitest', '~> 5.14'

diff --git a/gemfiles/Gemfile.rails-7.1.x b/gemfiles/Gemfile.rails-7.1.x
@@ -2,8 +2,8 @@ source 'https://rubygems.org'
 
 gemspec :path => '..'
 
-gem 'activesupport', '~> 7.1'
-gem 'mocha', '~> 2'
+gem 'activesupport', '~> 7.1.0'
+gem 'mocha', '~> 2.1.0'
 gem 'test_declarative', '0.0.6'
 gem 'rake'
 gem 'minitest', '~> 5.14'

diff --git a/gemfiles/Gemfile.rails-main b/gemfiles/Gemfile.rails-main
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec :path => '..'
 
 gem 'activesupport', github: 'rails/rails', branch: 'main'
-gem 'mocha', '~> 1.7.0'
+gem 'mocha', '~> 2.1.0'
 gem 'test_declarative', '0.0.6'
 gem 'rake'
 gem 'minitest', '~> 5.1'

diff --git a/lib/i18n/backend/base.rb b/lib/i18n/backend/base.rb
@@ -55,12 +55,14 @@ def translate(locale, key, options = EMPTY_HASH)
 
         deep_interpolation = options[:deep_interpolation]
         values = Utils.except(options, *RESERVED_KEYS) unless options.empty?
-        if values
+        if values && !values.empty?
           entry = if deep_interpolation
             deep_interpolate(locale, entry, values)
           else
             interpolate(locale, entry, values)
           end
+        elsif entry.is_a?(String) && entry =~ I18n.reserved_keys_pattern
+          raise ReservedInterpolationKey.new($1.to_sym, entry)
         end
         entry
       end

diff --git a/lib/i18n/backend/interpolation_compiler.rb b/lib/i18n/backend/interpolation_compiler.rb
@@ -21,8 +21,7 @@ module InterpolationCompiler
       module Compiler
         extend self
 
-        TOKENIZER                    = /(%%\{[^\}]+\}|%\{[^\}]+\})/
-        INTERPOLATION_SYNTAX_PATTERN = /(%)?(%\{([^\}]+)\})/
+        TOKENIZER = /(%%?\{[^}]+\})/
 
         def compile_if_an_interpolation(string)
           if interpolated_str?(string)
@@ -37,7 +36,7 @@ def i18n_interpolate(v = {})
         end
 
         def interpolated_str?(str)
-          str.kind_of?(::String) && str =~ INTERPOLATION_SYNTAX_PATTERN
+          str.kind_of?(::String) && str =~ TOKENIZER
         end
 
         protected
@@ -48,13 +47,12 @@ def tokenize(str)
 
         def compiled_interpolation_body(str)
           tokenize(str).map do |token|
-            (matchdata = token.match(INTERPOLATION_SYNTAX_PATTERN)) ? handle_interpolation_token(token, matchdata) : escape_plain_str(token)
+            token.match(TOKENIZER) ? handle_interpolation_token(token) : escape_plain_str(token)
           end.join
         end
 
-        def handle_interpolation_token(interpolation, matchdata)
-          escaped, pattern, key = matchdata.values_at(1, 2, 3)
-          escaped ? pattern : compile_interpolation_token(key.to_sym)
+        def handle_interpolation_token(token)
+          token.start_with?('%%') ? token[1..] : compile_interpolation_token(token[2..-2])
         end
 
         def compile_interpolation_token(key)

diff --git a/lib/i18n/tests/interpolation.rb b/lib/i18n/tests/interpolation.rb
@@ -112,6 +112,10 @@ module Interpolation
         assert_raises(I18n::ReservedInterpolationKey) { interpolate(:foo => :bar, :default => '%{default}') }
         assert_raises(I18n::ReservedInterpolationKey) { interpolate(:foo => :bar, :default => '%{separator}') }
         assert_raises(I18n::ReservedInterpolationKey) { interpolate(:foo => :bar, :default => '%{scope}') }
+        assert_raises(I18n::ReservedInterpolationKey) { interpolate(:default => '%{scope}') }
+
+        I18n.backend.store_translations(:en, :interpolate => 'Hi %{scope}!')
+        assert_raises(I18n::ReservedInterpolationKey) { interpolate(:interpolate) }
       end
 
       test "interpolation: deep interpolation for default string" do

diff --git a/lib/i18n/version.rb b/lib/i18n/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module I18n
-  VERSION = "1.14.2"
+  VERSION = "1.14.1"
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require 'bundler/setup'
 require 'i18n'
-require 'mocha/setup'
+require 'mocha/minitest'
 require 'test_declarative'
 
 class I18n::TestCase < Minitest::Test