i18n 0.3.0 → 0.3.1

data/test/api/lookup.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+
+module Tests
+  module Api
+    module Lookup
+      def setup
+        super
+        store_translations(:foo => { :bar => 'bar', :baz => 'baz' })
+      end
+      
+      define_method "test lookup: given a nested key it looks up the nested hash value" do
+        assert_equal 'bar', I18n.t(:'foo.bar')
+      end
+
+      define_method "test lookup: given a missing key, no default and no raise option it returns an error message" do
+        assert_equal "translation missing: en, missing", I18n.t(:missing)
+      end
+      
+      define_method "test lookup: given a missing key, no default and the raise option it raises MissingTranslationData" do
+        assert_raises(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
+      end
+
+      define_method "test lookup: given an array of keys it translates all of them" do
+        assert_equal %w(bar baz), I18n.t([:bar, :baz], :scope => [:foo])
+      end
+
+      define_method "test lookup: using a custom scope separator" do
+        # data must have been stored using the custom separator when using the ActiveRecord backend
+        I18n.backend.store_translations(:en, { :foo => { :bar => 'bar' } }, { :separator => '|' })
+        assert_equal 'bar', I18n.t('foo|bar', :separator => '|')
+      end
+
+      define_method "test lookup: given nil as a locale it raises InvalidLocale" do
+        assert_raises(I18n::InvalidLocale) { I18n.t(:bar, :locale => nil) }
+      end
+    end
+  end
+end

data/test/api/pluralization.rb

@@ -1,36 +1,34 @@
 # encoding: utf-8
 
 module Tests
-  module Backend
-    module Api
-      module Pluralization
-        def test_pluralize_given_0_returns_zero_string_if_zero_key_given
-          assert_equal 'zero', I18n.t(:default => { :zero => 'zero' }, :count => 0)
-        end
+  module Api
+    module Pluralization
+      define_method "test pluralization: given 0 it returns the :zero translation if it is defined" do
+        assert_equal 'zero', I18n.t(:default => { :zero => 'zero' }, :count => 0)
+      end
 
-        def test_pluralize_given_0_returns_plural_string_if_no_zero_key_given
-          assert_equal 'bars', I18n.t(:default => { :other => 'bars' }, :count => 0)
-        end
+      define_method "test pluralization: given 0 it returns the :other translation if :zero is not defined" do
+        assert_equal 'bars', I18n.t(:default => { :other => 'bars' }, :count => 0)
+      end
 
-        def test_pluralize_given_1_returns_singular_string
-          assert_equal 'bar', I18n.t(:default => { :one => 'bar' }, :count => 1)
-        end
+      define_method "test pluralization: given 1 it returns the singular translation" do
+        assert_equal 'bar', I18n.t(:default => { :one => 'bar' }, :count => 1)
+      end
 
-        def test_pluralize_given_2_returns_plural_string
-          assert_equal 'bars', I18n.t(:default => { :other => 'bars' }, :count => 2)
-        end
+      define_method "test pluralization: given 2 it returns the :other translation" do
+        assert_equal 'bars', I18n.t(:default => { :other => 'bars' }, :count => 2)
+      end
 
-        def test_pluralize_given_3_returns_plural_string
-          assert_equal 'bars', I18n.t(:default => { :other => 'bars' }, :count => 3)
-        end
+      define_method "test pluralization: given 3 it returns the :other translation" do
+        assert_equal 'bars', I18n.t(:default => { :other => 'bars' }, :count => 3)
+      end
 
-        def test_pluralize_given_nil_returns_the_given_entry
-          assert_equal({ :zero => 'zero' }, I18n.t(:default => { :zero => 'zero' }, :count => nil))
-        end
+      define_method "test pluralization: given nil it returns the whole entry" do
+        assert_equal({ :one => 'bar' }, I18n.t(:default => { :one => 'bar' }, :count => nil))
+      end
 
-        def test_interpolate_given_incomplete_pluralization_data_raises_invalid_pluralization_data
-          assert_raises(I18n::InvalidPluralizationData){ I18n.t(:default => { :one => 'bar' }, :count => 2) }
-        end
+      define_method "test pluralization: given incomplete pluralization data it raises I18n::InvalidPluralizationData" do
+        assert_raises(I18n::InvalidPluralizationData) { I18n.t(:default => { :one => 'bar' }, :count => 2) }
       end
     end
   end

data/test/api/procs.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+module Tests
+  module Api
+    module Procs
+      define_method "test lookup: given a translation is a proc it calls the proc with the key and interpolation values" do
+        store_translations(:a_lambda => lambda { |*args| args.inspect })
+        assert_equal '[:a_lambda, {:foo=>"foo"}]', I18n.t(:a_lambda, :foo => 'foo')
+      end
+
+      define_method "test defaults: given a default is a Proc it calls it with the key and interpolation values" do
+        proc = lambda { |*args| args.inspect }
+        assert_equal '[nil, {:foo=>"foo"}]', I18n.t(nil, :default => proc, :foo => 'foo')
+      end
+
+      define_method "test defaults: given a default is a key that resolves to a Proc it calls it with the key and interpolation values" do
+        store_translations(:a_lambda => lambda { |*args| args.inspect })
+        assert_equal '[:a_lambda, {:foo=>"foo"}]', I18n.t(nil, :default => :a_lambda, :foo => 'foo')
+        assert_equal '[:a_lambda, {:foo=>"foo"}]', I18n.t(nil, :default => [nil, :a_lambda], :foo => 'foo')
+      end
+
+      define_method "test interpolation: given an interpolation value is a lambda it calls it with key and values before interpolating it" do
+        proc = lambda { |*args| args.inspect }
+        assert_match %r(\[\{:foo=>#<Proc.*>\}\]), I18n.t(nil, :default => '{{foo}}', :foo => proc)
+      end
+      
+      define_method "test interpolation: given a key resolves to a Proc that returns a string then interpolation still works" do
+        proc = lambda { |*args| "{{foo}}: " + args.inspect }
+        assert_equal 'foo: [nil, {:foo=>"foo"}]', I18n.t(nil, :default => proc, :foo => 'foo')
+      end
+
+      define_method "test pluralization: given a key resolves to a Proc that returns valid data then pluralization still works" do
+        proc = lambda { |*args| { :zero => 'zero', :one => 'one', :other => 'other' } }
+        assert_equal 'zero',  I18n.t(:default => proc, :count => 0)
+        assert_equal 'one',   I18n.t(:default => proc, :count => 1)
+        assert_equal 'other', I18n.t(:default => proc, :count => 2)
+      end
+    end
+  end
+end

data/test/cases/api/active_record_test.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+
+setup_active_record
+
+class I18nActiveRecordApiTest < Test::Unit::TestCase
+  def setup
+    I18n.backend = I18n::Backend::ActiveRecord.new
+    super
+  end
+
+  include Tests::Api::Basics
+  include Tests::Api::Defaults
+  include Tests::Api::Interpolation
+  include Tests::Api::Link
+  include Tests::Api::Lookup
+  include Tests::Api::Pluralization
+  include Tests::Api::Procs
+  include Tests::Api::Localization::Date
+  include Tests::Api::Localization::DateTime
+  include Tests::Api::Localization::Time
+  include Tests::Api::Localization::Procs
+
+  define_method "test: make sure we use an ActiveRecord backend" do
+    assert_equal I18n::Backend::ActiveRecord, I18n.backend.class
+  end
+end
+

data/test/cases/api/all_features_test.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+
+class I18nAllFeaturesApiTest < Test::Unit::TestCase
+  class Backend
+    include I18n::Backend::Base
+    include I18n::Backend::Cache
+    include I18n::Backend::Metadata
+    include I18n::Backend::Fallbacks
+    include I18n::Backend::Pluralization
+  end
+
+  def setup
+    I18n.backend = I18n::Backend::Chain.new(Backend.new, I18n::Backend::Simple.new)
+    super
+  end
+
+  include Tests::Api::Basics
+  include Tests::Api::Defaults
+  include Tests::Api::Interpolation
+  include Tests::Api::Link
+  include Tests::Api::Lookup
+  include Tests::Api::Pluralization
+  include Tests::Api::Procs
+  include Tests::Api::Localization::Date
+  include Tests::Api::Localization::DateTime
+  include Tests::Api::Localization::Time
+  include Tests::Api::Localization::Procs
+
+  define_method "test: make sure we use a Chain backend with an all features backend" do
+    assert_equal I18n::Backend::Chain, I18n.backend.class
+    assert_equal Backend, I18n.backend.backends.first.class
+  end
+  
+  # links: test that keys stored on one backend can link to keys stored on another backend
+end

data/test/cases/api/chain_test.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+
+class I18nApiChainTest < Test::Unit::TestCase
+  def setup
+    super
+    I18n.backend = I18n::Backend::Chain.new(I18n::Backend::Simple.new, I18n.backend)
+  end
+
+  include Tests::Api::Basics
+  include Tests::Api::Defaults
+  include Tests::Api::Interpolation
+  include Tests::Api::Link
+  include Tests::Api::Lookup
+  include Tests::Api::Pluralization
+  include Tests::Api::Procs
+  include Tests::Api::Localization::Date
+  include Tests::Api::Localization::DateTime
+  include Tests::Api::Localization::Time
+  include Tests::Api::Localization::Procs
+
+  define_method "test: make sure we use the Chain backend" do
+    assert_equal I18n::Backend::Chain, I18n.backend.class
+  end
+end

data/test/cases/api/fallbacks_test.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+
+class I18nFallbacksApiTest < Test::Unit::TestCase
+  class Backend
+    include I18n::Backend::Base
+    include I18n::Backend::Fallbacks
+  end
+
+  def setup
+    I18n.backend = Backend.new
+    super
+  end
+
+  include Tests::Api::Basics
+  include Tests::Api::Defaults
+  include Tests::Api::Interpolation
+  include Tests::Api::Link
+  include Tests::Api::Lookup
+  include Tests::Api::Pluralization
+  include Tests::Api::Procs
+  include Tests::Api::Localization::Date
+  include Tests::Api::Localization::DateTime
+  include Tests::Api::Localization::Time
+  include Tests::Api::Localization::Procs
+
+  define_method "test: make sure we use a backend with Fallbacks included" do
+    assert_equal Backend, I18n.backend.class
+  end
+  
+  # links: test that keys stored on one backend can link to keys stored on another backend
+end

data/test/cases/api/pluralization_test.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+
+class I18nPluralizationApiTest < Test::Unit::TestCase
+  class Backend
+    include I18n::Backend::Base
+    include I18n::Backend::Pluralization
+  end
+
+  def setup
+    I18n.backend = Backend.new
+    super
+  end
+
+  include Tests::Api::Basics
+  include Tests::Api::Defaults
+  include Tests::Api::Interpolation
+  include Tests::Api::Link
+  include Tests::Api::Lookup
+  include Tests::Api::Pluralization
+  include Tests::Api::Procs
+  include Tests::Api::Localization::Date
+  include Tests::Api::Localization::DateTime
+  include Tests::Api::Localization::Time
+  include Tests::Api::Localization::Procs
+
+  define_method "test: make sure we use a backend with Pluralization included" do
+    assert_equal Backend, I18n.backend.class
+  end
+  
+  # links: test that keys stored on one backend can link to keys stored on another backend
+end

data/test/cases/api/simple_test.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+
+class I18nSimpleBackendApiTest < Test::Unit::TestCase
+  include Tests::Api::Basics
+  include Tests::Api::Defaults
+  include Tests::Api::Interpolation
+  include Tests::Api::Link
+  include Tests::Api::Lookup
+  include Tests::Api::Pluralization
+  include Tests::Api::Procs
+  include Tests::Api::Localization::Date
+  include Tests::Api::Localization::DateTime
+  include Tests::Api::Localization::Time
+  include Tests::Api::Localization::Procs
+
+  define_method "test: make sure we use the Simple backend" do
+    assert_equal I18n::Backend::Simple, I18n.backend.class
+  end
+end

data/test/{backend/active_record_missing/active_record_missing_test.rb → cases/backend/active_record/missing_test.rb}

@@ -1,17 +1,14 @@
 # encoding: utf-8
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
-require 'i18n/backend/chain'
-require 'i18n/backend/active_record'
-require 'i18n/backend/active_record_missing'
+require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+
+setup_active_record
 
 class I18nActiveRecordMissingTest < Test::Unit::TestCase
-  include Tests::Backend::ActiveRecord::Setup::Base
-  
   def setup
-    I18n.backend.store_translations(:en, :i18n => { :plural_keys => [:zero, :one, :other] })
+    store_translations(:en, :i18n => { :plural_keys => [:zero, :one, :other] })
     
     I18n.backend = I18n::Backend::Chain.new(I18n.backend)
-    I18n.backend.meta_class.send(:include, I18n::Backend::ActiveRecordMissing)
+    I18n.backend.meta_class.send(:include, I18n::Backend::ActiveRecord::Missing)
     
     I18n::Backend::ActiveRecord::Translation.delete_all
   end

data/test/{backend/active_record → cases/backend}/active_record_test.rb

@@ -1,9 +1,19 @@
 # encoding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
-require 'i18n/backend/active_record'
 
-class I18nActiveRecordBackendTest < Test::Unit::TestCase
-  include Tests::Backend::ActiveRecord::Setup::Base
+setup_active_record
+
+class I18nBackendActiveRecordTest < Test::Unit::TestCase
+  def setup
+    I18n.backend = I18n::Backend::ActiveRecord.new
+    I18n::Backend::ActiveRecord::Translation.send(:include, I18n::Backend::ActiveRecord::StoreProcs)
+    store_translations(:en, :foo => { :bar => 'bar', :baz => 'baz' })
+  end
+
+  def teardown
+    I18n::Backend::ActiveRecord::Translation.destroy_all
+    super
+  end
 
   def test_store_translations_does_not_allow_ambigous_keys_1
     I18n::Backend::ActiveRecord::Translation.delete_all

data/test/{backend/cache → cases/backend}/cache_test.rb

@@ -4,12 +4,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 require 'i18n/backend/cache'
 
 begin
-  require 'active_support/cache'
+  require 'active_support'
 rescue LoadError
-  $stderr.puts "Skipping cache tests using ActiveSupport::Cache"
+  $stderr.puts "Skipping cache tests using ActiveSupport"
 else
 
-class I18nCacheBackendTest < Test::Unit::TestCase
+class I18nBackendCacheTest < Test::Unit::TestCase
   class Backend
     include I18n::Backend::Base
     include I18n::Backend::Cache
@@ -29,7 +29,7 @@ class I18nCacheBackendTest < Test::Unit::TestCase
     assert I18n.cache_store.is_a?(ActiveSupport::Cache::MemoryStore)
   end
 
-  define_method :"test translate hits the backend and caches the response" do
+  define_method "test translate hits the backend and caches the response" do
     I18n.backend.expects(:lookup).returns('Foo')
     assert_equal 'Foo', I18n.t(:foo)
 
@@ -40,18 +40,18 @@ class I18nCacheBackendTest < Test::Unit::TestCase
     assert_equal 'Bar', I18n.t(:bar)
   end
 
-  define_method :"test still raises MissingTranslationData but also caches it" do
+  define_method "test still raises MissingTranslationData but also caches it" do
     I18n.backend.expects(:lookup).returns(nil)
     assert_raises(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
     I18n.backend.expects(:lookup).never
     assert_raises(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
   end
 
-  define_method :"test uses 'i18n' as a cache key namespace by default" do
+  define_method "test uses 'i18n' as a cache key namespace by default" do
     assert_equal 0, I18n.backend.send(:cache_key, :foo).index('i18n')
   end
 
-  define_method :"test adds a custom cache key namespace" do
+  define_method "test adds a custom cache key namespace" do
     with_cache_namespace('bar') do
       assert_equal 0, I18n.backend.send(:cache_key, :foo).index('i18n-bar')
     end

data/test/{backend/chain → cases/backend}/chain_test.rb

@@ -3,7 +3,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 require 'i18n/backend/chain'
 
-class I18nChainBackendTest < Test::Unit::TestCase
+class I18nBackendChainTest < Test::Unit::TestCase
   def setup
     @first  = backend(:en => {
       :foo => 'Foo', :formats => { :short => 'short' }, :plural_1 => { :one => '{{count}}' }

data/test/{backend/fallbacks → cases/backend}/fallbacks_test.rb

@@ -2,7 +2,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 
-class I18nFallbacksBackendTest < Test::Unit::TestCase
+class I18nBackendFallbacksTest < Test::Unit::TestCase
   class Backend
     include I18n::Backend::Base
     include I18n::Backend::Fallbacks
@@ -10,9 +10,9 @@ class I18nFallbacksBackendTest < Test::Unit::TestCase
 
   def setup
     I18n.backend = Backend.new
-    backend_store_translations(:en, :foo => 'Foo in :en', :bar => 'Bar in :en', :buz => 'Buz in :en')
-    backend_store_translations(:de, :bar => 'Bar in :de', :baz => 'Baz in :de')
-    backend_store_translations(:'de-DE', :baz => 'Baz in :de-DE')
+    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')
+    store_translations(:'de-DE', :baz => 'Baz in :de-DE')
   end
 
   define_method "test: still returns an existing translation as usual" do
@@ -39,7 +39,7 @@ class I18nFallbacksBackendTest < Test::Unit::TestCase
   end
 end
 
-class I18nChainWithFallbacksBackendTest < Test::Unit::TestCase
+class I18nBackendFallbacksWithChainTest < Test::Unit::TestCase
   class Backend
     include I18n::Backend::Base
     include I18n::Backend::Fallbacks