i18n 0.6.11 → 0.7.0.beta1

data/lib/i18n/version.rb

@@ -1,3 +1,3 @@
 module I18n
-  VERSION = "0.6.11"
+  VERSION = "0.7.0.beta1"
 end

data/test/api/key_value_test.rb

@@ -1,7 +1,5 @@
 require 'test_helper'
 
-I18n::TestCase.setup_rufus_tokyo
-
 class I18nKeyValueApiTest < I18n::TestCase
   include I18n::Tests::Basics
   include I18n::Tests::Defaults
@@ -15,14 +13,12 @@ class I18nKeyValueApiTest < I18n::TestCase
   include I18n::Tests::Localization::Time
   # include Tests::Api::Localization::Procs
 
-  STORE = Rufus::Tokyo::Cabinet.new('*')
-
   def setup
-    I18n.backend = I18n::Backend::KeyValue.new(STORE)
+    I18n.backend = I18n::Backend::KeyValue.new({})
     super
   end
 
   test "make sure we use the KeyValue backend" do
     assert_equal I18n::Backend::KeyValue, I18n.backend.class
   end
-end if defined?(Rufus::Tokyo::Cabinet)
+end if I18n::TestCase.key_value?

data/test/api/memoize_test.rb

@@ -27,8 +27,6 @@ class I18nMemoizeBackendWithSimpleApiTest < I18n::TestCase
   end
 end
 
-I18n::TestCase.setup_rufus_tokyo
-
 class I18nMemoizeBackendWithKeyValueApiTest < I18n::TestCase
   include I18n::Tests::Basics
   include I18n::Tests::Defaults
@@ -47,14 +45,12 @@ class I18nMemoizeBackendWithKeyValueApiTest < I18n::TestCase
     include I18n::Backend::Memoize
   end
 
-  STORE = Rufus::Tokyo::Cabinet.new('*')
-
   def setup
-    I18n.backend = MemoizeBackend.new(STORE)
+    I18n.backend = MemoizeBackend.new({})
     super
   end
 
   test "make sure we use the MemoizeBackend backend" do
     assert_equal MemoizeBackend, I18n.backend.class
   end
-end if defined?(Rufus::Tokyo::Cabinet)
+end if I18n::TestCase.key_value?

data/test/api/override_test.rb

@@ -16,9 +16,9 @@ class I18nOverrideTest < I18n::TestCase
   end
 
   def setup
+    super
     @I18n = I18n.dup
     @I18n.backend = I18n::Backend::Simple.new
-    super
   end
 
   test "make sure modules can overwrite I18n methods" do
@@ -26,8 +26,7 @@ class I18nOverrideTest < I18n::TestCase
     @I18n.backend.store_translations('en', :foo => 'bar')
 
     assert_equal 'rab', @I18n.translate(:foo, :locale => 'en')
-    # FIXME: this fails under 1.8.7
-    # assert_equal 'rab', @I18n.t(:foo, :locale => 'en')
+    assert_equal 'rab', @I18n.t(:foo, :locale => 'en')
     assert_equal 'rab', @I18n.translate!(:foo, :locale => 'en')
     assert_equal 'rab', @I18n.t!(:foo, :locale => 'en')
   end

data/test/backend/cache_test.rb

@@ -18,6 +18,7 @@ class I18nBackendCacheTest < I18n::TestCase
   end
 
   def teardown
+    super
     I18n.cache_store = nil
   end
 

data/test/backend/cascade_test.rb

@@ -6,6 +6,7 @@ class I18nBackendCascadeTest < I18n::TestCase
   end
 
   def setup
+    super
     I18n.backend = Backend.new
     store_translations(:en, :foo => 'foo', :bar => { :baz => 'baz' })
     @cascade_options = { :step => 1, :offset => 1, :skip_root => false }

data/test/backend/chain_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 class I18nBackendChainTest < I18n::TestCase
   def setup
+    super
     @first  = backend(:en => {
       :foo => 'Foo', :formats => { :short => 'short' }, :plural_1 => { :one => '%{count}' }, :dates => {:a => "A"}
     })

data/test/backend/exceptions_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 class I18nBackendExceptionsTest < I18n::TestCase
   def setup
