i18n 0.6.9 → 0.6.11

data/test/i18n/load_path_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class I18nLoadPathTest < Test::Unit::TestCase
+class I18nLoadPathTest < I18n::TestCase
   def setup
     I18n.locale = :en
     I18n.backend = I18n::Backend::Simple.new

data/test/i18n_test.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 require 'test_helper'
 
-class I18nTest < Test::Unit::TestCase
+class I18nTest < I18n::TestCase
   def setup
-    I18n.backend.store_translations(:'en', :currency => { :format => { :separator => '.', :delimiter => ',', } })
-    I18n.backend.store_translations(:'nl', :currency => { :format => { :separator => ',', :delimiter => '.', } })
+    store_translations(:en, :currency => { :format => { :separator => '.', :delimiter => ',', } })
+    store_translations(:nl, :currency => { :format => { :separator => ',', :delimiter => '.', } })
   end
 
   test "exposes its VERSION constant" do
@@ -56,7 +56,7 @@ class I18nTest < Test::Unit::TestCase
     assert_equal :de, Thread.current[:i18n_config].locale
     I18n.locale = :en
   end
-  
+
   test "raises an I18n::InvalidLocale exception when setting an unavailable locale" do
     begin
       I18n.config.enforce_available_locales = true
@@ -215,6 +215,23 @@ class I18nTest < Test::Unit::TestCase
     end
   end
 
+  test "available_locales can be replaced at runtime" do
+    begin
+      I18n.config.enforce_available_locales = true
+      assert_raise(I18n::InvalidLocale) { I18n.t(:foo, :locale => 'klingon') }
+      old_locales, I18n.config.available_locales = I18n.config.available_locales, [:klingon]
+      I18n.t(:foo, :locale => 'klingon')
+    ensure
+      I18n.config.enforce_available_locales = false
+      I18n.config.available_locales = old_locales
+    end
+  end
+
+  test "available_locales_set should return a set" do
+    assert_equal Set, I18n.config.available_locales_set.class
+    assert_equal I18n.config.available_locales.size * 2, I18n.config.available_locales_set.size
+  end
+
   test "exists? given an existing key will return true" do
     assert_equal true, I18n.exists?(:currency)
   end

data/test/locale/fallbacks_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 include I18n::Locale
 
-class I18nFallbacksDefaultsTest < Test::Unit::TestCase
+class I18nFallbacksDefaultsTest < I18n::TestCase
   def teardown
     I18n.default_locale = :en
   end
@@ -26,7 +26,7 @@ class I18nFallbacksDefaultsTest < Test::Unit::TestCase
   end
 end
 
-class I18nFallbacksComputationTest < Test::Unit::TestCase
+class I18nFallbacksComputationTest < I18n::TestCase
   def setup
     @fallbacks = Fallbacks.new(:'en-US')
   end

data/test/locale/tag/rfc4646_test.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'test_helper'
 
-class I18nLocaleTagRfc4646ParserTest < Test::Unit::TestCase
+class I18nLocaleTagRfc4646ParserTest < I18n::TestCase
   include I18n::Locale
 
   test "Rfc4646::Parser given a valid tag 'de' returns an array of subtags" do
@@ -31,7 +31,7 @@ end
 
 # Tag for the locale 'de-Latn-DE-Variant-a-ext-x-phonebk-i-klingon'
 
-class I18nLocaleTagSubtagsTest < Test::Unit::TestCase
+class I18nLocaleTagSubtagsTest < I18n::TestCase
   include I18n::Locale
 
   def setup
@@ -78,7 +78,7 @@ end
 
 # Tag inheritance
 
-class I18nLocaleTagSubtagsTest < Test::Unit::TestCase
+class I18nLocaleTagSubtagsTest < I18n::TestCase
   test "#parent returns 'de-Latn-DE-variant-a-ext-x-phonebk' as the parent of 'de-Latn-DE-variant-a-ext-x-phonebk-i-klingon'" do
     tag = Tag::Rfc4646.new(*%w(de Latn DE variant a-ext x-phonebk i-klingon))
     assert_equal 'de-Latn-DE-variant-a-ext-x-phonebk', tag.parent.to_s

data/test/locale/tag/simple_test.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'test_helper'
 
-class I18nLocaleTagSimpleTest < Test::Unit::TestCase
+class I18nLocaleTagSimpleTest < I18n::TestCase
   include I18n::Locale
 
   test "returns 'de' as the language subtag in lowercase" do

data/test/run_all.rb

@@ -1,21 +1,20 @@
 def bundle_check
