i18n 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 74991fa815d721be21fc8f4cb3d10dbe7c069059
-  data.tar.gz: 9f325a9e4bc99bc01883448c5871fc13f1eff5a3
+SHA256:
+  metadata.gz: 57b2ff3a6c23f6e74b39b1be0a56311a2b49025f71d9e16ac4fde2d93e6448bf
+  data.tar.gz: 7d21368bbe369fc644e10785db19f47f7d5eef492dfdebaa090152470ffe3c00
 SHA512:
-  metadata.gz: 641844afc32707026b98596528a19fe177fef51e5d681f98db746d1980315c85f864dab53c5390f62f4d143d31b68b75f41b88e780478f0b00bde9e9e6cbf7dc
-  data.tar.gz: f62868e06de0b22744316dfcc74d1e928c6263552043bfea8dfbfd985ad660dbdc404e8324d6b5a85dd62d8355935e8cb999a2c21f540fe5fd68725041d05b21
+  metadata.gz: 8bd2956e1905c8b3d0dfb65696f6f4b96e91583a649bdf0e81772dad80c72240ee1b96996983b8e44ee312fae58aee63732166268b34669ead66c3f87d716dee
+  data.tar.gz: e74c46af688ac02e8fb776b39dc873ae9951901b9567e08d1fd21b68d0d5677cbc9ceeba2d8b2f2c1500b3f886084e31eafc80083adaa4572017f3ccb67a0028

data/gemfiles/Gemfile.rails-3.2.x

@@ -7,3 +7,4 @@ gem 'mocha'
 gem 'test_declarative'
 gem 'rake'
 gem 'minitest'
+gem 'oj'

data/gemfiles/Gemfile.rails-4.0.x

@@ -7,3 +7,4 @@ gem 'mocha'
 gem 'test_declarative'
 gem 'rake'
 gem 'minitest'
+gem 'oj'

data/gemfiles/Gemfile.rails-4.1.x

@@ -7,3 +7,4 @@ gem 'mocha'
 gem 'test_declarative'
 gem 'rake'
 gem 'minitest'
+gem 'oj'

data/gemfiles/Gemfile.rails-4.2.x

@@ -7,3 +7,4 @@ gem 'mocha'
 gem 'test_declarative'
 gem 'rake'
 gem 'minitest'
+gem 'oj'

data/gemfiles/Gemfile.rails-5.0.x

@@ -7,3 +7,4 @@ gem 'mocha'
 gem 'test_declarative'
 gem 'rake'
 gem 'minitest'
+gem 'oj'

data/gemfiles/Gemfile.rails-5.1.x

@@ -7,3 +7,4 @@ gem 'mocha'
 gem 'test_declarative'
 gem 'rake'
 gem 'minitest'
+gem 'oj'

data/gemfiles/Gemfile.rails-master

@@ -7,3 +7,4 @@ gem 'mocha'
 gem 'test_declarative'
 gem 'rake'
 gem 'minitest'
+gem 'oj'

data/lib/i18n.rb

@@ -140,10 +140,14 @@ module I18n
     # called and passed the key and options.
     #
     # E.g. assuming the key <tt>:salutation</tt> resolves to:
-    #   lambda { |key, options| options[:gender] == 'm' ? "Mr. %{options[:name]}" : "Mrs. %{options[:name]}" }
+    #   lambda { |key, options| options[:gender] == 'm' ? "Mr. #{options[:name]}" : "Mrs. #{options[:name]}" }
     #
     # Then <tt>I18n.t(:salutation, :gender => 'w', :name => 'Smith') will result in "Mrs. Smith".
     #
+    # Note that the string returned by lambda will go through string interpolation too,
+    # so the following lambda would give the same result:
+    #   lambda { |key, options| options[:gender] == 'm' ? "Mr. %{name}" : "Mrs. %{name}" }
+    #
     # It is recommended to use/implement lambdas in an "idempotent" way. E.g. when
     # a cache layer is put in front of I18n.translate it will generate a cache key
     # from the argument values passed to #translate. Therefor your lambdas should
