i18n 0.6.1 → 0.6.2

data/lib/i18n.rb

@@ -12,7 +12,7 @@ module I18n
   RESERVED_KEYS = [:scope, :default, :separator, :resolve, :object, :fallback, :format, :cascade, :throw, :raise, :rescue_format]
   RESERVED_KEYS_PATTERN = /%\{(#{RESERVED_KEYS.join("|")})\}/
 
-  extend Module.new {
+  extend(Module.new {
     # Gets I18n configuration object.
     def config
       Thread.current[:i18n_config] ||= I18n::Config.new
@@ -141,7 +141,7 @@ module I18n
     # always return the same translations/values per unique combination of argument
     # values.
     def translate(*args)
-      options  = args.last.is_a?(Hash) ? args.pop : {}
+      options  = args.last.is_a?(Hash) ? args.pop.dup : {}
       key      = args.shift
       backend  = config.backend
       locale   = options.delete(:locale) || config.locale
@@ -219,7 +219,7 @@ module I18n
     #     I18n.transliterate("Jürgen", :locale => :en) # => "Jurgen"
     #     I18n.transliterate("Jürgen", :locale => :de) # => "Juergen"
     def transliterate(*args)
-      options      = args.pop if args.last.is_a?(Hash)
+      options      = args.pop.dup if args.last.is_a?(Hash)
       key          = args.shift
       locale       = options && options.delete(:locale) || config.locale
       handling     = options && (options.delete(:throw) && :throw || options.delete(:raise) && :raise)
@@ -230,7 +230,8 @@ module I18n
     end
 
     # Localizes certain objects, such as dates and numbers to local formatting.
-    def localize(object, options = {})
+    def localize(object, options = nil)
+      options = options ? options.dup : {}
       locale = options.delete(:locale) || config.locale
       format = options.delete(:format) || :default
       config.backend.localize(locale, object, format, options)
@@ -328,5 +329,5 @@ module I18n
            "(an instance of which is set to I18n.exception_handler by default)."
       exception.is_a?(MissingTranslation) ? exception.message : raise(exception)
     end
-  }
+  })
 end

data/lib/i18n/backend/base.rb

@@ -122,10 +122,14 @@ module I18n
           result unless result.is_a?(MissingTranslation)
         end
 
-        # Picks a translation from an array according to English pluralization
-        # rules. It will pick the first translation if count is not equal to 1
-        # and the second translation if it is equal to 1. Other backends can
-        # implement more flexible or complex pluralization rules.
+        # Picks a translation from a pluralized mnemonic subkey according to English
+        # pluralization rules :
+        # - It will pick the :one subkey if count is equal to 1.
+        # - It will pick the :other subkey otherwise.
+        # - It will pick the :zero subkey in the special case where count is
+        #   equal to 0 and there is a :zero subkey present. This behaviour is
+        #   not stand with regards to the CLDR pluralization rules.
+        # Other backends can implement more flexible or complex pluralization rules.
         def pluralize(locale, entry, count)
           return entry unless entry.is_a?(Hash) && count
 
@@ -155,7 +159,9 @@ module I18n
           type = File.extname(filename).tr('.', '').downcase
           raise UnknownFileType.new(type, filename) unless respond_to?(:"load_#{type}", true)
           data = send(:"load_#{type}", filename)
-          raise InvalidLocaleData.new(filename) unless data.is_a?(Hash)
+          unless data.is_a?(Hash)
+            raise InvalidLocaleData.new(filename, 'expects it to return a hash, but does not')
+          end
           data.each { |locale, d| store_translations(locale, d || {}) }
         end
 
@@ -170,10 +176,8 @@ module I18n
         def load_yml(filename)
           begin
             YAML.load_file(filename)
-          rescue TypeError
-            nil
-          rescue SyntaxError
-            nil
+          rescue TypeError, ScriptError, StandardError => e
+            raise InvalidLocaleData.new(filename, e.inspect)
           end
         end
     end

data/lib/i18n/backend/chain.rb

@@ -45,8 +45,7 @@ module I18n
               options = default_options if backend == backends.last
               translation = backend.translate(locale, key, options)
               if namespace_lookup?(translation, options)
-                namespace ||= {}
-                namespace.merge!(translation)
+                namespace = translation.merge(namespace || {})
               elsif !translation.nil?
                 return translation
               end

data/lib/i18n/backend/interpolation_compiler.rb

@@ -77,7 +77,7 @@ module I18n
         end
 
         def missing_key(key)
-          "raise(MissingInterpolationArgument.new(#{key}, self))"
+          "raise(MissingInterpolationArgument.new(#{key}, {}, self))"
         end
 
         def reserved_key(key)

data/lib/i18n/backend/key_value.rb

@@ -73,7 +73,7 @@ module I18n
               raise "Key-value stores cannot handle procs"
             end
 
-            @store[key] = ActiveSupport::JSON.encode([value]) unless value.is_a?(Symbol)
+            @store[key] = ActiveSupport::JSON.encode(value) unless value.is_a?(Symbol)
           end
         end
 
@@ -90,7 +90,7 @@ 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)[0] if value
+          value = ActiveSupport::JSON.decode(value) if value
           value.is_a?(Hash) ? value.deep_symbolize_keys : value
         end
       end

data/lib/i18n/backend/transliterator.rb

@@ -67,11 +67,11 @@ module I18n
           "ů"=>"u", "Ű"=>"U", "ű"=>"u", "Ų"=>"U", "ų"=>"u", "Ŵ"=>"W", "ŵ"=>"w",
           "Ŷ"=>"Y", "ŷ"=>"y", "Ÿ"=>"Y", "Ź"=>"Z", "ź"=>"z", "Ż"=>"Z", "ż"=>"z",
           "Ž"=>"Z", "ž"=>"z"
-        }
+        }.freeze
 
         def initialize(rule = nil)
           @rule = rule
