i18n 1.14.7 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cca63854d9dd69dfe1d36eb0388926fc5e7a7cd297ece21e2fdc431ef9c4c286
-  data.tar.gz: 1ab0f78752eabfd6a03b7c1f4a6f4e45c03689e9fbc0936cd65d6cd1f4103363
+  metadata.gz: 765ae65d6898b1a8d8b9766960d44bb1ffd9f97f5455b160cf9e33a94c33803c
+  data.tar.gz: ff713e7c2e659e33093223a9e6cb9b95e19ba4a21abb311af4db8fc696185b0e
 SHA512:
-  metadata.gz: e8dd4e1cf010b24d748b4e2713794296964301234b9dbed36c96ae591677fb9ca3d5df7f5aedd86a48a1f470ad81de07997f2103107af32786486892204222d4
-  data.tar.gz: 9e2008459e303dc8e87742231d2468faa3f2edcb61a30c3c26f5240cc5606a8132bccc70ec3e45a9cfcc38eaf04d84c74c6d643ef54f1df2534c66706677180d
+  metadata.gz: c5d16537a7975629cb4337f061e5331e76499edf28dfbebcd44f1c5de63423262a95d9d4821366e7e550419aecd5ff92b15be56b50db4b166568b60e93f02642
+  data.tar.gz: 290772af479be2b4e345b4434cff6d50a7cdcece0fcb7e9a382c41568f2fbf52c264966e944d3e04fdf27f6d81d51c103f66464c15e2b6bd42e3d60951abc628

data/README.md

@@ -19,7 +19,7 @@ We support Rails versions from 6.0 and up.
 
 ### Ruby (without Rails)
 
-We support Ruby versions from 3.0 and up.
+We support Ruby versions from 3.2 and up.
 
 If you want to use this library without Rails, you can simply add `i18n` to your `Gemfile`:
 