@@ -157,7 +161,6 @@ module I18n
       handling = options.delete(:throw) && :throw || options.delete(:raise) && :raise # TODO deprecate :raise
 
       enforce_available_locales!(locale)
-      raise I18n::ArgumentError if key.is_a?(String) && key.empty?
 
       result = catch(:exception) do
         if key.is_a?(Array)
@@ -293,6 +296,10 @@ module I18n
       end
     end
 
+    def available_locales_initialized?
+      config.available_locales_initialized?
+    end
+
   private
 
     # Any exceptions thrown in translate will be sent to the @@exception_handler

data/lib/i18n/backend/base.rb

@@ -22,7 +22,10 @@ module I18n
       end
 
       def translate(locale, key, options = {})
+        raise I18n::ArgumentError if (key.is_a?(String) || key.is_a?(Symbol)) && key.empty?
         raise InvalidLocale.new(locale) unless locale
+        return nil if key.nil? && !options.key?(:default)
+
         entry = lookup(locale, key, options[:scope], options) unless key.nil?
 
         if entry.nil? && options.key?(:default)
@@ -31,17 +34,17 @@ module I18n
           entry = resolve(locale, key, entry, options)
         end
 
+        entry = entry.dup if entry.is_a?(String)
+
+        count = options[:count]
+        entry = pluralize(locale, entry, count) if count
+
         if entry.nil?
           if (options.key?(:default) && !options[:default].nil?) || !options.key?(:default)
             throw(:exception, I18n::MissingTranslation.new(locale, key, options))
           end
         end
 
-        entry = entry.dup if entry.is_a?(String)
-
-        count = options[:count]
-        entry = pluralize(locale, entry, count) if count
-
         deep_interpolation = options[:deep_interpolation]
         values = options.except(*RESERVED_KEYS)
         if values
@@ -103,7 +106,8 @@ module I18n
           case subject
           when Array
             subject.each do |item|
-              result = resolve(locale, object, item, options) and return result
+              result = resolve(locale, object, item, options)
+              return result unless result.nil?
             end and nil
           else
             resolve(locale, object, subject, options)
@@ -147,15 +151,26 @@ module I18n
           entry[key]
         end
 
-        # Interpolates values into a given string.
+        # Interpolates values into a given subject.
         #
-        #   interpolate "file %{file} opened by %%{user}", :file => 'test.txt', :user => 'Mr. X'
+        #   if the given subject is a string then:
+        #   method interpolates "file %{file} opened by %%{user}", :file => 'test.txt', :user => 'Mr. X'
         #   # => "file test.txt opened by %{user}"
-        def interpolate(locale, string, values = {})
-          if string.is_a?(::String) && !values.empty?
-            I18n.interpolate(string, values)
+        #
+        #   if the given subject is an array then:
+        #   each element of the array is recursively interpolated (until it finds a string)
+        #   method interpolates ["yes, %{user}", ["maybe no, %{user}, "no, %{user}"]], :user => "bartuz"
+        #   # => "["yes, bartuz",["maybe no, bartuz", "no, bartuz"]]"
+        
+        
+        def interpolate(locale, subject, values = {}) 
+          return subject if values.empty?
+
+          case subject
+          when ::String then I18n.interpolate(subject, values)
+          when ::Array then subject.map { |element| interpolate(locale, element, values) }
           else
-            string
+            subject
           end
         end
 

data/lib/i18n/backend/key_value.rb

@@ -1,7 +1,24 @@
 require 'i18n/backend/base'
-require 'active_support/json'
 
 module I18n
+
+  begin
+    require 'oj'
+    class JSON
+      class << self
+        def encode(value)
+          Oj::Rails.encode(value)
+        end
+        def decode(value)
+          Oj.load(value)
+        end
+      end
+    end
+  rescue LoadError
+    require 'active_support/json'
+    JSON = ActiveSupport::JSON
+  end
+
   module Backend
     # This is a basic backend for key value stores. It receives on
     # initialization the store, which should respond to three methods:
@@ -65,14 +82,14 @@ module I18n
             case value
             when Hash
               if @subtrees && (old_value = @store[key])
