i18n 0.7.0.beta1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8187a8b397f09fc92f74aab28add40becb5c0bf
-  data.tar.gz: 2c51a444a3b6919d4f407444cfa920500efc0dff
+  metadata.gz: 29c21c5ff9dda205f54c1156967092f364c009ec
+  data.tar.gz: dd22c6d9398d5ab012e86d9e9e149158bc7d3731
 SHA512:
-  metadata.gz: 89409a78b2822b57ac485a0479017c5b725d28b22f1143f1b579f6b41a82b1f11e94e92509faaf8489e4c43ec7e2f4306cd9613767e895bfecba444637582318
-  data.tar.gz: bc606a452a926441015813ee126218249e862ab414388de14f8b9d263838214058c0fdc010c1837fdcbd6f24f80e6960c6925ab083565887e4468b750683627d
+  metadata.gz: 751f36baefacf168a3473f84d4b4f4a0a6c1da62acb51d78bfa4a1926dc6ba242bf4fa2ccd4263f07491a5c036f1eb37cc750efe5f8f227caf169d838bbfd87e
+  data.tar.gz: 657f8618ea7c530a4ea77d250bda199b28eb7b1f3a7429156ee4f82de3b0481f94daf0b9833c2f31dffb8487e9355b90e0b123e00f173fc205331345322248ef

data/gemfiles/Gemfile.rails-3.2.x.lock

@@ -1,19 +1,19 @@
 PATH
   remote: ..
   specs:
-    i18n (0.7.0.beta1)
+    i18n (0.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.19)
+    activesupport (3.2.21)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     metaclass (0.0.4)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
-    rake (10.3.2)
+    rake (10.4.2)
     test_declarative (0.0.5)
 
 PLATFORMS

data/gemfiles/Gemfile.rails-4.0.x.lock

@@ -1,12 +1,12 @@
 PATH
   remote: ..
   specs:
-    i18n (0.7.0.beta1)
+    i18n (0.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.8)
+    activesupport (4.0.12)
       i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -17,10 +17,10 @@ GEM
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
-    rake (10.3.2)
+    rake (10.4.2)
     test_declarative (0.0.5)
     thread_safe (0.3.4)
-    tzinfo (0.3.40)
+    tzinfo (0.3.42)
 
 PLATFORMS
   ruby

data/gemfiles/Gemfile.rails-4.1.x.lock

@@ -1,12 +1,12 @@
 PATH
   remote: ..
   specs:
-    i18n (0.7.0.beta1)
+    i18n (0.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.4)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -14,13 +14,13 @@ GEM
       tzinfo (~> 1.1)
     json (1.8.1)
     metaclass (0.0.4)
-    minitest (5.4.0)
+    minitest (5.5.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    rake (10.3.2)
+    rake (10.4.2)
     test_declarative (0.0.5)
     thread_safe (0.3.4)
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
 PLATFORMS

data/gemfiles/Gemfile.rails-4.2.x

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

data/gemfiles/Gemfile.rails-4.2.x.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: ..
+  specs:
+    i18n (0.7.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.0.rc3)
+      i18n (>= 0.7.0.beta1, < 0.8)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    json (1.8.1)
+    metaclass (0.0.4)
+    minitest (5.5.0)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    rake (10.4.2)
+    test_declarative (0.0.5)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 4.2.0.rc3)
+  i18n!
+  mocha
+  rake
+  test_declarative

data/gemfiles/Gemfile.rails-master.lock

@@ -1,29 +1,29 @@
-PATH
-  remote: ..
-  specs:
-    i18n (0.7.0.beta1)
-
 GIT
   remote: git://github.com/rails/rails.git
-  revision: c9cd532ba6be0316d80e93a8ac1b28f532222dcb
+  revision: fe46f009be1ece58e45abc51195e2381a71bd023
   branch: master
   specs:
-    activesupport (4.2.0.alpha)
+    activesupport (5.0.0.alpha)
       i18n (>= 0.7.0.beta1, < 0.8)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
 
