i18n 0.5.3 → 0.5.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MzZlZTA2MGRlOTAzNTY4MGM1NmM2ODRhNjFjNWFkMTMyODNiNTU4Mg==
+  data.tar.gz: !binary |-
+    MGJmZmRhZjU1NGRlMzFjZjdjZDA2OWUxYWM3MmIwNmU0NzkyYmNmMA==
+SHA512:
+  metadata.gz: !binary |-
+    YjkxZmU3MGJkZmM2ZDAxMjA0ZGI5OGNkYWZiNGU3MDEzNGZlYWU0YWNhNzQ2
+    YmE1ZDAzZGE2MjQyZDJiMTZlZGFiMTUyOThlYjdkYTQ4MGUxNmYwZjVhOGY5
+    ZTFkNDkzNzlmOWRlODVkMGI5YmY0ZTk5YmZjYTNhZTlhZjk4NDk=
+  data.tar.gz: !binary |-
+    YmQwN2ViOWZhMDkwYmZiMDgyODMyMjg0NjY0ZmViZTg4YThmYWU0NzVjNjRl
+    ZTk5NzhiMjVjMTExYjc5MzVkYTIwMDAyODI1YjFlZGM4YjY0MWM0NDNiZDZk
+    MTIxOTI1NWEwNjBkZDhjZTZmNmQ4MTBhNmQyNDhlNjFiNjlhY2I=

data/CHANGELOG.textile

@@ -1,5 +1,14 @@
 h1. Changelog
 
+h2. 0.5.0
+
+* "Extract Backend::ActiveRecord to a separate gem":https://github.com/svenfuchs/i18n/commit/197dacebad356b910d69fa69a719c2ad10cf49e6 (see "i18n-active_record":https://github.com/svenfuchs/i18n-active_record)
+* "Improve exception handling":https://github.com/svenfuchs/i18n/commit/2913ff9a7544f223f60e7d7b32c2a0e1af89812b (deprectates I18n.default_exception_handler)
+* "Change MissingTranslationData message to 'translation missing: foo.bar'":https://github.com/svenfuchs/i18n/commit/68fdfe47952325411afe5942e971ce10b2bdf900
+* "Expose MissingTranslationsData#keys method":https://github.com/svenfuchs/i18n/commit/3a37a389ecaac9670355b334e23e775549ee9822
+* "Improve Cascade#lookup (add default options)":https://github.com/svenfuchs/i18n/commit/0b9a1f2058a2be9543106cc19d08071c359511e1
+* "Finally remove deprecated interpolation syntax":https://github.com/svenfuchs/i18n/commit/2d43846d2b2a2e596f30fa58ea1c9ddb2243bb64
+
 h2. 0.4.2 (2010-10-26)
 
 * "Improve UTF8 handling":http://github.com/svenfuchs/i18n/commit/e8d5820a3b08eeca28de1a2b9c8a6ad2b9e6476c
@@ -44,7 +53,7 @@ h2. 0.3.6 (2010-03-23)
 
 h2. 0.3.5 (2010-02-26)
 
-* "Delegate I18n.normalize_translation_keys to I18n.normalize_keys and deprecate 
+* "Delegate I18n.normalize_translation_keys to I18n.normalize_keys and deprecate
 the former":http://github.com/svenfuchs/i18n/commit/7284b04d5f5dd9679cb68875515cdd0cdfc96fef
 
 h2. 0.3.4 (2010-02-25)
@@ -93,7 +102,7 @@ h2. 0.3.0 (2009-11-30)
 h2. 0.2.0 (2009-07-12)
 
 * "Allow using Ruby 1.9 syntax for string interpolation (API addition)":http://github.com/svenfuchs/i18n/commit/c6e0b06d512f2af57199a843a1d8a40241b32861
-* "Allow configuring the default scope separator, allow to pass a custom scope separator(API addition)":http://github.com/svenfuchs/i18n/commit/5b75bfbc348061adc11e3790187a187275bfd471 (e.g. I18n.t(:'foo|bar', :separator => '|') 
+* "Allow configuring the default scope separator, allow to pass a custom scope separator(API addition)":http://github.com/svenfuchs/i18n/commit/5b75bfbc348061adc11e3790187a187275bfd471 (e.g. I18n.t(:'foo|bar', :separator => '|')
 * "Pass :format option to #translate for #localize more useful lambda support":http://github.com/svenfuchs/i18n/commit/e277711b3c844fe7589b8d3f9af0f7d1b969a273
 * "Refactor Simple backend #resolve to #default and #resolve for more consistency. Now allows to pass lambdas as defaults and re-resolve Symbols":http://github.com/svenfuchs/i18n/commit/8c4ce3d923ce5fa73e973fe28217e18165549aba
 * "Add lambda support to #translate (API addition)":http://github.com/svenfuchs/i18n/commit/c90e62d8f7d3d5b78f34cfe328d871b58884f115