-                old_value = ActiveSupport::JSON.decode(old_value)
+                old_value = JSON.decode(old_value)
                 value = old_value.deep_symbolize_keys.deep_merge!(value) if old_value.is_a?(Hash)
               end
             when Proc
               raise "Key-value stores cannot handle procs"
             end
 
-            @store[key] = ActiveSupport::JSON.encode(value) unless value.is_a?(Symbol)
+            @store[key] = JSON.encode(value) unless value.is_a?(Symbol)
           end
         end
 
@@ -89,8 +106,52 @@ module I18n
         def lookup(locale, key, scope = [], options = {})
           key   = normalize_flat_keys(locale, key, scope, options[:separator])
           value = @store["#{locale}.#{key}"]
-          value = ActiveSupport::JSON.decode(value) if value
-          value.is_a?(Hash) ? value.deep_symbolize_keys : value
+          value = JSON.decode(value) if value
+
+          if value.is_a?(Hash)
+            value.deep_symbolize_keys
+          elsif !value.nil?
+            value
+          elsif !@subtrees
+            SubtreeProxy.new("#{locale}.#{key}", @store)
+          end
+        end
+      end
+
+      class SubtreeProxy
+        def initialize(master_key, store)
+          @master_key = master_key
+          @store = store
+          @subtree = nil
+        end
+
+        def has_key?(key)
+          @subtree && @subtree.has_key?(key) || self[key]
+        end
+
+        def [](key)
+          unless @subtree && value = @subtree[key]
+            value = @store["#{@master_key}.#{key}"]
+            (@subtree ||= {})[key] = JSON.decode(value) if value
+          end
+          value
+        end
+
+        def is_a?(klass)
+          Hash == klass || super
+        end
+        alias :kind_of? :is_a?
+
+        def instance_of?(klass)
+          Hash == klass || super
+        end
+
+        def nil?
+          @subtree.nil?
+        end
+
+        def inspect
+          @subtree.inspect
         end
       end
 

data/lib/i18n/backend/simple.rb

@@ -29,6 +29,11 @@ module I18n
         # translations will be overwritten by new ones only at the deepest
         # level of the hash.
         def store_translations(locale, data, options = {})
+          if I18n.available_locales_initialized? &&
+            !I18n.available_locales.include?(locale.to_sym) &&
+            !I18n.available_locales.include?(locale.to_s)
+            return data
+          end
           locale = locale.to_sym
           translations[locale] ||= {}
           data = data.deep_symbolize_keys

data/lib/i18n/config.rb

@@ -57,6 +57,11 @@ module I18n
       @@available_locales = nil if @@available_locales.empty?
       @@available_locales_set = nil
     end
+    
+    # Returns true if the available_locales have been initialized
+    def available_locales_initialized?
+      ( !!defined?(@@available_locales) && !!@@available_locales )
+    end
 
     # Clears the available locales set so it can be recomputed again after I18n
     # gets reloaded.

data/lib/i18n/tests/defaults.rb

@@ -24,6 +24,10 @@ module I18n
         assert_equal 'bar', I18n.t(:does_not_exist, :default => [:does_not_exist_2, :'foo.bar'])
       end
 
+      test "defaults: given an array as a default with false it returns false" do
+        assert_equal false, I18n.t(:does_not_exist, :default => [false])
+      end
+
       test "defaults: given false it returns false" do
         assert_equal false, I18n.t(:does_not_exist, :default => false)
       end

data/lib/i18n/tests/interpolation.rb

@@ -54,6 +54,11 @@ module I18n
         assert_equal 'Hi Yehuda!', interpolate(:interpolate, :name => 'Yehuda')
       end
 
+      test "interpolation: given an array interpolates each element" do
+        I18n.backend.store_translations(:en, :array_interpolate => ['Hi', 'Mr. %{name}', 'or sir %{name}'])
+        assert_equal ['Hi', 'Mr. Bartuz', 'or sir Bartuz'], interpolate(:array_interpolate, :name => 'Bartuz')
+      end
+
       test "interpolation: given the translation is in utf-8 it still works" do
         assert_equal 'Häi David!', interpolate(:default => 'Häi %{name}!', :name => 'David')
       end