-  `bundle check` == "The Gemfile's dependencies are satisfied\n"
+  `bundle check` == "Resolving dependencies...\nThe Gemfile's dependencies are satisfied\n"
 end
 
-command  = 'ruby -w -Ilib -Itest test/all.rb'
-gemfiles = %w(ci/Gemfile.rails-3.x ci/Gemfile.rails-2.3.x ci/Gemfile.no-rails)
+def execute(command)
+  puts command
+  system command
+end
 
-results = gemfiles.map do |gemfile|
-  puts "BUNDLE_GEMFILE=#{gemfile}"
-  ENV['BUNDLE_GEMFILE'] = gemfile
+gemfiles = %w(Gemfile) + Dir['gemfiles/Gemfile*'].reject { |f| f.end_with?('.lock') }
 
-  unless bundle_check
-    puts "bundle install"
-    system('bundle install')
-  end
+results = gemfiles.map do |gemfile|
+  puts "\nBUNDLE_GEMFILE=#{gemfile}"
+  ENV['BUNDLE_GEMFILE'] = File.expand_path("../../#{gemfile}", __FILE__)
 
-  puts command
-  system('ruby -w -Ilib -Itest test/all.rb')
+  execute 'bundle install' unless bundle_check
+  execute 'bundle exec ruby -w -Ilib -Itest test/all.rb'
 end
 
-exit(results.inject(true) { |a, b| a && b })
+exit results.all?

data/test/test_helper.rb

@@ -1,7 +1,25 @@
 $KCODE = 'u' if RUBY_VERSION <= '1.9'
 
 require 'rubygems'
-require 'test/unit'
+
+# 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
+
+    def assert_nothing_raised(*args)
+      yield
+    end
+  end
+rescue LoadError
+  require 'test/unit'
+  TEST_CASE = Test::Unit::TestCase
+end
 
 # Do not load the i18n gem from libraries like active_support.
 #
@@ -14,25 +32,41 @@ end
 
 require 'bundler/setup'
 require 'i18n'
-require 'mocha'
+require 'mocha/setup'
 require 'test_declarative'
 
-class Test::Unit::TestCase
+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}"
+  end
+
   def teardown
+    super
     I18n.locale = nil
     I18n.default_locale = :en
     I18n.load_path = []
     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
+  end
+
+  protected
+
   def translations
     I18n.backend.instance_variable_get(:@translations)
   end
 
-  def store_translations(*args)
-    data   = args.pop
-    locale = args.pop || :en
+  def store_translations(locale, data)
     I18n.backend.store_translations(locale, data)
   end
 
@@ -40,17 +74,3 @@ class Test::Unit::TestCase
     File.dirname(__FILE__) + '/test_data/locales'
   end
 end
-
-module Kernel
-  def setup_rufus_tokyo
-    require 'rufus/tokyo'
-  rescue LoadError => e
-    puts "can't use KeyValue backend because: #{e.message}"
-  end
-end
-
-Object.class_eval do
-  def meta_class
-    class << self; self; end
-  end
-end unless Object.method_defined?(:meta_class)

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: i18n
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.6.11
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 9
-  version: 0.6.9
 platform: ruby
-authors: 
+authors:
 - Sven Fuchs
 - Joshua Harvey
 - Matt Aimonetti
@@ -18,82 +13,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-12-03 00:00:00 Z
-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
-  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: 2014-07-09 00:00:00.000000000 Z
+dependencies: []
 description: New wave Internationalization support for Ruby.
 email: rails-i18n@googlegroups.com
 executables: []
-
 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
+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
+- 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
 - lib/i18n/backend/base.rb
 - lib/i18n/backend/cache.rb
 - lib/i18n/backend/cascade.rb
@@ -111,7 +50,7 @@ files:
 - 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/kernel/suppress_warnings.rb
 - lib/i18n/core_ext/string/interpolate.rb
 - lib/i18n/exceptions.rb
 - lib/i18n/gettext/helpers.rb
@@ -180,42 +119,31 @@ files:
 - test/test_data/locales/invalid/syntax.yml
 - test/test_data/locales/plurals.rb
 - test/test_helper.rb
-- README.textile
+- README.md
 - MIT-LICENSE
 homepage: http://github.com/svenfuchs/i18n
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 17
-      segments: 
-      - 1
-      - 3
-      - 5
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
-rubyforge_project: "[none]"
-rubygems_version: 1.8.6
+rubyforge_project: ! '[none]'
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: New wave Internationalization support for Ruby
 test_files: []
-

data/ci/Gemfile.no-rails

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-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.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