@@ -140,4 +149,4 @@ h2. More information
 * "Wiki":http://rails-i18n.org/wiki
 * "Mailinglist":http://groups.google.com/group/rails-i18n
 * "About the project/history":http://www.artweb-design.de/2008/7/18/finally-ruby-on-rails-gets-internationalized
-* "Initial API Intro":http://www.artweb-design.de/2008/7/18/the-ruby-on-rails-i18n-core-api
+* "Initial API Intro":http://www.artweb-design.de/2008/7/18/the-ruby-on-rails-i18n-core-api

data/README.textile

@@ -64,25 +64,12 @@ h2. Tests
 You can run tests both with
 
 * `rake test` or just `rake`
-* run any test file directly, e.g. `ruby test/api/simple_test.rb`
-* run all tests with `ruby test/all.rb`
+* run any test file directly, e.g. `ruby -Ilib -Itest test/api/simple_test.rb`
+* run all tests with `ruby -Ilib -Itest test/all.rb`
 
-You can parametrize the test suite for using different sets of dependencies by
-using:
+You can run all tests against all Gemfiles with
 
-.pre `ruby test/all.rb -w DEPENDENCIES`
-
-... where DEPENDENCIES is a comma-separated list of:
-
-* r23 or rails-2.3.x
-* r3 or rails-3.x
-* no-rails
-* sqlite
-* mysql
-
-So, e.g. this would run the test suite against Rails 2.3.x using mysql:
-
-.pre `ruby test/all.rb -w r23,mysql`
+* `ruby test/run_all.rb`
 
 The structure of the test suite is a bit unusual as it uses modules to reuse
 particular tests in different test cases.

data/lib/i18n.rb

@@ -1,13 +1,6 @@
-# Authors::   Sven Fuchs (http://www.artweb-design.de),
-#             Joshua Harvey (http://www.workingwithrails.com/person/759-joshua-harvey),
-#             Stephan Soller (http://www.arkanis-development.de/),
-#             Saimon Moore (http://saimonmoore.net),
-#             Matt Aimonetti (http://railsontherun.com/)
-# Copyright:: Copyright (c) 2008 The Ruby i18n Team
-# License::   MIT
 require 'i18n/version'
 require 'i18n/exceptions'
-require 'i18n/core_ext/string/interpolate'
+require 'i18n/interpolate/ruby.rb'
 
 module I18n
   autoload :Backend, 'i18n/backend'
@@ -16,6 +9,9 @@ module I18n
   autoload :Locale,  'i18n/locale'
   autoload :Tests,   'i18n/tests'
 
