i18n 0.5.0 → 0.5.2

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,5 +1,17 @@
 # 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
@@ -7,22 +19,22 @@ 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
@@ -52,45 +64,32 @@ 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 inspect_args([time, {}]), I18n.l(time, :format => :proc, :locale => :ru)
+          assert_equal [time, {}].inspect, 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 inspect_args([time, options]), I18n.l(time, options.merge(:format => :proc, :locale => :ru))
+          assert_equal [time, options].inspect, I18n.l(time, options.merge(:format => :proc, :locale => :ru))
         end
 
         protected
 
-          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(', ')}]"
+          def filter_args(*args)
+            args.map { |arg| arg.delete(:fallback) if arg.is_a?(Hash) ; arg }.inspect
           end
 
           def setup_time_proc_translations
             I18n.backend.store_translations :ru, {
               :time => {
                 :formats => {
-                  :proc => lambda { |*args| inspect_args(args) }
+                  :proc => lambda { |*args| filter_args(*args) }
                 }
               },
               :date => {
                 :formats => {
-                  :proc => lambda { |*args| inspect_args(args) }
+                  :proc => lambda { |*args| filter_args(*args) }
                 },
                 :'day_names' => lambda { |key, options|
                   (options[:format] =~ /^%A/) ?

data/lib/i18n/version.rb

@@ -1,3 +1,3 @@
 module I18n
-  VERSION = "0.5.0"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: i18n
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -19,67 +19,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: test_declarative
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id004
+date: 2013-12-03 00:00:00 Z
+dependencies: []
+
 description: New wave Internationalization support for Ruby.
 email: rails-i18n@googlegroups.com
 executables: []
@@ -89,16 +31,13 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- ci/Gemfile.no-rails
-- ci/Gemfile.no-rails.lock
-- ci/Gemfile.rails-2.3.x
-- ci/Gemfile.rails-2.3.x.lock
-- ci/Gemfile.rails-3.x
-- ci/Gemfile.rails-3.x.lock
+- lib/i18n.rb
+- lib/i18n/backend.rb
 - lib/i18n/backend/base.rb
 - lib/i18n/backend/cache.rb
 - lib/i18n/backend/cascade.rb
 - lib/i18n/backend/chain.rb
+- lib/i18n/backend/cldr.rb
 - lib/i18n/backend/fallbacks.rb
 - lib/i18n/backend/flatten.rb
 - lib/i18n/backend/gettext.rb
@@ -109,80 +48,36 @@ files:
 - lib/i18n/backend/pluralization.rb
 - lib/i18n/backend/simple.rb
 - lib/i18n/backend/transliterator.rb
-- lib/i18n/backend.rb
 - lib/i18n/config.rb
 - lib/i18n/core_ext/hash.rb
-- lib/i18n/core_ext/kernel/surpress_warnings.rb
 - lib/i18n/core_ext/string/interpolate.rb
 - lib/i18n/exceptions.rb
+- lib/i18n/gettext.rb
 - lib/i18n/gettext/helpers.rb
 - lib/i18n/gettext/po_parser.rb
-- lib/i18n/gettext.rb
-- lib/i18n/interpolate/ruby.rb
+- lib/i18n/locale.rb
 - lib/i18n/locale/fallbacks.rb
+- lib/i18n/locale/tag.rb
 - lib/i18n/locale/tag/parents.rb
 - lib/i18n/locale/tag/rfc4646.rb
 - lib/i18n/locale/tag/simple.rb
-- lib/i18n/locale/tag.rb
-- lib/i18n/locale.rb
+- lib/i18n/tests.rb
 - lib/i18n/tests/basics.rb
 - lib/i18n/tests/defaults.rb
 - lib/i18n/tests/interpolation.rb
 - lib/i18n/tests/link.rb
+- lib/i18n/tests/localization.rb
 - lib/i18n/tests/localization/date.rb
 - lib/i18n/tests/localization/date_time.rb
 - lib/i18n/tests/localization/procs.rb
 - lib/i18n/tests/localization/time.rb
-- lib/i18n/tests/localization.rb
 - lib/i18n/tests/lookup.rb
 - lib/i18n/tests/pluralization.rb
 - lib/i18n/tests/procs.rb
-- lib/i18n/tests.rb
 - lib/i18n/version.rb
-- lib/i18n.rb
-- test/all.rb
-- test/api/all_features_test.rb
-- test/api/cascade_test.rb
-- test/api/chain_test.rb
-- test/api/fallbacks_test.rb
-- test/api/key_value_test.rb
-- test/api/memoize_test.rb
-- test/api/pluralization_test.rb
-- test/api/simple_test.rb
-- test/backend/cache_test.rb
-- test/backend/cascade_test.rb
-- test/backend/chain_test.rb
-- test/backend/exceptions_test.rb
-- test/backend/fallbacks_test.rb
-- test/backend/interpolation_compiler_test.rb
-- test/backend/key_value_test.rb
-- test/backend/memoize_test.rb
-- test/backend/metadata_test.rb
-- test/backend/pluralization_test.rb
-- test/backend/simple_test.rb
-- test/backend/transliterator_test.rb
-- test/core_ext/hash_test.rb
-- test/core_ext/string/interpolate_test.rb
-- test/gettext/api_test.rb
-- test/gettext/backend_test.rb
-- test/i18n/exceptions_test.rb
-- test/i18n/interpolate_test.rb
-- test/i18n/load_path_test.rb
-- test/i18n_test.rb
-- test/locale/fallbacks_test.rb
-- test/locale/tag/rfc4646_test.rb
-- test/locale/tag/simple_test.rb
-- test/run_all.rb
-- test/test_data/locales/de.po
-- test/test_data/locales/en.rb
-- test/test_data/locales/en.yml
-- test/test_data/locales/invalid/empty.yml
-- test/test_data/locales/plurals.rb
-- test/test_helper.rb
 - README.textile
 - MIT-LICENSE
 - CHANGELOG.textile
-has_rdoc: true
 homepage: http://github.com/svenfuchs/i18n
 licenses: []
 
@@ -214,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: "[none]"
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: New wave Internationalization support for Ruby

data/ci/Gemfile.no-rails

@@ -1,5 +0,0 @@
-source :rubygems
-
-gem 'mocha'
-gem 'test_declarative'
-

data/ci/Gemfile.no-rails.lock

@@ -1,14 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    mocha (0.9.9)
-      rake
-    rake (0.8.7)
-    test_declarative (0.0.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  mocha
-  test_declarative

data/ci/Gemfile.rails-2.3.x

@@ -1,9 +0,0 @@
-source :rubygems
-
-gem 'activesupport', '~> 2.3'
-gem 'sqlite3-ruby'
-gem 'mocha'
-gem 'test_declarative'
-gem 'rufus-tokyo'
-gem 'ffi'
-

data/ci/Gemfile.rails-2.3.x.lock

@@ -1,23 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (2.3.10)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
-    mocha (0.9.9)
-      rake
-    rake (0.8.7)
-    rufus-tokyo (1.0.7)
-    sqlite3-ruby (1.3.2)
-    test_declarative (0.0.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 2.3)
-  ffi
-  mocha
-  rufus-tokyo
-  sqlite3-ruby
-  test_declarative

data/ci/Gemfile.rails-3.x

@@ -1,9 +0,0 @@
-source :rubygems
-
-gem 'activesupport', '~> 3.0.0'
-gem 'sqlite3-ruby'
-gem 'mocha'
-gem 'test_declarative'
-gem 'rufus-tokyo'
-gem 'ffi'
-

data/ci/Gemfile.rails-3.x.lock

@@ -1,23 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.3)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
-    mocha (0.9.9)
-      rake
-    rake (0.8.7)
-    rufus-tokyo (1.0.7)
-    sqlite3-ruby (1.3.2)
-    test_declarative (0.0.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 3.0.0)
-  ffi
-  mocha
-  rufus-tokyo
-  sqlite3-ruby
-  test_declarative

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

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

data/lib/i18n/interpolate/ruby.rb

@@ -1,31 +0,0 @@
-# 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