+PATH
+  remote: ..
+  specs:
+    i18n (0.7.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
     json (1.8.1)
     metaclass (0.0.4)
-    minitest (5.4.0)
+    minitest (5.5.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    rake (10.3.2)
+    rake (10.4.2)
     test_declarative (0.0.5)
     thread_safe (0.3.4)
     tzinfo (1.2.2)

data/lib/i18n/backend/chain.rb

@@ -17,7 +17,7 @@ module I18n
     class Chain
       module Implementation
         include Base
-
+        
         attr_accessor :backends
 
         def initialize(*backends)
@@ -45,7 +45,7 @@ module I18n
               options = default_options if backend == backends.last
               translation = backend.translate(locale, key, options)
               if namespace_lookup?(translation, options)
-                namespace = translation.merge(namespace || {})
+                namespace = _deep_merge(translation, namespace || {})
               elsif !translation.nil?
                 return translation
               end
@@ -75,6 +75,20 @@ module I18n
           def namespace_lookup?(result, options)
             result.is_a?(Hash) && !options.has_key?(:count)
           end
+          
+        private
+          # This is approximately what gets used in ActiveSupport.
+          # However since we are not guaranteed to run in an ActiveSupport context
+          # it is wise to have our own copy. We underscore it
+          # to not pollute the namespace of the including class.
+          def _deep_merge(hash, other_hash)
+            copy = hash.dup
+            other_hash.each_pair do |k,v|
+              value_from_other = hash[k]
+              copy[k] = value_from_other.is_a?(Hash) && v.is_a?(Hash) ? _deep_merge(value_from_other, v) : v
+            end
+            copy
+          end
       end
 
       include Implementation

data/lib/i18n/core_ext/string/interpolate.rb

@@ -0,0 +1,9 @@
+# This file used to backport the Ruby 1.9 String interpolation syntax to Ruby 1.8.
+#
+# Since I18n has dropped support to Ruby 1.8, this file is not required anymore,
+# however, Rails 3.2 still requires it directly:
+#
+# https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/core_ext/string/interpolation.rb#L2
+#
+# So we can't just drop the file entirely, which would then break Rails users
+# under Ruby 1.9. This file can be removed once Rails 3.2 support is dropped.

data/lib/i18n/tests/lookup.rb

@@ -17,7 +17,7 @@ module I18n
         assert_equal({ :a => "b" }, I18n.t(:hash))
       end
 
-      test "lookup: it returns a array" do
+      test "lookup: it returns an array" do
         assert_equal(%w(a b c), I18n.t(:array))
       end
 

data/lib/i18n/version.rb

@@ -1,3 +1,3 @@
 module I18n
-  VERSION = "0.7.0.beta1"
+  VERSION = "0.7.0"
 end

data/test/backend/chain_test.rb

@@ -4,10 +4,20 @@ class I18nBackendChainTest < I18n::TestCase
   def setup
     super
     @first  = backend(:en => {
-      :foo => 'Foo', :formats => { :short => 'short' }, :plural_1 => { :one => '%{count}' }, :dates => {:a => "A"}
+      :foo => 'Foo', :formats => {
+        :short => 'short',
+        :subformats => {:short => 'short'},
+      },
+      :plural_1 => { :one => '%{count}' },
+      :dates => {:a => "A"}
     })
     @second = backend(:en => {
-      :bar => 'Bar', :formats => { :long => 'long' }, :plural_2 => { :one => 'one' }, :dates => {:a => "B", :b => "B"}
+      :bar => 'Bar', :formats => {
+        :long => 'long', 
+        :subformats => {:long => 'long'},
+      },
+      :plural_2 => { :one => 'one' },
+      :dates => {:a => "B", :b => "B"}
     })
     @chain  = I18n.backend = I18n::Backend::Chain.new(@first, @second)
   end
@@ -39,11 +49,11 @@ class I18nBackendChainTest < I18n::TestCase
     assert_equal({}, I18n.t(:'i18n.transliterate.rule', :locale => 'en', :default => {}))
   end
 
-  test "namespace lookup collects results from all backends" do
-    assert_equal({ :short => 'short', :long => 'long' }, I18n.t(:formats))
+  test "namespace lookup collects results from all backends and merges deep hashes" do
+    assert_equal({:long=>"long", :subformats=>{:long=>"long", :short=>"short"}, :short=>"short"}, I18n.t(:formats))
   end
 
-  test "namespace lookup collects results from all backends and does not overwrite" do
+  test "namespace lookup collects results from all backends and lets leftmost backend take priority" do
     assert_equal({ :a => "A", :b => "B" }, I18n.t(:dates))
   end
 
@@ -59,7 +69,11 @@ class I18nBackendChainTest < I18n::TestCase
   test "bulk lookup collects results from all backends" do
     assert_equal ['Foo', 'Bar'], I18n.t([:foo, :bar])
     assert_equal ['Foo', 'Bar', 'Bah'], I18n.t([:foo, :bar, :bah], :default => 'Bah')
-    assert_equal [{ :short => 'short', :long => 'long' }, { :one => 'one' }, 'Bah'], I18n.t([:formats, :plural_2, :bah], :default => 'Bah')
+    assert_equal [{
+      :long=>"long",
+      :subformats=>{:long=>"long", :short=>"short"},
+      :short=>"short"}, {:one=>"one"},
+      "Bah"], I18n.t([:formats, :plural_2, :bah], :default => 'Bah')
   end
 
   test "store_translations options are not dropped while transfering to backend" do

data/test/i18n_test.rb

@@ -388,9 +388,17 @@ 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
+      # set from the last running test.
+      # 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 }
@@ -406,7 +414,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.7.0.beta1
+  version: 0.7.0
 platform: ruby
 authors:
 - Sven Fuchs
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies: []
 description: New wave Internationalization support for Ruby.
 email: rails-i18n@googlegroups.com
@@ -28,6 +28,8 @@ files:
 - gemfiles/Gemfile.rails-4.0.x.lock
 - gemfiles/Gemfile.rails-4.1.x
 - gemfiles/Gemfile.rails-4.1.x.lock
+- gemfiles/Gemfile.rails-4.2.x
+- gemfiles/Gemfile.rails-4.2.x.lock
 - gemfiles/Gemfile.rails-master
 - gemfiles/Gemfile.rails-master.lock
 - lib/i18n.rb
@@ -49,6 +51,7 @@ files:
 - lib/i18n/config.rb
 - lib/i18n/core_ext/hash.rb
 - lib/i18n/core_ext/kernel/suppress_warnings.rb
+- lib/i18n/core_ext/string/interpolate.rb
 - lib/i18n/exceptions.rb
 - lib/i18n/gettext.rb
 - lib/i18n/gettext/helpers.rb
@@ -125,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -133,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: New wave Internationalization support for Ruby