data/lib/i18n/version.rb

@@ -1,3 +1,3 @@
 module I18n
-  VERSION = "0.9.1"
+  VERSION = "0.9.3"
 end

data/test/backend/key_value_test.rb

@@ -40,4 +40,10 @@ class I18nBackendKeyValueTest < I18n::TestCase
       I18n.t("foo", :raise => true)
     end
   end
+
+  test "translate handles subtrees for pluralization" do
+    setup_backend!(false)
+    store_translations(:en, :bar => { :one => "One" })
+    assert_equal("One", I18n.t("bar", :count => 1))
+  end
 end if I18n::TestCase.key_value?

data/test/backend/simple_test.rb

@@ -70,6 +70,14 @@ class I18nBackendSimpleTest < I18n::TestCase
     assert_equal Hash[:'en', {:foo => {:bar => 'bar', :baz => 'baz'}}], translations
   end
 
+  test "simple store_translations: do not store translations for locales not explicitly marked as available" do
+    I18n.available_locales = [:en, :es]
+    store_translations(:fr, :foo => {:bar => 'barfr', :baz => 'bazfr'})
+    store_translations(:es, :foo => {:bar => 'bares', :baz => 'bazes'})
+    assert_nil translations[:fr]
+    assert_equal Hash[:foo, {:bar => 'bares', :baz => 'bazes'}], translations[:es]
+  end
+
   # reloading translations
 
   test "simple reload_translations: unloads translations" do

data/test/i18n_test.rb

@@ -216,6 +216,22 @@ class I18nTest < I18n::TestCase
     assert_raise(I18n::ArgumentError) { I18n.t("") }
   end
 
+  test "translate given an empty symbol as a key raises an I18n::ArgumentError" do
+    assert_raise(I18n::ArgumentError) { I18n.t(:"") }
+  end
+
+  test "translate given an array with empty string as a key raises an I18n::ArgumentError" do
+    assert_raise(I18n::ArgumentError) { I18n.t(["", :foo]) }
+  end
+
+  test "translate given an empty array as a key returns empty array" do
+    assert_equal [], I18n.t([])
+  end
+
+  test "translate given nil returns nil" do
+    assert_nil I18n.t(nil)
+  end
+
   test "translate given an unavailable locale rases an I18n::InvalidLocale" do
     begin
       I18n.config.enforce_available_locales = true
@@ -405,7 +421,7 @@ class I18nTest < I18n::TestCase
       I18n.config.enforce_available_locales = false
     end
   end
-  
+
   test 'I18n.reload! reloads the set of locales that are enforced' do
     begin
       # Clear the backend that affects the available locales and somehow can remain
@@ -413,9 +429,9 @@ class I18nTest < I18n::TestCase
       # For instance, it contains enough translations to cause a false positive with
       # this test when ran with --seed=50992
       I18n.backend = I18n::Backend::Simple.new
-      
+
       assert !I18n.available_locales.include?(:de), "Available locales should not include :de at this point"
-      
+
       I18n.enforce_available_locales = true
 
       assert_raise(I18n::InvalidLocale) { I18n.default_locale = :de }
@@ -431,11 +447,11 @@ class I18nTest < I18n::TestCase
       store_translations(:en, :foo => 'Foo in :en')
       store_translations(:de, :foo => 'Foo in :de')
       store_translations(:pl, :foo => 'Foo in :pl')
-      
+
       assert I18n.available_locales.include?(:de), ":de should now be allowed"
       assert I18n.available_locales.include?(:en), ":en should now be allowed"
       assert I18n.available_locales.include?(:pl), ":pl should now be allowed"
-      
+
       assert_nothing_raised { I18n.default_locale = I18n.locale = :en }
       assert_nothing_raised { I18n.default_locale = I18n.locale = :de }
       assert_nothing_raised { I18n.default_locale = I18n.locale = :pl }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Sven Fuchs
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.6.11
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: New wave Internationalization support for Ruby