i18n 0.6.11 → 0.7.0.beta1

data/test/i18n/load_path_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 class I18nLoadPathTest < I18n::TestCase
   def setup
+    super
     I18n.locale = :en
     I18n.backend = I18n::Backend::Simple.new
     store_translations(:en, :foo => {:bar => 'bar', :baz => 'baz'})

data/test/i18n_test.rb

@@ -3,6 +3,7 @@ require 'test_helper'
 
 class I18nTest < I18n::TestCase
   def setup
+    super
     store_translations(:en, :currency => { :format => { :separator => '.', :delimiter => ',', } })
     store_translations(:nl, :currency => { :format => { :separator => ',', :delimiter => '.', } })
   end
@@ -37,6 +38,10 @@ class I18nTest < I18n::TestCase
     end
   end
 
+  test "default_locale= doesn't ignore junk" do
+    assert_raise(NoMethodError) { I18n.default_locale = Class }
+  end
+
   test "raises an I18n::InvalidLocale exception when setting an unavailable default locale" do
     begin
       I18n.config.enforce_available_locales = true
@@ -57,6 +62,10 @@ class I18nTest < I18n::TestCase
     I18n.locale = :en
   end
 
+  test "locale= doesn't ignore junk" do
+    assert_raise(NoMethodError) { I18n.locale = Class }
+  end
+
   test "raises an I18n::InvalidLocale exception when setting an unavailable locale" do
     begin
       I18n.config.enforce_available_locales = true
@@ -379,4 +388,30 @@ 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
+      I18n.enforce_available_locales = true
+
+      assert_raise(I18n::InvalidLocale) { I18n.default_locale = :de }
+      assert_raise(I18n::InvalidLocale) { I18n.locale = :de }
+
+      store_translations(:de, :foo => 'Foo in :de')
+
+      assert_raise(I18n::InvalidLocale) { I18n.default_locale = :de }
+      assert_raise(I18n::InvalidLocale) { I18n.locale = :de }
+
+      I18n.reload!
+
+      store_translations(:en, :foo => 'Foo in :en')
+      store_translations(:de, :foo => 'Foo in :de')
+      store_translations(:pl, :foo => 'Foo in :pl')
+
+      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 }
+    ensure
+      I18n.enforce_available_locales = false
+    end
+  end
 end

data/test/locale/fallbacks_test.rb

@@ -3,10 +3,6 @@ require 'test_helper'
 include I18n::Locale
 
 class I18nFallbacksDefaultsTest < I18n::TestCase
-  def teardown
-    I18n.default_locale = :en
-  end
-
   test "defaults reflect the I18n.default_locale if no default has been set manually" do
     I18n.default_locale = :'en-US'
     fallbacks = Fallbacks.new
@@ -28,6 +24,7 @@ end
 
 class I18nFallbacksComputationTest < I18n::TestCase
   def setup
+    super
     @fallbacks = Fallbacks.new(:'en-US')
   end
 

data/test/locale/tag/rfc4646_test.rb

@@ -35,6 +35,7 @@ class I18nLocaleTagSubtagsTest < I18n::TestCase
   include I18n::Locale
 
   def setup
+    super
     subtags = %w(de Latn DE variant a-ext x-phonebk i-klingon)
     @tag = Tag::Rfc4646.new(*subtags)
   end

data/test/run_all.rb

@@ -14,7 +14,7 @@ results = gemfiles.map do |gemfile|
   ENV['BUNDLE_GEMFILE'] = File.expand_path("../../#{gemfile}", __FILE__)
 
   execute 'bundle install' unless bundle_check
-  execute 'bundle exec ruby -w -Ilib -Itest test/all.rb'
+  execute 'bundle exec rake test'
 end
 
 exit results.all?

data/test/test_helper.rb

@@ -1,33 +1,16 @@
 $KCODE = 'u' if RUBY_VERSION <= '1.9'
 
-require 'rubygems'
+require 'minitest/autorun'
+TEST_CASE = defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase
 
-# Use minitest if we can, otherwise fallback to test-unit.
-begin
-  require 'minitest/autorun'
-  TEST_CASE = defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase
+# TODO: Remove these aliases and update tests accordingly.
+class TEST_CASE
+  alias :assert_raise :assert_raises
+  alias :assert_not_equal :refute_equal
 
-  # TODO: Remove these aliases and update tests accordingly.
-  class TEST_CASE
-    alias :assert_raise :assert_raises
-    alias :assert_not_equal :refute_equal
-
-    def assert_nothing_raised(*args)
-      yield
-    end
+  def assert_nothing_raised(*args)
+    yield
   end