+    super
     I18n.backend = I18n::Backend::Simple.new
   end
 

data/test/backend/fallbacks_test.rb

@@ -6,6 +6,7 @@ class I18nBackendFallbacksTranslateTest < I18n::TestCase
   end
 
   def setup
+    super
     I18n.backend = Backend.new
     store_translations(:en, :foo => 'Foo in :en', :bar => 'Bar in :en', :buz => 'Buz in :en')
     store_translations(:de, :bar => 'Bar in :de', :baz => 'Baz in :de')
@@ -92,6 +93,7 @@ class I18nBackendFallbacksLocalizeTest < I18n::TestCase
   end
 
   def setup
+    super
     I18n.backend = Backend.new
     store_translations(:en, :date => { :formats => { :en => 'en' }, :day_names => %w(Sunday) })
     store_translations(:de, :date => { :formats => { :de => 'de' } })
@@ -123,12 +125,16 @@ class I18nBackendFallbacksWithChainTest < I18n::TestCase
     include I18n::Backend::Fallbacks
   end
 
+  class Chain < I18n::Backend::Chain
+    include I18n::Backend::Fallbacks
+  end
+
   def setup
+    super
     backend = Backend.new
     backend.store_translations(:de, :foo => 'FOO')
     backend.store_translations(:'pt-BR', :foo => 'Baz in :pt-BR')
-    I18n.backend = I18n::Backend::Chain.new(I18n::Backend::Simple.new, backend)
-    I18n.backend.class.send(:include, I18n::Backend::Fallbacks)
+    I18n.backend = Chain.new(I18n::Backend::Simple.new, backend)
   end
 
   test "falls back from de-DE to de when there is no translation for de-DE available" do

data/test/backend/key_value_test.rb

@@ -1,10 +1,8 @@
 require 'test_helper'
 
-I18n::TestCase.setup_rufus_tokyo
-
 class I18nBackendKeyValueTest < I18n::TestCase
   def setup_backend!(subtree=true)
-    I18n.backend = I18n::Backend::KeyValue.new(Rufus::Tokyo::Cabinet.new('*'), subtree)
+    I18n.backend = I18n::Backend::KeyValue.new({}, subtree)
     store_translations(:en, :foo => { :bar => 'bar', :baz => 'baz' })
   end
 
@@ -42,5 +40,4 @@ class I18nBackendKeyValueTest < I18n::TestCase
       I18n.t("foo", :raise => true)
     end
   end
-
-end if defined?(Rufus::Tokyo::Cabinet)
+end if I18n::TestCase.key_value?

data/test/backend/memoize_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
-
-require 'backend/simple_test'
+# TODO: change back to "require 'backend/simple'" when dropping support to Ruby 1.8.7.
+require File.expand_path('../simple_test', __FILE__)
 
 class I18nBackendMemoizeTest < I18nBackendSimpleTest
   module MemoizeSpy

data/test/backend/metadata_test.rb

@@ -6,6 +6,7 @@ class I18nBackendMetadataTest < I18n::TestCase
   end
 
   def setup
+    super
     I18n.backend = Backend.new
     store_translations(:en, :foo => 'Hi %{name}')
   end

data/test/backend/pluralization_test.rb

@@ -7,6 +7,7 @@ class I18nBackendPluralizationTest < I18n::TestCase
   end
 
   def setup
+    super
     I18n.backend = Backend.new
     @rule = lambda { |n| n == 1 ? :one : n == 0 || (2..10).include?(n % 100) ? :few : (11..19).include?(n % 100) ? :many : :other }
     store_translations(:xx, :i18n => { :plural => { :rule => @rule } })

data/test/backend/simple_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 class I18nBackendSimpleTest < I18n::TestCase
   def setup
+    super
     I18n.backend = I18n::Backend::Simple.new
     I18n.load_path = [locales_dir + '/en.yml']
   end
@@ -78,6 +79,6 @@ class I18nBackendSimpleTest < I18n::TestCase
 
   test "simple reload_translations: uninitializes the backend" do
     I18n.backend.reload!
-    assert_equal I18n.backend.initialized?, false
+    assert_equal false, I18n.backend.initialized?
   end
 end