-          add DEFAULT_APPROXIMATIONS
+          add DEFAULT_APPROXIMATIONS.dup
           add rule if rule
         end
 
@@ -83,16 +83,19 @@ module I18n
 
         private
 
-          def approximations
-            @approximations ||= {}
-          end
+        def approximations
+          @approximations ||= {}
+        end
 
-          # Add transliteration rules to the approximations hash.
-          def add(hash)
-            hash.keys.each {|key| hash[key.to_s] = hash.delete(key).to_s}
-            approximations.merge! hash
+        # Add transliteration rules to the approximations hash.
+        def add(hash)
+          hash.keys.each do |key|
+            utf8_key = key.to_s.dup.force_encoding('UTF-8')
+            hash[utf8_key] = hash.delete(key).to_s
           end
+          approximations.merge! hash
+        end
       end
     end
   end
-end
+end

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

@@ -0,0 +1,10 @@
+# Makes String#force_encoding working with ruby 1.8.7
+unless defined?(Encoding)
+  require 'iconv'
+  
+  class String
+    def force_encoding(encoding)
+      ::Iconv.conv('UTF-8//IGNORE', encoding.upcase, self)
+    end
+  end
+end

data/lib/i18n/exceptions.rb

@@ -29,9 +29,9 @@ module I18n
 
   class InvalidLocaleData < ArgumentError
     attr_reader :filename
-    def initialize(filename)
-      @filename = filename
-      super "can not load translations from #{filename}, expected it to return a hash, but does not"
+    def initialize(filename, exception_message)
+      @filename, @exception_message = filename, exception_message
+      super "can not load translations from #{filename}: #{exception_message}"
     end
   end
 
@@ -81,10 +81,10 @@ module I18n
   end
 
   class MissingInterpolationArgument < ArgumentError
-    attr_reader :values, :string
-    def initialize(values, string)
-      @values, @string = values, string
-      super "missing interpolation argument in #{string.inspect} (#{values.inspect} given)"
+    attr_reader :key, :values, :string
+    def initialize(key, values, string)
+      @key, @values, @string = key, values, string
+      super "missing interpolation argument #{key.inspect} in #{string.inspect} (#{values.inspect} given)"
     end
   end
 

