i18n 0.8.6 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9edfdb04f9f18e15e4cf08fd28360a80c0ce7a22
-  data.tar.gz: 855de9451e9b408c46f42d9105e6a31d1f2c9018
+  metadata.gz: dacd9a4d17f9bead5f815c49595c00d1531ed4d7
+  data.tar.gz: 1e4d2ba2b94da73f8dbde1957508a849f7162172
 SHA512:
-  metadata.gz: efb2ecd003577c7b663969ca3849631e3e9ccdb64adf97b0616d99f62da2d29028a3cb0f194479861a8d5133b30e263eca1f5061a830047822d894f7f2dd56ba
-  data.tar.gz: 474bb30ec7bf4f78ce176a8e3410b72cf1f4edd32b5a7b45389e80c3fe6de2dcff5a48739a432c369959aa5008079a896d7bd4ba418529d64082d7ecbe90d837
+  metadata.gz: f59e2cfebd1627b138d763d6b035078729cc62104697189e8781003aeb6537e8682e5f4f0ea0ad68e30f36873d895fdb863d8fca3abece2c48cb229e170ccb92
+  data.tar.gz: cd5c4bc9940ccfe400eda8696d8d9bf7630da4c4e67f46a0a6be9f799f64a54fb8d2bdcb9c80dfdeeb3dfc9e14f10d1af715d45dc230415e3491c7b6a187d3e6

data/gemfiles/Gemfile.rails-5.1.x

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gemspec :path => '..'
+
+gem 'activesupport', '~> 5.1.0'
+gem 'mocha'
+gem 'test_declarative'
+gem 'rake'
+gem 'minitest'

data/lib/i18n.rb

@@ -1,3 +1,5 @@
+require 'concurrent/map'
+
 require 'i18n/version'
 require 'i18n/exceptions'
 require 'i18n/interpolate/ruby'
@@ -8,10 +10,16 @@ module I18n
   autoload :Gettext, 'i18n/gettext'
   autoload :Locale,  'i18n/locale'
   autoload :Tests,   'i18n/tests'