+  RESERVED_KEYS = [:scope, :default, :separator, :resolve, :object, :fallback, :format, :cascade, :raise, :rescue_format]
+  RESERVED_KEYS_PATTERN = /%\{(#{RESERVED_KEYS.join("|")})\}/
+
   class << self
     # Gets I18n configuration object.
     def config
@@ -316,7 +312,7 @@ module I18n
     end
 
     def handle_enforce_available_locales_deprecation
-      if config.enforce_available_locales.nil? && !@unenforced_available_locales_deprecation
+      if config.enforce_available_locales.nil? && !defined?(@unenforced_available_locales_deprecation)
         $stderr.puts "[deprecated] I18n.enforce_available_locales will default to true in the future. If you really want to skip validation of your locale you can set I18n.enforce_available_locales = false to avoid this message."
         @unenforced_available_locales_deprecation = true
       end

data/lib/i18n/backend.rb

@@ -5,7 +5,6 @@ module I18n
     autoload :Cache,                 'i18n/backend/cache'
     autoload :Cascade,               'i18n/backend/cascade'
     autoload :Chain,                 'i18n/backend/chain'
-    autoload :Cldr,                  'i18n/backend/cldr'
     autoload :Fallbacks,             'i18n/backend/fallbacks'
     autoload :Flatten,               'i18n/backend/flatten'
     autoload :Gettext,               'i18n/backend/gettext'

data/lib/i18n/backend/base.rb

@@ -1,14 +1,12 @@
 require 'yaml'
 require 'i18n/core_ext/hash'
+require 'i18n/core_ext/kernel/surpress_warnings'
 
 module I18n
   module Backend
     module Base
       include I18n::Backend::Transliterator
 
-      RESERVED_KEYS = [:scope, :default, :separator, :resolve, :object, :fallback]
-      RESERVED_KEYS_PATTERN = /%\{(#{RESERVED_KEYS.join("|")})\}/
-
       # Accepts a list of paths to translation files. Loads translations from
       # plain Ruby (*.rb) or YAML files (*.yml). See #load_rb and #load_yml
       # for details.
@@ -140,34 +138,14 @@ module I18n
         #
         #   interpolate "file %{file} opened by %%{user}", :file => 'test.txt', :user => 'Mr. X'
         #   # => "file test.txt opened by %{user}"
-        #
-        # Note that you have to double escape the <tt>\\</tt> when you want to escape
-        # the <tt>{{...}}</tt> key in a string (once for the string and once for the
-        # interpolation).
         def interpolate(locale, string, values = {})
-          return string unless string.is_a?(::String) && !values.empty?
-
-          values.each do |key, value|
-            value = value.call(values) if interpolate_lambda?(value, string, key)
-            value = value.to_s unless value.is_a?(::String)
-            values[key] = value
-          end
-
-          string % values
-        rescue KeyError => e
-          if string =~ RESERVED_KEYS_PATTERN
-            raise ReservedInterpolationKey.new($1.to_sym, string)
+          if string.is_a?(::String) && !values.empty?
+            I18n.interpolate(string, values)
           else
-            raise MissingInterpolationArgument.new(values, string)
+            string
           end
         end
 
-        # returns true when the given value responds to :call and the key is
-        # an interpolation placeholder in the given string
-        def interpolate_lambda?(object, string, key)
-          object.respond_to?(:call) && string =~ /%\{#{key}\}|%\<#{key}>.*?\d*\.?\d*[bBdiouxXeEfgGcps]\}/
-        end
-
         # Loads a single translations file by delegating to #load_rb or
         # #load_yml depending on the file extension and directly merges the
         # data to the existing translations. Raises I18n::UnknownFileType
@@ -191,12 +169,6 @@ module I18n
         def load_yml(filename)
           YAML.load_file(filename)
         end
-
-        def warn_syntax_deprecation!(locale, string) #:nodoc:
-          return if @skip_syntax_deprecation
-          warn "The {{key}} interpolation syntax in I18n messages is deprecated. Please use %{key} instead.\n#{locale} - #{string}\n"
-          @skip_syntax_deprecation = true
-        end
     end
   end
 end

data/lib/i18n/backend/gettext.rb

@@ -43,8 +43,8 @@ module I18n
               key, value = normalize_pluralization(locale, key, value) if key.index("\000")
 
               parts = key.split('|').reverse
-              normalized = parts.inject({}) do |normalized, part|
-                normalized = { part => normalized.empty? ? value : normalized }
+              normalized = parts.inject({}) do |_normalized, part|
+                { part => _normalized.empty? ? value : _normalized }
               end
 
               result.deep_merge!(normalized)
@@ -62,7 +62,7 @@ module I18n
           raise "invalid number of plurals: #{values.size}, keys: #{keys.inspect}" if values.size != keys.size
 
           result = {}
-          values.each_with_index { |value, ix| result[keys[ix]] = value }
+          values.each_with_index { |_value, ix| result[keys[ix]] = _value }
           [key, result]
         end
 

data/lib/i18n/backend/interpolation_compiler.rb

@@ -61,7 +61,7 @@ module I18n
 
         def interpolate_or_raise_missing(key)
           escaped_key = escape_key_sym(key)
-          Base::RESERVED_KEYS.include?(key) ? reserved_key(escaped_key) : interpolate_key(escaped_key)
+          RESERVED_KEYS.include?(key) ? reserved_key(escaped_key) : interpolate_key(escaped_key)
         end
 
         def interpolate_key(key)

data/lib/i18n/backend/metadata.rb

@@ -38,7 +38,7 @@ module I18n
           :scope     => options[:scope],
           :default   => options[:default],
           :separator => options[:separator],
-          :values    => options.reject { |name, value| Base::RESERVED_KEYS.include?(name) }
+          :values    => options.reject { |name, value| RESERVED_KEYS.include?(name) }
         }
         with_metadata(metadata) { super }
       end

data/lib/i18n/config.rb

@@ -43,7 +43,7 @@ module I18n
 
     # Sets the available locales.
     def available_locales=(locales)
-      @@available_locales = Array(locales).map {|locale| locale.to_sym}
+      @@available_locales = Array(locales).map { |locale| locale.to_sym }
       @@available_locales = nil if @@available_locales.empty?
     end
 

data/lib/i18n/core_ext/kernel/surpress_warnings.rb

@@ -0,0 +1,9 @@
+module Kernel
+  def suppress_warnings
+    original_verbosity = $VERBOSE
+    $VERBOSE = nil
+    result = yield
+    $VERBOSE = original_verbosity
+    result
+  end
+end

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

@@ -1,3 +1,12 @@
+# This backports the Ruby 1.9 String interpolation syntax to Ruby 1.8.
+#
+# This backport has been shipped with I18n for a number of versions. Meanwhile
+# Rails has started to rely on it and we are going to move it to ActiveSupport.
+# See https://rails.lighthouseapp.com/projects/8994/tickets/6013-move-19-string-interpolation-syntax-backport-from-i18n-to-activesupport
+#
+# Once the above patch has been applied to Rails the following code will be
+# removed from I18n.
+
 =begin
   heavily based on Masao Mutoh's gettext String interpolation extension
   http://github.com/mutoh/gettext/blob/f6566738b981fe0952548c421042ad1e0cdfb31e/lib/gettext/core_ext/string.rb

data/lib/i18n/exceptions.rb

@@ -1,11 +1,5 @@
 require 'cgi'
 
-class KeyError < IndexError
-  def initialize(message = nil)
-    super(message || "key not found")
-  end
-end unless defined?(KeyError)
-
 module I18n
   # Handles exceptions raised in the backend. All exceptions except for
   # MissingTranslationData exceptions are re-raised. When a MissingTranslationData
@@ -19,7 +13,7 @@ module I18n
           # TODO: this block is to be replaced by `exception.message` when
           # rescue_format is removed
           if options[:rescue_format] == :html
-            if @rescue_format_deprecation
+            if !defined?(@rescue_format_deprecation)
               $stderr.puts "[DEPRECATED] I18n's :recue_format option will be removed from a future release. All exception messages will be plain text. If you need the exception handler to return an html format please set or pass a custom exception handler."
               @rescue_format_deprecation = true
             end

data/lib/i18n/interpolate/ruby.rb

@@ -0,0 +1,31 @@
+# heavily based on Masao Mutoh's gettext String interpolation extension
+# http://github.com/mutoh/gettext/blob/f6566738b981fe0952548c421042ad1e0cdfb31e/lib/gettext/core_ext/string.rb
+
+module I18n
+  INTERPOLATION_PATTERN = Regexp.union(
+    /%%/,
+    /%\{(\w+)\}/,                               # matches placeholders like "%{foo}"
+    /%<(\w+)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/  # matches placeholders like "%<foo>.d"
+  )
+
+  class << self
+    def interpolate(string, values)
+      raise ReservedInterpolationKey.new($1.to_sym, string) if string =~ RESERVED_KEYS_PATTERN
+      raise ArgumentError.new('Interpolation values must be a Hash.') unless values.kind_of?(Hash)
+      interpolate_hash(string, values)
+    end
+
+    def interpolate_hash(string, values)
+      string.gsub(INTERPOLATION_PATTERN) do |match|
+        if match == '%%'
+          '%'
+        else
+          key = ($1 || $2).to_sym
+          value = values.key?(key) ? values[key] : raise(MissingInterpolationArgument.new(values, string))
+          value = value.call(values) if value.respond_to?(:call)
+          $3 ? sprintf("%#{$3}", value) : value
+        end
+      end
+    end
+  end
+end

data/lib/i18n/locale/fallbacks.rb

@@ -73,9 +73,9 @@ module I18n
       def map(mappings)
         mappings.each do |from, to|
           from, to = from.to_sym, Array(to)
-          to.each do |to|
+          to.each do |_to|
             @map[from] ||= []
-            @map[from] << to.to_sym
+            @map[from] << _to.to_sym
           end
         end
       end
@@ -85,7 +85,7 @@ module I18n
       def compute(tags, include_defaults = true)
         result = Array(tags).collect do |tag|
           tags = I18n::Locale::Tag.tag(tag).self_and_parents.map! { |t| t.to_sym }
-          tags.each { |tag| tags += compute(@map[tag]) if @map[tag] }
+          tags.each { |_tag| tags += compute(@map[_tag]) if @map[_tag] }
           tags
         end.flatten
         result.push(*defaults) if include_defaults

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

@@ -1,17 +1,5 @@
 # encoding: utf-8
 
-class DateTime
-  def inspect
-    strftime('%a, %d %b %Y %H:%M:%S %Z')
-  end
-end
-
-class Date
-  def inspect
-    strftime('%a, %d %b %Y')
-  end
-end
-
 module I18n
   module Tests
     module Localization
@@ -19,33 +7,33 @@ module I18n
         test "localize: using day names from lambdas" do
           setup_time_proc_translations
           time = ::Time.utc(2008, 3, 1, 6, 0)
-          assert_match /Суббота/, I18n.l(time, :format => "%A, %d %B", :locale => :ru)
-          assert_match /суббота/, I18n.l(time, :format => "%d %B (%A)", :locale => :ru)
+          assert_match(/Суббота/, I18n.l(time, :format => "%A, %d %B", :locale => :ru))
+          assert_match(/суббота/, I18n.l(time, :format => "%d %B (%A)", :locale => :ru))
         end
 
         test "localize: using month names from lambdas" do
           setup_time_proc_translations
           time = ::Time.utc(2008, 3, 1, 6, 0)
-          assert_match /марта/, I18n.l(time, :format => "%d %B %Y", :locale => :ru)
-          assert_match /Март /, I18n.l(time, :format => "%B %Y", :locale => :ru)
+          assert_match(/марта/, I18n.l(time, :format => "%d %B %Y", :locale => :ru))
+          assert_match(/Март /, I18n.l(time, :format => "%B %Y", :locale => :ru))
         end
 
         test "localize: using abbreviated day names from lambdas" do
           setup_time_proc_translations
           time = ::Time.utc(2008, 3, 1, 6, 0)
-          assert_match /марта/, I18n.l(time, :format => "%d %b %Y", :locale => :ru)
-          assert_match /март /, I18n.l(time, :format => "%b %Y", :locale => :ru)
+          assert_match(/марта/, I18n.l(time, :format => "%d %b %Y", :locale => :ru))
+          assert_match(/март /, I18n.l(time, :format => "%b %Y", :locale => :ru))
         end
 
         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
 
@@ -64,32 +52,45 @@ module I18n
         test "localize Time: given a format that resolves to a Proc it calls the Proc with the object" do
           setup_time_proc_translations
           time = ::Time.utc(2008, 3, 1, 6, 0)
-          assert_equal [time, {}].inspect, I18n.l(time, :format => :proc, :locale => :ru)
+          assert_equal inspect_args([time, {}]), I18n.l(time, :format => :proc, :locale => :ru)
         end
 
         test "localize Time: given a format that resolves to a Proc it calls the Proc with the object and extra options" do
           setup_time_proc_translations
           time = ::Time.utc(2008, 3, 1, 6, 0)
           options = { :foo => 'foo' }
-          assert_equal [time, options].inspect, I18n.l(time, options.merge(:format => :proc, :locale => :ru))
+          assert_equal inspect_args([time, options]), I18n.l(time, options.merge(:format => :proc, :locale => :ru))
         end
 
         protected
 
-          def filter_args(*args)
-            args.map { |arg| arg.delete(:fallback) if arg.is_a?(Hash) ; arg }.inspect
+          def inspect_args(args)
+            args = args.map do |arg|
+              case arg
+              when ::Time, ::DateTime
+                arg.strftime('%a, %d %b %Y %H:%M:%S %Z').sub('+0000', '+00:00')
+              when ::Date
+                arg.strftime('%a, %d %b %Y')
+              when Hash
+                arg.delete(:fallback)
+                arg.inspect
+              else
+                arg.inspect
+              end
+            end
+            "[#{args.join(', ')}]"
           end
 
           def setup_time_proc_translations
             I18n.backend.store_translations :ru, {
               :time => {
                 :formats => {
-                  :proc => lambda { |*args| filter_args(*args) }
+                  :proc => lambda { |*args| inspect_args(args) }
                 }
               },
               :date => {
                 :formats => {
-                  :proc => lambda { |*args| filter_args(*args) }
+                  :proc => lambda { |*args| inspect_args(args) }
                 },
                 :'day_names' => lambda { |key, options|
                   (options[:format] =~ /^%A/) ?