@@ -54,6 +54,18 @@ I18n.locale = :de
 I18n.t(:test) # => "Dies ist ein Test"
 ```
 
+### Fiber-safe config updates
+
+`Fiber[]` values are inherited by child fibers.
+To avoid sharing mutable config objects across fibers, prefer creating updated configs and setting them with `set!`:
+
+```ruby
+I18n.config.with(locale: :ja).set!
+```
+
+`set!` stores a frozen config in the current execution context.
+This keeps inherited state safe and lets updates happen by replacing config objects.
+
 ## Features
 
 * Translation and localization

data/lib/i18n/backend/fallbacks.rb

@@ -16,13 +16,13 @@ module I18n
     # Returns the current fallbacks implementation. Defaults to +I18n::Locale::Fallbacks+.
     def fallbacks
       @@fallbacks ||= I18n::Locale::Fallbacks.new
-      Thread.current[:i18n_fallbacks] || @@fallbacks
+      Fiber[:i18n_fallbacks] || @@fallbacks
     end
 
     # Sets the current fallbacks implementation. Use this to set a different fallbacks implementation.
     def fallbacks=(fallbacks)
       @@fallbacks = fallbacks.is_a?(Array) ? I18n::Locale::Fallbacks.new(fallbacks) : fallbacks
-      Thread.current[:i18n_fallbacks] = @@fallbacks
+      Fiber[:i18n_fallbacks] = @@fallbacks
     end
   end
 

data/lib/i18n/backend/interpolation_compiler.rb

@@ -25,6 +25,7 @@ module I18n
 
         def compile_if_an_interpolation(string)
           if interpolated_str?(string)
+            string = +string
             string.instance_eval <<-RUBY_EVAL, __FILE__, __LINE__
               def i18n_interpolate(v = {})
                 "#{compiled_interpolation_body(string)}"

data/lib/i18n/backend/simple.rb

@@ -42,7 +42,7 @@ module I18n
           locale = locale.to_sym
           translations[locale] ||= Concurrent::Hash.new
           data = Utils.deep_symbolize_keys(data) unless options.fetch(:skip_symbolize_keys, false)
-          Utils.deep_merge!(translations[locale], data)
+          MUTEX.synchronize { Utils.deep_merge!(translations[locale], data) }
         end
 
         # Get available locales from the translations hash

data/lib/i18n/backend/transliterator.rb

@@ -68,7 +68,8 @@ module I18n
           "ŧ"=>"t", "Ũ"=>"U", "ũ"=>"u", "Ū"=>"U", "ū"=>"u", "Ŭ"=>"U", "ŭ"=>"u",
           "Ů"=>"U", "ů"=>"u", "Ű"=>"U", "ű"=>"u", "Ų"=>"U", "ų"=>"u", "Ŵ"=>"W",
           "ŵ"=>"w", "Ŷ"=>"Y", "ŷ"=>"y", "Ÿ"=>"Y", "Ź"=>"Z", "ź"=>"z", "Ż"=>"Z",
-          "ż"=>"z", "Ž"=>"Z", "ž"=>"z"
+          "ż"=>"z", "Ž"=>"Z", "ž"=>"z", "Ǫ"=>"O", "ǫ"=>"o", "Ǭ"=>"O",
+          "ǭ"=>"o"
         }.freeze
 
         def initialize(rule = nil)
@@ -80,7 +81,7 @@ module I18n
         def transliterate(string, replacement = nil)
           replacement ||= DEFAULT_REPLACEMENT_CHAR
           string.gsub(/[^\x00-\x7f]/u) do |char|
-            approximations[char] || replacement
+            approximations[char] || (replacement == :none ? char : replacement)
           end
         end
 

data/lib/i18n/config.rb

@@ -10,7 +10,41 @@ module I18n
       defined?(@locale) && @locale != nil ? @locale : default_locale
     end
 
-    # Sets the current locale pseudo-globally, i.e. in the Thread.current hash.
+    def initialize
+      @owner = Fiber.current
+    end
+
+    def owned_by?(fiber)
+      @owner == fiber
+    end
+
+    def owner=(fiber)
+      @owner = fiber
+    end
+
+    def initialize_copy(other)
+      @owner = Fiber.current
+    end
+
+    # Returns a copied configuration with the provided attributes set.
+    def with(**attrs)
+      dup.tap do |copy|
+        attrs.each do |name, value|
+          copy.public_send("#{name}=", value)
+        end
+      end
+    end
+
+    # Sets this configuration as the current one for the active execution context.
+    # The stored configuration is frozen to avoid sharing mutable state between fibers.
+    def set!
+      self.owner = Fiber.current unless frozen?
+      freeze
+      I18n.config = self
+      self
+    end
+
+    # Sets the current locale pseudo-globally, i.e. in the Thread.current or Fiber local hash.
     def locale=(locale)
       I18n.enforce_available_locales!(locale)
       @locale = locale && locale.to_sym

data/lib/i18n/exceptions.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'cgi'
-
 module I18n
   class ExceptionHandler
     def call(exception, _locale, _key, _options)

data/lib/i18n/middleware.rb

@@ -10,7 +10,7 @@ module I18n
     def call(env)
       @app.call(env)
     ensure
-      Thread.current[:i18n_config] = I18n::Config.new
+      Fiber[:i18n_config] = I18n::Config.new
     end
 
   end

data/lib/i18n/tests/interpolation.rb

@@ -89,14 +89,14 @@ module I18n
         end
 
         test "interpolation: ASCII strings in the backend should be encoded to UTF8 if interpolation options are in UTF8" do
-          I18n.backend.store_translations 'en', 'encoding' => ('%{who} let me go'.force_encoding("ASCII"))
+          I18n.backend.store_translations 'en', 'encoding' => ('%{who} let me go'.dup.force_encoding(Encoding::US_ASCII))
           result = I18n.t 'encoding', :who => "måmmå miå"
           assert_equal Encoding::UTF_8, result.encoding
         end
 
         test "interpolation: UTF8 strings in the backend are still returned as UTF8 with ASCII interpolation" do
           I18n.backend.store_translations 'en', 'encoding' => 'måmmå miå %{what}'
-          result = I18n.t 'encoding', :what => 'let me go'.force_encoding("ASCII")
+          result = I18n.t 'encoding', :what => 'let me go'.dup.force_encoding(Encoding::US_ASCII)
           assert_equal Encoding::UTF_8, result.encoding
         end
 
@@ -172,7 +172,7 @@ module I18n
       end
 
       def euc_jp(string)
-        string.encode!(Encoding::EUC_JP)
+        string.encode(Encoding::EUC_JP)
       end
 
       def interpolate(*args)

data/lib/i18n/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module I18n
-  VERSION = "1.14.7"
+  VERSION = "1.15.0"
 end

data/lib/i18n.rb

@@ -55,12 +55,29 @@ module I18n
   module Base
     # Gets I18n configuration object.
     def config
-      Thread.current[:i18n_config] ||= I18n::Config.new
+      current = Fiber[:i18n_config] || self.config = I18n::Config.new
+      if current.respond_to?(:owned_by?) && !current.owned_by?(Fiber.current)
+        current = current.dup
+        Fiber[:i18n_config] = current
+      end
+
+      current
+    end
+
+    # Gets a mutable I18n configuration object.
+    def writable_config
+      current = config
+      return current unless current.frozen?
+
+      current = current.dup
+      Fiber[:i18n_config] = current
+      current
     end
 
     # Sets I18n configuration object.
     def config=(value)
-      Thread.current[:i18n_config] = value
+      Fiber[:i18n_config] = value
+      value.owner = Fiber.current if value.respond_to?(:owner=) && !value.frozen?
     end
 
     # Write methods which delegates to the configuration object
@@ -72,7 +89,7 @@ module I18n
         end
 
         def #{method}=(value)
-          config.#{method} = (value)
+          writable_config.#{method} = (value)
         end
       DELEGATORS
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n
 version: !ruby/object:Gem::Version
-  version: 1.14.7
+  version: 1.15.0
 platform: ruby
 authors:
 - Sven Fuchs
@@ -10,10 +10,9 @@ authors:
 - Stephan Soller
 - Saimon Moore
 - Ryan Bigg
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -91,7 +90,6 @@ metadata:
   changelog_uri: https://github.com/ruby-i18n/i18n/releases
   documentation_uri: https://guides.rubyonrails.org/i18n.html
   source_code_uri: https://github.com/ruby-i18n/i18n
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -99,15 +97,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: New wave Internationalization support for Ruby
 test_files: []