+  autoload :Middleware,   'i18n/middleware'
 
   RESERVED_KEYS = [:scope, :default, :separator, :resolve, :object, :fallback, :fallback_in_progress, :format, :cascade, :throw, :raise, :deep_interpolation]
   RESERVED_KEYS_PATTERN = /%\{(#{RESERVED_KEYS.join("|")})\}/
 
+
+  def self.new_double_nested_cache # :nodoc:
+    Concurrent::Map.new { |h,k| h[k] = Concurrent::Map.new }
+  end
+
   module Base
     # Gets I18n configuration object.
     def config
@@ -321,8 +329,10 @@ module I18n
       end
     end
 
+    @@normalized_key_cache = I18n.new_double_nested_cache
+
     def normalize_key(key, separator)
-      normalized_key_cache[separator][key] ||=
+      @@normalized_key_cache[separator][key] ||=
         case key
         when Array
           key.map { |k| normalize_key(k, separator) }.flatten
@@ -333,10 +343,6 @@ module I18n
           keys
         end
     end
-
-    def normalized_key_cache
-      @normalized_key_cache ||= Hash.new { |h,k| h[k] = {} }
-    end
   end
 
   extend Base

data/lib/i18n/backend/fallbacks.rb

@@ -37,7 +37,8 @@ module I18n
       def translate(locale, key, options = {})
         return super unless options.fetch(:fallback, true)
         return super if options[:fallback_in_progress]
-        default = extract_non_symbol_default!(options) if options[:default]
+        original_default = options[:default]
+        extract_non_symbol_default!(options)
 
         begin
           options[:fallback_in_progress] = true
@@ -45,7 +46,7 @@ module I18n
             begin
               catch(:exception) do
                 result = super(fallback, key, options)
-                return result if (result.nil? && options.key?(:default) && options[:default].nil?) || !result.nil?
+                return result unless result.nil?
               end
             rescue I18n::InvalidLocale
               # we do nothing when the locale is invalid, as this is a fallback anyways.
@@ -55,7 +56,7 @@ module I18n
           options.delete(:fallback_in_progress)
         end
 
-        return super(locale, nil, options.merge(:default => default)) if default
+        return super(locale, nil, options.merge(:default => original_default)) if options.key?(:default)
         throw(:exception, I18n::MissingTranslation.new(locale, key, options))
       end
 

data/lib/i18n/backend/flatten.rb

@@ -43,7 +43,7 @@ module I18n
 
       # Store flattened links.
       def links
-        @links ||= Hash.new { |h,k| h[k] = {} }
+        @links ||= I18n.new_double_nested_cache
       end
 
       # Flatten keys for nested Hashes by chaining up keys:
@@ -99,7 +99,7 @@ module I18n
         end
 
         def find_link(locale, key) #:nodoc:
-          links[locale].each do |from, to|
+          links[locale].each_pair do |from, to|
             return [from, to] if key[0, from.length] == from
           end && nil
         end
@@ -110,4 +110,4 @@ module I18n
 
     end
   end
-end
+end

data/lib/i18n/backend/memoize.rb

@@ -34,7 +34,7 @@ module I18n
         end
 
         def memoized_lookup
-          @memoized_lookup ||= Hash.new { |h, k| h[k] = {} }
+          @memoized_lookup ||= I18n.new_double_nested_cache
         end
 
         def reset_memoizations!(locale=nil)

data/lib/i18n/middleware.rb

@@ -0,0 +1,15 @@
+module I18n
+  class Middleware
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      @app.call(env)
+    ensure
+      Thread.current[:i18n_config] = I18n::Config.new
+    end
+
+  end
+end

data/lib/i18n/version.rb

@@ -1,3 +1,3 @@
 module I18n
-  VERSION = "0.8.6"
+  VERSION = "0.9.0"
 end

data/test/backend/fallbacks_test.rb

@@ -8,7 +8,7 @@ class I18nBackendFallbacksTranslateTest < I18n::TestCase
   def setup
     super
     I18n.backend = Backend.new
-    store_translations(:en, :foo => 'Foo in :en', :bar => 'Bar in :en', :buz => 'Buz in :en')
+    store_translations(:en, :foo => 'Foo in :en', :bar => 'Bar in :en', :buz => 'Buz in :en', :interpolate => 'Interpolate %{value}')
     store_translations(:de, :bar => 'Bar in :de', :baz => 'Baz in :de')
     store_translations(:'de-DE', :baz => 'Baz in :de-DE')
     store_translations(:'pt-BR', :baz => 'Baz in :pt-BR')
@@ -20,6 +20,10 @@ class I18nBackendFallbacksTranslateTest < I18n::TestCase
     assert_equal 'Baz in :de-DE', I18n.t(:baz, :locale => :'de-DE')
   end
 
+  test "returns interpolated value if no key provided" do
+    assert_equal 'Interpolate %{value}', I18n.t(:interpolate)
+  end
+
   test "returns the :en translation for a missing :de translation" do
     assert_equal 'Foo in :en', I18n.t(:foo, :locale => :de)
   end
@@ -55,6 +59,11 @@ class I18nBackendFallbacksTranslateTest < I18n::TestCase
     assert_equal({}, I18n.t(:missing_bar, :locale => :'de-DE', :default => {}))
   end
 
+  test "returns the :de translation for a missing :'de-DE' when :default is nil" do
+    assert_equal 'Bar in :de', I18n.t(:bar, :locale => :'de-DE', :default => nil)
+    assert_nil I18n.t(:missing_bar, :locale => :'de-DE', :default => nil)
+  end
+
   test "returns the :'de-DE' default :baz translation for a missing :'de-DE' when defaults contains Symbol" do
     assert_equal 'Baz in :de-DE', I18n.t(:missing_foo, :locale => :'de-DE', :default => [:baz, "Default Bar"])
   end

data/test/backend/memoize_test.rb

@@ -44,4 +44,36 @@ class I18nBackendMemoizeTest < I18nBackendSimpleTest
     assert I18n.available_locales.include?(:copa)
     assert_equal 1, I18n.backend.spy_calls
   end
+
+  module TestLookup
+    def lookup(locale, key, scope = [], options = {})
+      keys = I18n.normalize_keys(locale, key, scope, options[:separator])
+      keys.inspect
+    end
+  end
+
+  def test_lookup_concurrent_consistency
+    backend_impl = Class.new(I18n::Backend::Simple) do
+      include TestLookup
+      include I18n::Backend::Memoize
+    end
+    backend = backend_impl.new
+
+    memoized_lookup = backend.send(:memoized_lookup)
+
+    assert_equal "[:foo, :scoped, :sample]", backend.translate('foo', scope = [:scoped, :sample])
+
+    results = []
+    30.times.inject([]) do |memo, i|
+      memo << Thread.new do
+        backend.translate('bar', scope); backend.translate(:baz, scope)
+      end
+    end.each(&:join)
+
+    memoized_lookup = backend.send(:memoized_lookup)
+    puts memoized_lookup.inspect if $VERBOSE
+    assert_equal 3, memoized_lookup.size, "NON-THREAD-SAFE lookup memoization backend: #{memoized_lookup.class}"
+    # if a plain Hash is used might eventually end up in a weird (inconsistent) state
+  end
+
 end

data/test/i18n/middleware_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+class I18nMiddlewareTest < I18n::TestCase
+  def setup
+    super
+    I18n.default_locale = :fr
+    @app = DummyRackApp.new
+    @middleware = I18n::Middleware.new(@app)
+  end
+
+  test "middleware initializes new config object after request" do
+    old_i18n_config_object_id = Thread.current[:i18n_config].object_id
+    @middleware.call({})
+
+    updated_i18n_config_object_id = Thread.current[:i18n_config].object_id
+    assert_not_equal updated_i18n_config_object_id, old_i18n_config_object_id
+  end
+
+  test "succesfully resets i18n locale to default locale by defining new config" do
+    @middleware.call({})
+
+    assert_equal :fr, I18n.locale
+  end
+end

data/test/test_helper.rb

@@ -53,3 +53,9 @@ class I18n::TestCase < TEST_CASE
     File.dirname(__FILE__) + '/test_data/locales'
   end
 end
+
+class DummyRackApp
+  def call(env)
+    I18n.locale = :es
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
 platform: ruby
 authors:
 - Sven Fuchs
@@ -12,8 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
-dependencies: []
+date: 2017-10-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: New wave Internationalization support for Ruby.
 email: rails-i18n@googlegroups.com
 executables: []
@@ -27,6 +41,7 @@ files:
 - gemfiles/Gemfile.rails-4.1.x
 - gemfiles/Gemfile.rails-4.2.x
 - gemfiles/Gemfile.rails-5.0.x
+- gemfiles/Gemfile.rails-5.1.x
 - gemfiles/Gemfile.rails-master
 - lib/i18n.rb
 - lib/i18n/backend.rb
@@ -59,6 +74,7 @@ files:
 - lib/i18n/locale/tag/parents.rb
 - lib/i18n/locale/tag/rfc4646.rb
 - lib/i18n/locale/tag/simple.rb
+- lib/i18n/middleware.rb
 - lib/i18n/tests.rb
 - lib/i18n/tests/basics.rb
 - lib/i18n/tests/defaults.rb
@@ -101,6 +117,7 @@ files:
 - test/i18n/gettext_plural_keys_test.rb
 - test/i18n/interpolate_test.rb
 - test/i18n/load_path_test.rb
+- test/i18n/middleware_test.rb
 - test/i18n_test.rb
 - test/locale/fallbacks_test.rb
 - test/locale/tag/rfc4646_test.rb
@@ -133,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: New wave Internationalization support for Ruby