i18n 0.3.0 → 0.3.1

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 
-class I18nBackendHelpersHashWindKeysTest < Test::Unit::TestCase
+class I18nBackendHelpersTest < Test::Unit::TestCase
   def setup
     @backend = I18n::Backend::Simple.new
   end

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

@@ -3,7 +3,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 require 'i18n/backend/metadata'
 
-class I18nTranslationMetadataTest < Test::Unit::TestCase
+class I18nBackendMetadataTest < Test::Unit::TestCase
   class Backend
     include I18n::Backend::Base
     include I18n::Backend::Metadata
@@ -11,15 +11,7 @@ class I18nTranslationMetadataTest < Test::Unit::TestCase
 
   def setup
     I18n.backend = Backend.new
-    backend_store_translations(:en, :foo => 'Hi {{name}}')
-  end
-
-  def translations
-    I18n.backend.instance_variable_get(:@translations)
-  end
-
-  def store_metadata(key, name, value)
-    translations[:en][key].translation_metadata[name] = value
+    store_translations(:en, :foo => 'Hi {{name}}')
   end
 
   define_method "test: translation strings carry metadata" do
@@ -61,5 +53,15 @@ class I18nTranslationMetadataTest < Test::Unit::TestCase
   define_method "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
+  
+  protected
+  
+    def translations
+      I18n.backend.instance_variable_get(:@translations)
+    end
+
+    def store_metadata(key, name, value)
+      translations[:en][key].translation_metadata[name] = value
+    end
 end
 

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

@@ -3,7 +3,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 require 'i18n/backend/pluralization'
 
-class I18nPluralizationBackendTest < Test::Unit::TestCase
+class I18nBackendPluralizationTest < Test::Unit::TestCase
   class Backend
     include I18n::Backend::Base
     include I18n::Backend::Pluralization
@@ -11,32 +11,32 @@ class I18nPluralizationBackendTest < Test::Unit::TestCase
 
   def setup
     I18n.backend = Backend.new
-    @pluralizer = lambda { |n| n == 1 ? :one : n == 0 || (2..10).include?(n % 100) ? :few : (11..19).include?(n % 100) ? :many : :other }
-    backend_store_translations(:foo, :i18n => { :plural => { :rule => @pluralizer } })
+    @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 } })
     @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 @pluralizer, I18n.backend.send(:pluralizer, :foo)
+  define_method "test: pluralization picks a pluralizer from :'i18n.pluralize'" do
+    assert_equal @rule, I18n.backend.send(:pluralizer, :foo)
   end
 
-  define_method :"test: pluralization picks :one for 1" do
+  define_method "test: pluralization picks :one for 1" do
     assert_equal 'one', I18n.t(:count => 1, :default => @entry, :locale => :foo)
   end
 
-  define_method :"test: pluralization picks :few for 2" do
+  define_method "test: pluralization picks :few for 2" do
     assert_equal 'few', I18n.t(:count => 2, :default => @entry, :locale => :foo)
   end
 
-  define_method :"test: pluralization picks :many for 11" do
+  define_method "test: pluralization picks :many for 11" do
     assert_equal 'many', I18n.t(:count => 11, :default => @entry, :locale => :foo)
   end
 
-  define_method :"test: pluralization picks zero for 0 if the key is contained in the data" do
+  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)
   end
 
-  define_method :"test: pluralization picks few for 0 if the key is not contained in the data" do
+  define_method "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)
   end

data/test/cases/backend/simple_test.rb

@@ -0,0 +1,77 @@
+# encoding: utf-8
+
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+
+class I18nBackendSimpleTest < Test::Unit::TestCase
+  def setup
+    I18n.backend = I18n::Backend::Simple.new
+    I18n.load_path = [locales_dir + '/en.yml']
+  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
+    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") }
+  end
+  
+  define_method "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
+    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
+    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
+    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" } } }
+    assert_equal expected, translations
+  end
+  
+  # storing translations
+
+  define_method "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
+    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
+    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
+    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
+    I18n.backend.reload!
+    assert_nil translations
+  end
+
+  define_method "test simple reload_translations: uninitializes the backend" do
+    I18n.backend.reload!
+    assert_equal I18n.backend.initialized?, false
+  end
+end

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../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
+  define_method "test: String interpolates a single argument" do
     assert_equal "Masao", "%s" % "Masao"
   end
 