data/test/backend/transliterator_test.rb

@@ -3,6 +3,7 @@ require 'test_helper'
 
 class I18nBackendTransliterator < I18n::TestCase
   def setup
+    super
     I18n.backend = I18n::Backend::Simple.new
     @proc = lambda { |n| n.upcase }
     @hash = { "ü" => "ue", "ö" => "oe", "a" => "a" }
@@ -55,11 +56,9 @@ class I18nBackendTransliterator < I18n::TestCase
     assert_equal "abc#", @transliterator.transliterate("abcſ", "#")
   end
 
-  if RUBY_VERSION >= "1.9"
-    test "default transliterator raises errors for invalid UTF-8" do
-      assert_raise ArgumentError do
-        @transliterator.transliterate("a\x92b")
-      end
+  test "default transliterator raises errors for invalid UTF-8" do
+    assert_raise ArgumentError do
+      @transliterator.transliterate("a\x92b")
     end
   end
 

data/test/gettext/api_test.rb

@@ -6,6 +6,7 @@ include I18n::Gettext::Helpers
 
 class I18nGettextApiTest < I18n::TestCase
   def setup
+    super
     I18n.locale = :en
     I18n.backend.store_translations :de, {
       'Hi Gettext!' => 'Hallo Gettext!',

data/test/gettext/backend_test.rb

@@ -2,100 +2,91 @@
 
 require 'test_helper'
 
-# apparently Ruby 1.9.1p129 has encoding problems with the gettext po parser
-unless RUBY_VERSION == '1.9.1' && RUBY_PATCHLEVEL <= 129
+class I18nGettextBackendTest < I18n::TestCase
+  include I18n::Gettext::Helpers
 
-  class I18nGettextBackendTest < I18n::TestCase
-    include I18n::Gettext::Helpers
-
-    class Backend < I18n::Backend::Simple
-      include I18n::Backend::Gettext
-    end
-
-    def setup
-      I18n.backend = Backend.new
-      I18n.locale = :en
-      I18n.load_path = ["#{locales_dir}/de.po"]
-      @old_separator, I18n.default_separator = I18n.default_separator, '|'
-    end
+  class Backend < I18n::Backend::Simple
+    include I18n::Backend::Gettext
+  end
 
-    def teardown
-      I18n.load_path = nil
-      I18n.backend = nil
-      I18n.default_separator = @old_separator
-    end
+  def setup
+    super
+    I18n.backend = Backend.new
+    I18n.locale = :en
+    I18n.load_path = ["#{locales_dir}/de.po"]
+    I18n.default_separator = '|'
+  end
 
-    def test_backend_loads_po_file
-      I18n.backend.send(:init_translations)
-      assert I18n.backend.send(:translations)[:de][:"Axis"]
-    end
+  def test_backend_loads_po_file
+    I18n.backend.send(:init_translations)
+    assert I18n.backend.send(:translations)[:de][:"Axis"]
+  end
 
-    def test_looks_up_a_translation
-      I18n.locale = :de
-      assert_equal 'Auto', gettext('car')
-    end
+  def test_looks_up_a_translation
+    I18n.locale = :de
+    assert_equal 'Auto', gettext('car')
+  end
 
-    def test_uses_default_translation
-      assert_equal 'car', gettext('car')
-    end
+  def test_uses_default_translation
+    assert_equal 'car', gettext('car')
+  end
 
-    def test_looks_up_a_namespaced_translation
-      I18n.locale = :de
-      assert_equal 'Räderzahl', sgettext('Car|Wheels count')
-      assert_equal 'Räderzahl', pgettext('Car', 'Wheels count')
-      assert_equal 'Räderzahl!', pgettext('New car', 'Wheels count')
-    end
+  def test_looks_up_a_namespaced_translation
+    I18n.locale = :de
+    assert_equal 'Räderzahl', sgettext('Car|Wheels count')
+    assert_equal 'Räderzahl', pgettext('Car', 'Wheels count')
+    assert_equal 'Räderzahl!', pgettext('New car', 'Wheels count')
+  end
 
-    def test_uses_namespaced_default_translation
-      assert_equal 'Wheels count', sgettext('Car|Wheels count')
-      assert_equal 'Wheels count', pgettext('Car', 'Wheels count')
-      assert_equal 'Wheels count', pgettext('New car', 'Wheels count')
-    end
+  def test_uses_namespaced_default_translation
+    assert_equal 'Wheels count', sgettext('Car|Wheels count')
+    assert_equal 'Wheels count', pgettext('Car', 'Wheels count')
+    assert_equal 'Wheels count', pgettext('New car', 'Wheels count')
+  end
 
-    def test_pluralizes_entry
-      I18n.locale = :de
-      assert_equal 'Achse', ngettext('Axis', 'Axis', 1)
-      assert_equal 'Achsen', ngettext('Axis', 'Axis', 2)
-    end
+  def test_pluralizes_entry
+    I18n.locale = :de
+    assert_equal 'Achse', ngettext('Axis', 'Axis', 1)
+    assert_equal 'Achsen', ngettext('Axis', 'Axis', 2)
+  end
 
-    def test_pluralizes_default_entry
-      assert_equal 'Axis', ngettext('Axis', 'Axis', 1)
-      assert_equal 'Axis', ngettext('Axis', 'Axis', 2)
-    end
+  def test_pluralizes_default_entry
+    assert_equal 'Axis', ngettext('Axis', 'Axis', 1)
+    assert_equal 'Axis', ngettext('Axis', 'Axis', 2)
+  end
 
-    def test_pluralizes_namespaced_entry
-      I18n.locale = :de
-      assert_equal 'Rad',   nsgettext('Car|wheel', 'wheels', 1)
-      assert_equal 'Räder', nsgettext('Car|wheel', 'wheels', 2)
-      assert_equal 'Rad',   npgettext('Car', 'wheel', 'wheels', 1)
-      assert_equal 'Räder', npgettext('Car', 'wheel', 'wheels', 2)
-      assert_equal 'Rad!', npgettext('New car', 'wheel', 'wheels', 1)
-      assert_equal 'Räder!', npgettext('New car', 'wheel', 'wheels', 2)
-    end
+  def test_pluralizes_namespaced_entry
+    I18n.locale = :de
+    assert_equal 'Rad',   nsgettext('Car|wheel', 'wheels', 1)
+    assert_equal 'Räder', nsgettext('Car|wheel', 'wheels', 2)
+    assert_equal 'Rad',   npgettext('Car', 'wheel', 'wheels', 1)
+    assert_equal 'Räder', npgettext('Car', 'wheel', 'wheels', 2)
+    assert_equal 'Rad!', npgettext('New car', 'wheel', 'wheels', 1)
+    assert_equal 'Räder!', npgettext('New car', 'wheel', 'wheels', 2)
+  end
 
-    def test_pluralizes_namespaced_default_entry
-      assert_equal 'wheel',  nsgettext('Car|wheel', 'wheels', 1)
-      assert_equal 'wheels', nsgettext('Car|wheel', 'wheels', 2)
-      assert_equal 'wheel',  npgettext('Car', 'wheel', 'wheels', 1)
-      assert_equal 'wheels', npgettext('Car', 'wheel', 'wheels', 2)
-      assert_equal 'wheel', npgettext('New car', 'wheel', 'wheels', 1)
-      assert_equal 'wheels', npgettext('New car', 'wheel', 'wheels', 2)
-    end
+  def test_pluralizes_namespaced_default_entry
+    assert_equal 'wheel',  nsgettext('Car|wheel', 'wheels', 1)
+    assert_equal 'wheels', nsgettext('Car|wheel', 'wheels', 2)
+    assert_equal 'wheel',  npgettext('Car', 'wheel', 'wheels', 1)
+    assert_equal 'wheels', npgettext('Car', 'wheel', 'wheels', 2)
+    assert_equal 'wheel', npgettext('New car', 'wheel', 'wheels', 1)
+    assert_equal 'wheels', npgettext('New car', 'wheel', 'wheels', 2)
+  end
 
-    def test_pluralizes_namespaced_entry_with_alternative_syntax
-      I18n.locale = :de
-      assert_equal 'Rad',   nsgettext(['Car|wheel', 'wheels'], 1)
-      assert_equal 'Räder', nsgettext(['Car|wheel', 'wheels'], 2)
-      assert_equal 'Rad',   npgettext('Car', ['wheel', 'wheels'], 1)
-      assert_equal 'Räder', npgettext('Car', ['wheel', 'wheels'], 2)
-      assert_equal 'Rad!', npgettext('New car', ['wheel', 'wheels'], 1)
-      assert_equal 'Räder!', npgettext('New car', ['wheel', 'wheels'], 2)
-    end
+  def test_pluralizes_namespaced_entry_with_alternative_syntax
+    I18n.locale = :de
+    assert_equal 'Rad',   nsgettext(['Car|wheel', 'wheels'], 1)
+    assert_equal 'Räder', nsgettext(['Car|wheel', 'wheels'], 2)
+    assert_equal 'Rad',   npgettext('Car', ['wheel', 'wheels'], 1)
+    assert_equal 'Räder', npgettext('Car', ['wheel', 'wheels'], 2)
+    assert_equal 'Rad!', npgettext('New car', ['wheel', 'wheels'], 1)
+    assert_equal 'Räder!', npgettext('New car', ['wheel', 'wheels'], 2)
+  end
 
-    def test_ngettextpluralizes_entry_with_dots
-      I18n.locale = :de
-      assert_equal 'Auf 1 Achse.', n_("On %{count} wheel.", "On %{count} wheels.", 1)
-      assert_equal 'Auf 2 Achsen.', n_("On %{count} wheel.", "On %{count} wheels.", 2)
-    end
+  def test_ngettextpluralizes_entry_with_dots
+    I18n.locale = :de
+    assert_equal 'Auf 1 Achse.', n_("On %{count} wheel.", "On %{count} wheels.", 1)
+    assert_equal 'Auf 2 Achsen.', n_("On %{count} wheel.", "On %{count} wheels.", 2)
   end
 end

data/test/i18n/exceptions_test.rb

@@ -27,21 +27,6 @@ class I18nExceptionsTest < I18n::TestCase
     end
   end
 
-  test "MissingTranslationData html_message is a span with the titlelized last key token" do
-    exception = I18n::MissingTranslationData.new(:de, :foo, :scope => :bar)
-    assert_equal '<span class="translation_missing" title="translation missing: de.bar.foo">Foo</span>', exception.html_message
-  end
-
-  test "MissingTranslationData html_message html escapes key names" do
-    exception = I18n::MissingTranslationData.new(:de, '<script>Evil</script>', :scope => '<iframe src="example.com" />')
-    assert_equal '<span class="translation_missing" title="translation missing: de.&lt;iframe src=&quot;example.com&quot; /&gt;.&lt;script&gt;Evil&lt;/script&gt;">&lt;Script&gt;Evil&lt;/Script&gt;</span>', exception.html_message
-  end
-
-  test "ExceptionHandler returns the html_message if :rescue_format => :html was given" do
-    message = force_missing_translation_data(:rescue_format => :html)
-    assert_equal '<span class="translation_missing" title="translation missing: de.bar.foo">Foo</span>', message
-  end
-
   test "InvalidPluralizationData stores entry and count" do
     force_invalid_pluralization_data do |exception|
       assert_equal [:bar], exception.entry

data/test/i18n/interpolate_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'i18n/core_ext/string/interpolate'
 
 # thanks to Masao's String extensions, some tests taken from Masao's tests
 # http://github.com/mutoh/gettext/blob/edbbe1fa8238fa12c7f26f2418403015f0270e47/test/test_string.rb
@@ -62,6 +61,7 @@ end
 
 class I18nMissingInterpolationCustomHandlerTest < I18n::TestCase
   def setup
+    super
     @old_handler = I18n.config.missing_interpolation_argument_handler
     I18n.config.missing_interpolation_argument_handler = lambda do |key, values, string|
       "missing key is #{key}, values are #{values.inspect}, given string is '#{string}'"
@@ -70,6 +70,7 @@ class I18nMissingInterpolationCustomHandlerTest < I18n::TestCase
 
   def teardown
     I18n.config.missing_interpolation_argument_handler = @old_handler
+    super
   end
 
   test "String interpolation can use custom missing interpolation handler" do