-rescue LoadError
-  require 'test/unit'
-  TEST_CASE = Test::Unit::TestCase
-end
-
-# Do not load the i18n gem from libraries like active_support.
-#
-# This is required for testing against Rails 2.3 because active_support/vendor.rb#24 tries
-# to load I18n using the gem method. Instead, we want to test the local library of course.
-alias :gem_for_ruby_19 :gem # for 1.9. gives a super ugly seg fault otherwise
-def gem(gem_name, *version_requirements)
-  gem_name =='i18n' ? puts("skipping loading the i18n gem ...") : super
 end
 
 require 'bundler/setup'
@@ -36,28 +19,24 @@ require 'mocha/setup'
 require 'test_declarative'
 
 class I18n::TestCase < TEST_CASE
-  def self.setup_rufus_tokyo
-    require 'rufus/tokyo'
-  rescue LoadError => e
-    puts "can't use KeyValue backend because: #{e.message}"
+  def self.key_value?
+    defined?(ActiveSupport)
   end
 
-  def teardown
+  def setup
     super
+    I18n.enforce_available_locales = false
+  end
+
+  def teardown
     I18n.locale = nil
-    I18n.default_locale = :en
-    I18n.load_path = []
+    I18n.default_locale = nil
+    I18n.load_path = nil
     I18n.available_locales = nil
     I18n.backend = nil
-    I18n.enforce_available_locales = nil
-  end
-
-  # Ignore Test::Unit::TestCase failing if the test case does not contain any
-  # test, otherwise it will blow up because of this base class.
-  #
-  # TODO: remove when test-unit is not used anymore.
-  def default_test
-    nil
+    I18n.default_separator = nil
+    I18n.enforce_available_locales = true
+    super
   end
 
   protected

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n
 version: !ruby/object:Gem::Version
-  version: 0.6.11
-  prerelease: 
+  version: 0.7.0.beta1
 platform: ruby
 authors:
 - Sven Fuchs
@@ -13,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies: []
 description: New wave Internationalization support for Ruby.
 email: rails-i18n@googlegroups.com
@@ -21,18 +20,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- gemfiles/Gemfile.rails-2.3.x
-- gemfiles/Gemfile.rails-2.3.x.lock
-- gemfiles/Gemfile.rails-3.0.x
-- gemfiles/Gemfile.rails-3.0.x.lock
-- gemfiles/Gemfile.rails-3.1.x
-- gemfiles/Gemfile.rails-3.1.x.lock
+- MIT-LICENSE
+- README.md
 - gemfiles/Gemfile.rails-3.2.x
 - gemfiles/Gemfile.rails-3.2.x.lock
 - gemfiles/Gemfile.rails-4.0.x
 - gemfiles/Gemfile.rails-4.0.x.lock
 - gemfiles/Gemfile.rails-4.1.x
 - gemfiles/Gemfile.rails-4.1.x.lock
+- gemfiles/Gemfile.rails-master
+- gemfiles/Gemfile.rails-master.lock
+- lib/i18n.rb
+- lib/i18n/backend.rb
 - lib/i18n/backend/base.rb
 - lib/i18n/backend/cache.rb
 - lib/i18n/backend/cascade.rb
@@ -47,38 +46,34 @@ 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/suppress_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
@@ -101,7 +96,6 @@ files:
 - 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
@@ -119,31 +113,28 @@ files:
 - test/test_data/locales/invalid/syntax.yml
 - test/test_data/locales/plurals.rb
 - test/test_helper.rb
-- README.md
-- MIT-LICENSE
 homepage: http://github.com/svenfuchs/i18n
 licenses:
 - MIT
+metadata: {}
 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
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubyforge_project: ! '[none]'
-rubygems_version: 1.8.23.2
+rubyforge_project: "[none]"
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: New wave Internationalization support for Ruby
 test_files: []

data/gemfiles/Gemfile.rails-2.3.x

@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '..'
-
-gem 'activesupport', '~> 2.3'
-gem 'mocha'
-gem 'test_declarative'
-gem 'rufus-tokyo'
-gem 'ffi'
-gem 'rake'
-gem 'yajl-ruby'

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

@@ -1,30 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    i18n (0.6.11)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (2.3.18)
-    ffi (1.9.3)
-    metaclass (0.0.4)
-    mocha (1.0.0)
-      metaclass (~> 0.0.1)
-    rake (10.3.1)
-    rufus-tokyo (1.0.7)
-    test_declarative (0.0.5)
-    yajl-ruby (1.2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 2.3)
-  ffi
-  i18n!
-  mocha
-  rake
-  rufus-tokyo
-  test_declarative
-  yajl-ruby

data/gemfiles/Gemfile.rails-3.0.x

@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '..'
-
-gem 'activesupport', '~> 3.0.0'
-gem 'mocha'
-gem 'test_declarative'
-gem 'rufus-tokyo'
-gem 'ffi'
-gem 'rake'
-gem 'yajl-ruby'

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