-  define_method :"test: String interpolates an array argument" do
+  define_method "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
+  define_method "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
+  define_method "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
+  define_method "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
+  define_method "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
+  define_method "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
+  define_method "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,35 +49,35 @@ class I18nCoreExtStringInterpolationTest < Test::Unit::TestCase
     assert_raise(ArgumentError) { "%<num>/d" % {:num => 100} }
   end
 
-  define_method :"test: String interpolation old-style sprintf still works" do
+  define_method "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
+  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"
       "%s %s" % %w(Masao)
     end
   end
 
-  define_method :"test: String interpolation raises a KeyError when the string has extra placeholders (Hash)" do
+  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"
       "%{first} %{last}" % { :first => 'Masao' }
     end
   end
 
-  define_method :"test: String interpolation does not raise when passed extra values (Array)" do
+  define_method "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
+  define_method "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
+  define_method "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})

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 require 'i18n/backend/gettext'
 require 'i18n/helpers/gettext'
 
@@ -12,9 +12,6 @@ class I18nGettextApiTest < Test::Unit::TestCase
     I18n.backend.store_translations :de, {
       'Hi Gettext!' => 'Hallo Gettext!',
       'Sentence 1. Sentence 2.' => 'Satz 1. Satz 2.',
-      # "An apple#{I18n::Gettext::PLURAL_SEPARATOR}{{count}} apples" => { :one => 'Ein Apfel', :other => '{{count}} Äpfel' },
-      # :special => { "A special apple#{I18n::Gettext::PLURAL_SEPARATOR}{{count}} special apples" => { :one => 'Ein spezieller Apfel', :other => '{{count}} spezielle Äpfel' } },
-      # alternative implementation
       "An apple" => { :one => 'Ein Apfel', :other => '{{count}} Äpfel' },
       :special => { "A special apple" => { :one => 'Ein spezieller Apfel', :other => '{{count}} spezielle Äpfel' } },
       :foo => { :bar => 'bar-de' }

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 require 'i18n/backend/gettext'
 require 'i18n/helpers/gettext'
 
@@ -15,7 +15,7 @@ class I18nGettextBackendTest < Test::Unit::TestCase
   def setup
     I18n.backend = Backend.new
     I18n.locale = :en
-    I18n.load_path = [locales_dir + '/de.po']
+    I18n.load_path = ["#{locales_dir}/de.po"]
   end
 
   def teardown
@@ -81,4 +81,11 @@ class I18nGettextBackendTest < Test::Unit::TestCase
     assert_equal 'Rad',   npgettext('Car', ['wheel', 'wheels'], 1)
     assert_equal 'Räder', npgettext('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
+  
 end

data/test/{i18n_exceptions_test.rb → cases/i18n_exceptions_test.rb}

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 class I18nExceptionsTest < Test::Unit::TestCase
   def test_invalid_locale_stores_locale

data/test/{i18n_load_path_test.rb → cases/i18n_load_path_test.rb}

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 class I18nLoadPathTest < Test::Unit::TestCase
   # include Tests::Backend::Simple::Setup::Base
@@ -8,7 +8,7 @@ class I18nLoadPathTest < Test::Unit::TestCase
   def setup
     I18n.locale = :en
     I18n.backend = I18n::Backend::Simple.new
-    backend_store_translations(:en, :foo => {:bar => 'bar', :baz => 'baz'})
+    store_translations(:en, :foo => {:bar => 'bar', :baz => 'baz'})
   end
 
   def test_nested_load_paths_do_not_break_locale_loading

data/test/{i18n_test.rb → cases/i18n_test.rb}

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 class I18nTest < Test::Unit::TestCase
   def setup

data/test/{locale → cases/locale}/fallbacks_test.rb

@@ -1,8 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../test_helper.rb'
-require 'i18n/locale/fallbacks'
-require 'i18n/locale/tag'
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 
 include I18n::Locale
 

data/test/{locale → cases/locale}/tag/rfc4646_test.rb

@@ -1,8 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
-
-# Rfc4646::Parser
+require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
 
 class I18nLocaleTagRfc4646ParserTest < Test::Unit::TestCase
   include I18n::Locale

data/test/{locale → cases/locale}/tag/simple_test.rb

@@ -1,8 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
-require 'i18n/locale/tag'
-require 'i18n/locale/tag/simple'
+require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
 
 class I18nLocaleTagSimpleTest < Test::Unit::TestCase
   include I18n::Locale

data/test/fixtures/locales/de.po

@@ -65,3 +65,8 @@ msgid "Car|wheel"
 msgid_plural "Car|wheels"
 msgstr[0] "Rad"
 msgstr[1] "Räder"
+
+msgid "On %{count} wheel."
+msgid_plural "On %{count} wheels."
+msgstr[0] "Auf %{count} Achse."
+msgstr[1] "Auf %{count} Achsen."

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
-$:.unshift "lib"
+$: << "lib"
+$: << File.expand_path(File.dirname(__FILE__))
 
 require 'rubygems'
 require 'test/unit'
@@ -10,56 +11,70 @@ require 'i18n/core_ext/object/meta_class'
 require 'time'
 require 'yaml'
 
-require File.dirname(__FILE__) + '/with_options'
-require File.dirname(__FILE__) + '/backend/simple/setup'
-require File.dirname(__FILE__) + '/backend/active_record/setup'
-
 Dir[File.dirname(__FILE__) + '/api/**/*.rb'].each do |filename|
   require filename
 end
 
 $KCODE = 'u' unless RUBY_VERSION >= '1.9'
 
-class Test::Unit::TestCase
+# wtf is wrong with this, why's there Kernel#test?
+# class Module
+#   def self.test(name, &block)
+#     define_method("test: " + name, &block)
+#   end
+# end
+
+class Test::Unit::TestCase  
   def self.test(name, &block)
     define_method("test: " + name, &block)
   end
 
-  def euc_jp(string)
-    string.encode!(Encoding::EUC_JP)
+  def teardown
+    I18n.locale = nil
+    I18n.default_locale = :en
+    I18n.load_path = []
+    I18n.available_locales = nil
+    I18n.backend = nil
   end
 
-  def locales_dir
-    File.dirname(__FILE__) + '/fixtures/locales'
+  def translations
+    I18n.backend.instance_variable_get(:@translations)
   end
-
-  def backend_store_translations(*args)
-    I18n.backend.store_translations(*args)
+  
+  def store_translations(*args)
+    data   = args.pop
+    locale = args.pop || :en
+    I18n.backend.store_translations(locale, data)
   end
-
-  def backend_get_translations
-    I18n.backend.instance_variable_get :@translations
+  
+  def locales_dir
+    File.dirname(__FILE__) + '/fixtures/locales'
   end
 
-  def date
-    Date.new(2008, 3, 1)
+  def euc_jp(string)
+    string.encode!(Encoding::EUC_JP)
   end
+end
 
-  def morning_datetime
-    DateTime.new(2008, 3, 1, 6)
-  end
-  alias :datetime :morning_datetime
+def setup_active_record
+  require 'active_record'
+  require 'i18n/backend/active_record/store_procs'
 
-  def evening_datetime
-    DateTime.new(2008, 3, 1, 18)
+  if I18n::Backend::Simple.method_defined?(:interpolate_with_deprecated_syntax)
+    I18n::Backend::Simple.send(:remove_method, :interpolate) rescue NameError
   end
 
-  def morning_time
-    Time.parse('2008-03-01 6:00 UTC')
+  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+  ActiveRecord::Migration.verbose = false
+  ActiveRecord::Schema.define(:version => 1) do
+    create_table :translations do |t|
+      t.string :locale
+      t.string :key
+      t.string :value
+      t.string :interpolations
+      t.boolean :is_proc, :default => false
+    end
   end
-  alias :time :morning_time
 
-  def evening_time
-    Time.parse('2008-03-01 18:00 UTC')
-  end
+  I18n::Backend::ActiveRecord::Translation.send(:include, I18n::Backend::ActiveRecord::StoreProcs)
 end