i18n 0.3.3 → 0.3.4

data/test/{cases/backend → backend}/fast_test.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
-require File.expand_path(File.dirname(__FILE__) + '/simple_test')
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../')); $:.uniq!
+require 'test_helper'
+require 'backend/simple_test'
 
 class I18nBackendFastTest < I18nBackendSimpleTest
   class FastBackend
@@ -26,10 +26,10 @@ class I18nBackendFastSpecificTest < Test::Unit::TestCase
   end
 
   def assert_flattens(expected, nested)
-    assert_equal expected, @backend.send(:flatten_hash, nested)
+    assert_equal expected, @backend.send(:wind_keys, nested, nil, true)
   end
 
-  def test_hash_flattening_works
+  test "hash flattening works" do
     assert_flattens(
       {:a=>'a', :b=>{:c=>'c', :d=>'d', :f=>{:x=>'x'}}, :"b.f" => {:x=>"x"}, :"b.c"=>"c", :"b.f.x"=>"x", :"b.d"=>"d"},
       {:a=>'a', :b=>{:c=>'c', :d=>'d', :f=>{:x=>'x'}}}
@@ -37,13 +37,13 @@ class I18nBackendFastSpecificTest < Test::Unit::TestCase
     assert_flattens({:a=>{:b =>['a', 'b']}, :"a.b"=>['a', 'b']}, {:a=>{:b =>['a', 'b']}})
   end
 
-  def test_pluralization_logic_and_lookup_works
+  test "pluralization logic and lookup works" do
     counts_hash = {:zero => 'zero', :one => 'one', :other => 'other'}
     @backend.store_translations :en, {:a => counts_hash}
     assert_equal 'one', @backend.translate(:en, :a, :count => 1)
   end
 
-  def test_translation_subtree_retrieval
+  test "translation subtree retrieval" do
     @backend.store_translations :en, :a => {:foo => 'bar'}
     assert_equal({:foo => 'bar'}, @backend.translate(:en, :a))
   end

data/test/{cases/backend → backend}/helpers_test.rb

@@ -1,24 +1,25 @@
 # encoding: utf-8
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../')); $:.uniq!
+require 'test_helper'
 
 class I18nBackendHelpersTest < Test::Unit::TestCase
   def setup
     @backend = I18n::Backend::Simple.new
   end
   
-  def test_wind_keys
-    hash = { "a" => { "b" => { "c" => "d", "e" => "f" }, "g" => "h" }, "i" => "j"}
-    expected = { :"a.b.c" => "d", :"a.b.e" => "f", :"a.g" => "h", :"i" => "j" }
+  test "wind_keys" do
+    hash = { "a" => { "b" => { "c" => "d", "e" => "f" }, "g" => "h" }, "i.a" => "j"}
+    expected = { "a.b.c" => "d", "a.b.e" => "f", "a.g" => "h", "i.a" => "j" }
     assert_equal expected, @backend.wind_keys(hash)
   end
 
-  def test_unwind_keys
+  test "unwind_keys" do
     hash = { "a.b.c" => "d", :"a.b.e" => "f", :"a.g" => "h", "i" => "j" }
     expected = { "a" => { "b" => { "c" => "d", "e" => "f" }, "g" => "h" }, "i" => "j"}
     assert_equal expected, @backend.unwind_keys(hash)
   end
 
-  def test_deep_symbolize_keys
+  test "deep_symbolize_keys" do
     result = @backend.deep_symbolize_keys('foo' => { 'bar' => { 'baz' => 'bar' } })
     expected = {:foo => {:bar => {:baz => 'bar'}}}
     assert_equal expected, result

data/test/{cases/backend → backend}/interpolation_compiler_test.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
-
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../')); $:.uniq!
+require 'test_helper'
+require 'api'
 
 class InterpolationCompilerTest < Test::Unit::TestCase
   Compiler = I18n::Backend::InterpolationCompiler::Compiler

data/test/{cases/backend → backend}/metadata_test.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
-
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
-require 'i18n/backend/metadata'
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../')); $:.uniq!
+require 'test_helper'
 
 class I18nBackendMetadataTest < Test::Unit::TestCase
   class Backend
@@ -14,43 +13,43 @@ class I18nBackendMetadataTest < Test::Unit::TestCase
     store_translations(:en, :foo => 'Hi {{name}}')
   end
 
-  define_method "test: translation strings carry metadata" do
+  test "translation strings carry metadata" do
     translation = I18n.t(:foo)
     assert translation.respond_to?(:translation_metadata)
     assert translation.translation_metadata.is_a?(Hash)
   end
 
-  define_method "test: translate preserves metadata stored on original Strings" do
+  test "translate preserves metadata stored on original Strings" do
     store_metadata(:foo, :bar, 'bar')
     assert_equal 'bar', I18n.t(:foo).translation_metadata[:bar]
   end
 
-  define_method "test: translate preserves metadata stored on original Strings (when interpolated)" do
+  test "translate preserves metadata stored on original Strings (when interpolated)" do
     store_metadata(:foo, :bar, 'bar')
     assert_equal 'bar', I18n.t(:foo, :name => 'David').translation_metadata[:bar]
   end
 
-  define_method "test: translate adds the locale to metadata on Strings" do
+  test "translate adds the locale to metadata on Strings" do
     assert_equal :en, I18n.t(:foo, :locale => :en).translation_metadata[:locale]
   end
 
-  define_method "test: translate adds the key to metadata on Strings" do
+  test "translate adds the key to metadata on Strings" do
     assert_equal :foo, I18n.t(:foo).translation_metadata[:key]
   end
 
-  define_method "test: translate adds the default to metadata on Strings" do
+  test "translate adds the default to metadata on Strings" do
     assert_equal 'bar', I18n.t(:foo, :default => 'bar', :name => '').translation_metadata[:default]
   end
 
-  define_method "test: translation adds the interpolation values to metadata on Strings" do
+  test "translation adds the interpolation values to metadata on Strings" do
     assert_equal({:name => 'David'}, I18n.t(:foo, :name => 'David').translation_metadata[:values])
   end
 
-  define_method "test: interpolation adds the original string to metadata on Strings" do
+  test "interpolation adds the original string to metadata on Strings" do
     assert_equal('Hi {{name}}', I18n.t(:foo, :name => 'David').translation_metadata[:original])
   end
 
-  define_method "test: pluralizatoin adds the count to metadata on Strings" do
+  test "pluralizatoin adds the count to metadata on Strings" do
     assert_equal(1, I18n.t(:missing, :count => 1, :default => { :one => 'foo' }).translation_metadata[:count])
   end
   

data/test/{cases/backend → backend}/pluralization_test.rb

@@ -1,43 +1,47 @@
 # encoding: utf-8
-
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
-require 'i18n/backend/pluralization'
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../')); $:.uniq!
+require 'test_helper'
 
 class I18nBackendPluralizationTest < Test::Unit::TestCase
   class Backend
     include I18n::Backend::Base
     include I18n::Backend::Pluralization
+    include I18n::Backend::Fallbacks
   end
 
   def setup
     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(:foo, :i18n => { :plural => { :rule => @rule } })
+    store_translations(:xx, :i18n => { :plural => { :rule => @rule } })
     @entry = { :zero => 'zero', :one => 'one', :few => 'few', :many => 'many', :other => 'other' }
   end
 
-  define_method "test: pluralization picks a pluralizer from :'i18n.pluralize'" do
-    assert_equal @rule, I18n.backend.send(:pluralizer, :foo)
+  test "pluralization picks a pluralizer from :'i18n.pluralize'" do
+    assert_equal @rule, I18n.backend.send(:pluralizer, :xx)
   end
 
-  define_method "test: pluralization picks :one for 1" do
-    assert_equal 'one', I18n.t(:count => 1, :default => @entry, :locale => :foo)
+  test "pluralization picks :one for 1" do
+    assert_equal 'one', I18n.t(:count => 1, :default => @entry, :locale => :xx)
   end
 
-  define_method "test: pluralization picks :few for 2" do
-    assert_equal 'few', I18n.t(:count => 2, :default => @entry, :locale => :foo)
+  test "pluralization picks :few for 2" do
+    assert_equal 'few', I18n.t(:count => 2, :default => @entry, :locale => :xx)
   end
 
-  define_method "test: pluralization picks :many for 11" do
-    assert_equal 'many', I18n.t(:count => 11, :default => @entry, :locale => :foo)
+  test "pluralization picks :many for 11" do
+    assert_equal 'many', I18n.t(:count => 11, :default => @entry, :locale => :xx)
   end
 
-  define_method "test: pluralization picks zero for 0 if the key is contained in the data" do
-    assert_equal 'zero', I18n.t(:count => 0, :default => @entry, :locale => :foo)
+  test "pluralization picks zero for 0 if the key is contained in the data" do
+    assert_equal 'zero', I18n.t(:count => 0, :default => @entry, :locale => :xx)
   end
 
-  define_method "test: pluralization picks few for 0 if the key is not contained in the data" do
+  test "pluralization picks few for 0 if the key is not contained in the data" do
     @entry.delete(:zero)
-    assert_equal 'few', I18n.t(:count => 0, :default => @entry, :locale => :foo)
+    assert_equal 'few', I18n.t(:count => 0, :default => @entry, :locale => :xx)
+  end
+
+  test "Fallbacks can pick up rules from fallback locales, too" do
+    assert_equal @rule, I18n.backend.send(:pluralizer, :'xx-XX')
   end
 end

data/test/{cases/backend → backend}/simple_test.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../')); $:.uniq!
+require 'test_helper'
 
 class I18nBackendSimpleTest < Test::Unit::TestCase
   def setup
@@ -9,31 +9,31 @@ class I18nBackendSimpleTest < Test::Unit::TestCase
   end
 
   # useful because this way we can use the backend with no key for interpolation/pluralization
-  define_method "test simple backend lookup: given nil as a key it returns nil" do
+  test "simple backend lookup: given nil as a key it returns nil" do
     assert_nil I18n.backend.send(:lookup, :en, nil)
   end
   
   # loading translations
       
-  define_method "test simple load_translations: given an unknown file type it raises I18n::UnknownFileType" do
-    assert_raises(I18n::UnknownFileType) { I18n.backend.load_translations("#{locales_dir}/en.xml") }
+  test "simple load_translations: given an unknown file type it raises I18n::UnknownFileType" do
+    assert_raise(I18n::UnknownFileType) { I18n.backend.load_translations("#{locales_dir}/en.xml") }
   end
   
-  define_method "test simple load_translations: given a Ruby file name it does not raise anything" do
+  test "simple load_translations: given a Ruby file name it does not raise anything" do
     assert_nothing_raised { I18n.backend.load_translations("#{locales_dir}/en.rb") }
   end
   
-  define_method "test simple load_rb: loads data from a Ruby file" do
+  test "simple load_rb: loads data from a Ruby file" do
     data = I18n.backend.send(:load_rb, "#{locales_dir}/en.rb")
     assert_equal({ :en => { :fuh => { :bah => 'bas' } } }, data)
   end
 
-  define_method "test simple load_yml: loads data from a YAML file" do
+  test "simple load_yml: loads data from a YAML file" do
     data = I18n.backend.send(:load_yml, "#{locales_dir}/en.yml")
     assert_equal({ 'en' => { 'foo' => { 'bar' => 'baz' } } }, data)
   end
 
-  define_method "test simple load_translations: loads data from known file formats" do
+  test "simple load_translations: loads data from known file formats" do
     I18n.backend = I18n::Backend::Simple.new
     I18n.backend.load_translations("#{locales_dir}/en.rb", "#{locales_dir}/en.yml")
     expected = { :en => { :fuh => { :bah => "bas" }, :foo => { :bar => "baz" } } }
@@ -42,35 +42,35 @@ class I18nBackendSimpleTest < Test::Unit::TestCase
   
   # storing translations
 
-  define_method "test simple store_translations: stores translations, ... no, really :-)" do
+  test "simple store_translations: stores translations, ... no, really :-)" do
     I18n.backend.store_translations :'en', :foo => 'bar'
     assert_equal Hash[:'en', {:foo => 'bar'}], translations
   end
 
-  define_method "test simple store_translations: deep_merges with existing translations" do
+  test "simple store_translations: deep_merges with existing translations" do
     I18n.backend.store_translations :'en', :foo => {:bar => 'bar'}
     I18n.backend.store_translations :'en', :foo => {:baz => 'baz'}
     assert_equal Hash[:'en', {:foo => {:bar => 'bar', :baz => 'baz'}}], translations
   end
 
-  define_method "test simple store_translations: converts the given locale to a Symbol" do
+  test "simple store_translations: converts the given locale to a Symbol" do
     I18n.backend.store_translations 'en', :foo => 'bar'
     assert_equal Hash[:'en', {:foo => 'bar'}], translations
   end
 
-  define_method "test simple store_translations: converts keys to Symbols" do
+  test "simple store_translations: converts keys to Symbols" do
     I18n.backend.store_translations 'en', 'foo' => {'bar' => 'bar', 'baz' => 'baz'}
     assert_equal Hash[:'en', {:foo => {:bar => 'bar', :baz => 'baz'}}], translations
   end
   
   # reloading translations
 
-  define_method "test simple reload_translations: unloads translations" do
+  test "simple reload_translations: unloads translations" do
     I18n.backend.reload!
     assert_nil translations
   end
 
-  define_method "test simple reload_translations: uninitializes the backend" do
+  test "simple reload_translations: uninitializes the backend" do
     I18n.backend.reload!
     assert_equal I18n.backend.initialized?, false
   end

data/test/{cases/core_ext → core_ext}/string/interpolate_test.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../')); $:.uniq!
+require 'test_helper'
 
 # thanks to Masao's String extensions these should work the same in
 # Ruby 1.8 (patched) and Ruby 1.9 (native)
@@ -8,36 +8,36 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
 # http://github.com/mutoh/gettext/blob/edbbe1fa8238fa12c7f26f2418403015f0270e47/test/test_string.rb
 
 class I18nCoreExtStringInterpolationTest < Test::Unit::TestCase
-  define_method "test: String interpolates a single argument" do
+  test "String interpolates a single argument" do
     assert_equal "Masao", "%s" % "Masao"
   end
 
-  define_method "test: String interpolates an array argument" do
+  test "String interpolates an array argument" do
     assert_equal "1 message", "%d %s" % [1, 'message']
   end
 
-  define_method "test: String interpolates a hash argument w/ named placeholders" do
+  test "String interpolates a hash argument w/ named placeholders" do
     assert_equal "Masao Mutoh", "%{first} %{last}" % { :first => 'Masao', :last => 'Mutoh' }
   end
 
-  define_method "test: String interpolates a hash argument w/ named placeholders (reverse order)" do
+  test "String interpolates a hash argument w/ named placeholders (reverse order)" do
     assert_equal "Mutoh, Masao", "%{last}, %{first}" % { :first => 'Masao', :last => 'Mutoh' }
   end
 
-  define_method "test: String interpolates named placeholders with sprintf syntax" do
+  test "String interpolates named placeholders with sprintf syntax" do
     assert_equal "10, 43.4", "%<integer>d, %<float>.1f" % {:integer => 10, :float => 43.4}
   end
 
-  define_method "test: String interpolates named placeholders with sprintf syntax, does not recurse" do
+  test "String interpolates named placeholders with sprintf syntax, does not recurse" do
     assert_equal "%<not_translated>s", "%{msg}" % { :msg => '%<not_translated>s', :not_translated => 'should not happen' }
   end
 
-  define_method "test: String interpolation does not replace anything when no placeholders are given" do
+  test "String interpolation does not replace anything when no placeholders are given" do
     assert_equal("aaa", "aaa" % {:num => 1})
     assert_equal("bbb", "bbb" % [1])
   end
 
-  define_method "test: String interpolation sprintf behaviour equals Ruby 1.9 behaviour" do
+  test "String interpolation sprintf behaviour equals Ruby 1.9 behaviour" do
     assert_equal("1", "%<num>d" % {:num => 1})
     assert_equal("0b1", "%<num>#b" % {:num => 1})
     assert_equal("foo", "%<msg>s" % {:msg => "foo"})
@@ -49,46 +49,51 @@ class I18nCoreExtStringInterpolationTest < Test::Unit::TestCase
     assert_raise(ArgumentError) { "%<num>/d" % {:num => 100} }
   end
 
-  define_method "test: String interpolation old-style sprintf still works" do
+  test "String interpolation old-style sprintf still works" do
     assert_equal("foo 1.000000", "%s %f" % ["foo", 1.0])
   end
 
-  define_method "test: String interpolation raises an ArgumentError when the string has extra placeholders (Array)" do
-    assert_raises(ArgumentError) do # Ruby 1.9 msg: "too few arguments"
+  test "String interpolation raises an ArgumentError when the string has extra placeholders (Array)" do
+    assert_raise(ArgumentError) do # Ruby 1.9 msg: "too few arguments"
       "%s %s" % %w(Masao)
     end
   end
 
-  define_method "test: String interpolation raises a KeyError when the string has extra placeholders (Hash)" do
-    assert_raises(KeyError) do # Ruby 1.9 msg: "key not found"
+  test "String interpolation raises a KeyError when the string has extra placeholders (Hash)" do
+    assert_raise(KeyError) do # Ruby 1.9 msg: "key not found"
       "%{first} %{last}" % { :first => 'Masao' }
     end
   end
 
-  define_method "test: String interpolation does not raise when passed extra values (Array)" do
+  test "String interpolation does not raise when passed extra values (Array)" do
     assert_nothing_raised do
       assert_equal "Masao", "%s" % %w(Masao Mutoh)
     end
   end
 
-  define_method "test: String interpolation does not raise when passed extra values (Hash)" do
+  test "String interpolation does not raise when passed extra values (Hash)" do
     assert_nothing_raised do
       assert_equal "Masao Mutoh", "%{first} %{last}" % { :first => 'Masao', :last => 'Mutoh', :salutation => 'Mr.' }
     end
   end
 
-  define_method "test: % acts as escape character in String interpolation" do
+  test "% acts as escape character in String interpolation" do
     assert_equal "%{first}", "%%{first}" % { :first => 'Masao' }
     assert_equal("% 1", "%% %<num>d" % {:num => 1.0})
     assert_equal("%{num} %<num>d", "%%{num} %%<num>d" % {:num => 1})
   end
 
+  test "% can be used in Ruby's own sprintf behavior" do
+    assert_equal "70%", "%d%%" % 70
+    assert_equal "70-100%", "%d-%d%%" % [70, 100]
+  end
+
   def test_sprintf_mix_unformatted_and_formatted_named_placeholders
     assert_equal("foo 1.000000", "%{name} %<num>f" % {:name => "foo", :num => 1.0})
   end
-  
+
   def test_string_interpolation_raises_an_argument_error_when_mixing_named_and_unnamed_placeholders
-    assert_raises(ArgumentError) { "%{name} %f" % [1.0] }
-    assert_raises(ArgumentError) { "%{name} %f" % [1.0, 2.0] }
+    assert_raise(ArgumentError) { "%{name} %f" % [1.0] }
+    assert_raise(ArgumentError) { "%{name} %f" % [1.0, 2.0] }
   end
 end

data/test/{cases/gettext → gettext}/api_test.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
-
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
-require 'i18n/backend/gettext'
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../')); $:.uniq!
+require 'test_helper'
 require 'i18n/helpers/gettext'
 
 include I18n::Helpers::Gettext
@@ -14,8 +13,9 @@ class I18nGettextApiTest < Test::Unit::TestCase
       'Sentence 1. Sentence 2.' => 'Satz 1. Satz 2.',
       "An apple" => { :one => 'Ein Apfel', :other => '{{count}} Äpfel' },
       :special => { "A special apple" => { :one => 'Ein spezieller Apfel', :other => '{{count}} spezielle Äpfel' } },
-      :foo => { :bar => 'bar-de' }
-    }
+      :foo => { :bar => 'bar-de' },
+      'foo.bar' => 'Foo Bar'
+    }, :separator => '|'
   end
 
   # gettext
@@ -52,6 +52,12 @@ class I18nGettextApiTest < Test::Unit::TestCase
     assert_equal 'bar-de', s_('foo|bar')
   end
 
+  def test_sgettext_ignores_dots
+    I18n.locale = :de
+    assert_equal 'Foo Bar', sgettext('foo.bar')
+    assert_equal 'Foo Bar', s_('foo.bar')
+  end
+
   # pgettext
   def test_pgettext_defaults_to_msgid
     assert_equal 'bar', pgettext('foo', 'bar')