data/lib/i18n/interpolate/ruby.rb

@@ -21,7 +21,7 @@ module I18n
           '%'
         else
           key = ($1 || $2).to_sym
-          value = values.key?(key) ? values[key] : raise(MissingInterpolationArgument.new(values, string))
+          value = values.key?(key) ? values[key] : raise(MissingInterpolationArgument.new(key, values, string))
           value = value.call(values) if value.respond_to?(:call)
           $3 ? sprintf("%#{$3}", value) : value
         end

data/lib/i18n/tests/localization/date.rb

@@ -44,6 +44,13 @@ module I18n
           assert_nothing_raised { I18n.l(@date, :format => '%x') }
         end
 
+        test "localize Date: does not modify the options hash" do
+          options = { :format => '%b', :locale => :de }
+          assert_equal 'Mar', I18n.l(@date, options)
+          assert_equal({ :format => '%b', :locale => :de }, options)
+          assert_nothing_raised { I18n.l(@date, options.freeze) }
+        end
+
         test "localize Date: given nil it raises I18n::ArgumentError" do
           assert_raise(I18n::ArgumentError) { I18n.l(nil) }
         end

data/lib/i18n/tests/localization/procs.rb

@@ -27,13 +27,13 @@ module I18n
 
         test "localize Date: given a format that resolves to a Proc it calls the Proc with the object" do
           setup_time_proc_translations
-          date = ::Date.new(2008, 3, 1, 6)
+          date = ::Date.new(2008, 3, 1)
           assert_equal '[Sat, 01 Mar 2008, {}]', I18n.l(date, :format => :proc, :locale => :ru)
         end
 
         test "localize Date: given a format that resolves to a Proc it calls the Proc with the object and extra options" do
           setup_time_proc_translations
-          date = ::Date.new(2008, 3, 1, 6)
+          date = ::Date.new(2008, 3, 1)
           assert_equal '[Sat, 01 Mar 2008, {:foo=>"foo"}]', I18n.l(date, :format => :proc, :foo => 'foo', :locale => :ru)
         end
 

data/lib/i18n/tests/lookup.rb

@@ -41,6 +41,13 @@ module I18n
         assert_nothing_raised { I18n.t(:foo, :locale => :xx) }
       end
 
+      test "lookup: does not modify the options hash" do
+        options = {}
+        assert_equal "a", I18n.t(:string, options)
+        assert_equal({}, options)
+        assert_nothing_raised { I18n.t(:string, options.freeze) }
+      end
+
       test "lookup: given an array of keys it translates all of them" do
         assert_equal %w(bar baz), I18n.t([:bar, :baz], :scope => [:foo])
       end

data/lib/i18n/version.rb

@@ -1,3 +1,3 @@
 module I18n
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/test/backend/chain_test.rb

@@ -3,10 +3,10 @@ require 'test_helper'
 class I18nBackendChainTest < Test::Unit::TestCase
   def setup
     @first  = backend(:en => {
-      :foo => 'Foo', :formats => { :short => 'short' }, :plural_1 => { :one => '%{count}' }
+      :foo => 'Foo', :formats => { :short => 'short' }, :plural_1 => { :one => '%{count}' }, :dates => {:a => "A"}
     })
     @second = backend(:en => {
-      :bar => 'Bar', :formats => { :long => 'long' }, :plural_2 => { :one => 'one' }
+      :bar => 'Bar', :formats => { :long => 'long' }, :plural_2 => { :one => 'one' }, :dates => {:a => "B", :b => "B"}
     })
     @chain  = I18n.backend = I18n::Backend::Chain.new(@first, @second)
   end
@@ -42,6 +42,10 @@ class I18nBackendChainTest < Test::Unit::TestCase
     assert_equal({ :short => 'short', :long => 'long' }, I18n.t(:formats))
   end
 
+  test "namespace lookup collects results from all backends and does not overwrite" do
+    assert_equal({ :a => "A", :b => "B" }, I18n.t(:dates))
+  end
+
   test "namespace lookup with only the first backend returning a result" do
     assert_equal({ :one => '%{count}' }, I18n.t(:plural_1))
   end