@@ -1,30 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    i18n (0.6.11)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (3.0.20)
-    ffi (1.9.3)
-    metaclass (0.0.4)
-    mocha (1.0.0)
-      metaclass (~> 0.0.1)
-    rake (10.3.1)
-    rufus-tokyo (1.0.7)
-    test_declarative (0.0.5)
-    yajl-ruby (1.2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 3.0.0)
-  ffi
-  i18n!
-  mocha
-  rake
-  rufus-tokyo
-  test_declarative
-  yajl-ruby

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

@@ -1,30 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    i18n (0.6.11)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (3.1.12)
-      multi_json (~> 1.0)
-    ffi (1.9.3)
-    metaclass (0.0.4)
-    mocha (1.0.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.10.0)
-    rake (10.3.1)
-    rufus-tokyo (1.0.7)
-    test_declarative (0.0.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 3.1.0)
-  ffi
-  i18n!
-  mocha
-  rake
-  rufus-tokyo
-  test_declarative

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

@@ -1,105 +0,0 @@
-# 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
-  Copyright (C) 2005-2009 Masao Mutoh
-  You may redistribute it and/or modify it under the same license terms as Ruby.
-=end
-
-begin
-  raise ArgumentError if ("a %{x}" % {:x=>'b'}) != 'a b'
-rescue ArgumentError
-  # KeyError is raised by String#% when the string contains a named placeholder
-  # that is not contained in the given arguments hash. Ruby 1.9 includes and
-  # raises this exception natively. We define it to mimic Ruby 1.9's behaviour
-  # in Ruby 1.8.x
-  class KeyError < IndexError
-    def initialize(message = nil)
-      super(message || "key not found")
-    end
-  end unless defined?(KeyError)
-
-  # Extension for String class. This feature is included in Ruby 1.9 or later but not occur TypeError.
-  #
-  # String#% method which accept "named argument". The translator can know
-  # the meaning of the msgids using "named argument" instead of %s/%d style.
-  class String
-    # For older ruby versions, such as ruby-1.8.5
-    alias :bytesize :size unless instance_methods.find {|m| m.to_s == 'bytesize'}
-    alias :interpolate_without_ruby_19_syntax :% # :nodoc:
-
-    INTERPOLATION_PATTERN = Regexp.union(
-      /%\{(\w+)\}/,                               # matches placeholders like "%{foo}"
-      /%<(\w+)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/  # matches placeholders like "%<foo>.d"
-    )
-
-    INTERPOLATION_PATTERN_WITH_ESCAPE = Regexp.union(
-      /%%/,
-      INTERPOLATION_PATTERN
-    )
-
-    # % uses self (i.e. the String) as a format specification and returns the
-    # result of applying it to the given arguments. In other words it interpolates
-    # the given arguments to the string according to the formats the string
-    # defines.
-    #
-    # There are three ways to use it:
-    #
-    # * Using a single argument or Array of arguments.
-    #
-    #   This is the default behaviour of the String class. See Kernel#sprintf for
-    #   more details about the format string.
-    #
-    #   Example:
-    #
-    #     "%d %s" % [1, "message"]
-    #     # => "1 message"
-    #
-    # * Using a Hash as an argument and unformatted, named placeholders.
-    #
-    #   When you pass a Hash as an argument and specify placeholders with %{foo}
-    #   it will interpret the hash values as named arguments.
-    #
-    #   Example:
-    #
-    #     "%{firstname}, %{lastname}" % {:firstname => "Masao", :lastname => "Mutoh"}
-    #     # => "Masao Mutoh"
-    #
-    # * Using a Hash as an argument and formatted, named placeholders.
-    #
-    #   When you pass a Hash as an argument and specify placeholders with %<foo>d
-    #   it will interpret the hash values as named arguments and format the value
-    #   according to the formatting instruction appended to the closing >.
-    #
-    #   Example:
-    #
-    #     "%<integer>d, %<float>.1f" % { :integer => 10, :float => 43.4 }
-    #     # => "10, 43.3"
-    def %(args)
-      if args.kind_of?(Hash)
-        dup.gsub(INTERPOLATION_PATTERN_WITH_ESCAPE) do |match|
-          if match == '%%'
-            '%'
-          else
-            key = ($1 || $2).to_sym
-            raise KeyError unless args.has_key?(key)
-            $3 ? sprintf("%#{$3}", args[key]) : args[key]
-          end
-        end
-      elsif self =~ INTERPOLATION_PATTERN
-        raise ArgumentError.new('one hash required')
-      else
-        result = gsub(/%([{<])/, '%%\1')
-        result.send :'interpolate_without_ruby_19_syntax', args
-      end
-    end
-  end
-end