data/test/backend/transliterator_test.rb

@@ -1,5 +1,6 @@
-# :coding: utf-8
+# encoding: utf-8
 require 'test_helper'
+require 'i18n/core_ext/string/encoding'
 
 class I18nBackendTransliterator < Test::Unit::TestCase
   def setup
@@ -78,4 +79,8 @@ class I18nBackendTransliterator < Test::Unit::TestCase
     assert_not_equal "ue", transliterator.transliterate(char)
   end
 
+  test "DEFAULT_APPROXIMATIONS is frozen to prevent concurrency issues" do
+    assert I18n::Backend::Transliterator::HashTransliterator::DEFAULT_APPROXIMATIONS.frozen?
+  end
+
 end

data/test/i18n/exceptions_test.rb

@@ -54,14 +54,14 @@ class I18nExceptionsTest < Test::Unit::TestCase
   test "MissingInterpolationArgument stores key and string" do
     assert_raise(I18n::MissingInterpolationArgument) { force_missing_interpolation_argument }
     force_missing_interpolation_argument do |exception|
-      # assert_equal :bar, exception.key
+      assert_equal :bar, exception.key
       assert_equal "%{bar}", exception.string
     end
   end
 
   test "MissingInterpolationArgument message contains the missing and given arguments" do
     force_missing_interpolation_argument do |exception|
-      assert_equal 'missing interpolation argument in "%{bar}" ({:baz=>"baz"} given)', exception.message
+      assert_equal 'missing interpolation argument :bar in "%{bar}" ({:baz=>"baz"} given)', exception.message
     end
   end
 

data/test/i18n/load_path_test.rb

@@ -19,6 +19,13 @@ class I18nLoadPathTest < Test::Unit::TestCase
     end
   end
 
+  test "loading an invalid yml file raises an InvalidLocaleData exception" do
+    assert_raise I18n::InvalidLocaleData do
+      I18n.load_path = [[locales_dir + '/invalid/syntax.yml']]
+      I18n.t(:'foo.bar', :default => "baz")
+    end
+  end
+
   test "adding arrays of filenames to the load path does not break locale loading" do
     I18n.load_path << Dir[locales_dir + '/*.{rb,yml}']
     assert_equal "baz", I18n.t(:'foo.bar')

data/test/test_data/locales/invalid/syntax.yml

@@ -0,0 +1,4 @@
+en:
+ foo: foo
+    bar:
+  baz:

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: i18n
 version: !ruby/object:Gem::Version
-  version: 0.6.1
   prerelease: 
+  version: 0.6.2
 platform: ruby
 authors:
 - Sven Fuchs
@@ -13,72 +13,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+    none: false
+  name: activesupport
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: sqlite3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: mocha
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test_declarative
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: test_declarative
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: New wave Internationalization support for Ruby.
 email: rails-i18n@googlegroups.com
 executables: []
@@ -109,6 +109,7 @@ files:
 - lib/i18n/config.rb
 - lib/i18n/core_ext/hash.rb
 - lib/i18n/core_ext/kernel/surpress_warnings.rb
+- lib/i18n/core_ext/string/encoding.rb
 - lib/i18n/core_ext/string/interpolate.rb
 - lib/i18n/exceptions.rb
 - lib/i18n/gettext/helpers.rb
@@ -174,29 +175,31 @@ files:
 - test/test_data/locales/en.rb
 - test/test_data/locales/en.yml
 - test/test_data/locales/invalid/empty.yml
+- test/test_data/locales/invalid/syntax.yml
 - test/test_data/locales/plurals.rb
 - test/test_helper.rb
 - README.textile
 - MIT-LICENSE
 - CHANGELOG.textile
 homepage: http://github.com/svenfuchs/i18n
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.5
+  none: false
 requirements: []
 rubyforge_project: ! '[none]'
 rubygems_version: 1.8.23
@@ -204,4 +207,3 @@ signing_key:
 specification_version: 3
 summary: New wave Internationalization support for Ruby
 test_files: []
-has_rdoc: