i18n 0.3.3 → 0.3.4

data/test/{cases/api → api}/fast_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 I18nFastBackendApiTest < Test::Unit::TestCase
   include Tests::Api::Basics
@@ -25,7 +26,7 @@ class I18nFastBackendApiTest < Test::Unit::TestCase
     super
   end
   
-  define_method "test: make sure we use the FastBackend backend" do
+  test "make sure we use the FastBackend backend" do
     assert_equal FastBackend, I18n.backend.class
   end
 end

data/test/{cases/api → api}/pluralization_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 I18nPluralizationApiTest < Test::Unit::TestCase
   class Backend
@@ -25,7 +26,7 @@ class I18nPluralizationApiTest < Test::Unit::TestCase
   include Tests::Api::Localization::Time
   include Tests::Api::Localization::Procs
 
-  define_method "test: make sure we use a backend with Pluralization included" do
+  test "make sure we use a backend with Pluralization included" do
     assert_equal Backend, I18n.backend.class
   end
   

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

@@ -1,6 +1,8 @@
 # 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'
+require 'api'
 
 class I18nSimpleBackendApiTest < Test::Unit::TestCase
   include Tests::Api::Basics
@@ -15,7 +17,7 @@ class I18nSimpleBackendApiTest < Test::Unit::TestCase
   include Tests::Api::Localization::Time
   include Tests::Api::Localization::Procs
 
-  define_method "test: make sure we use the Simple backend" do
+  test "make sure we use the Simple backend" do
     assert_equal I18n::Backend::Simple, I18n.backend.class
   end
 end

data/test/api/{defaults.rb → tests/defaults.rb}

@@ -25,7 +25,7 @@ module Tests
       end
 
       define_method "test defaults: given an array of missing keys it raises a MissingTranslationData exception" do
-        assert_raises I18n::MissingTranslationData do
+        assert_raise I18n::MissingTranslationData do
           I18n.t(:does_not_exist, :default => [:does_not_exist_2, :does_not_exist_3], :raise => true)
         end
       end

data/test/api/{interpolation.rb → tests/interpolation.rb}

@@ -30,7 +30,7 @@ module Tests
       end
 
       define_method "test interpolation: given values but missing a key it raises I18n::MissingInterpolationArgument" do
-        assert_raises(I18n::MissingInterpolationArgument) do
+        assert_raise(I18n::MissingInterpolationArgument) do
           interpolate(:default => '{{foo}}', :bar => 'bar')
         end
       end
@@ -65,7 +65,7 @@ module Tests
 
       if Kernel.const_defined?(:Encoding)
         define_method "test interpolation: given a euc-jp translation and a utf-8 value it raises Encoding::CompatibilityError" do
-          assert_raises(Encoding::CompatibilityError) do
+          assert_raise(Encoding::CompatibilityError) do
             interpolate(:default => euc_jp('こんにちは、{{name}}さん!'), :name => 'ゆきひろ')
           end
         end
@@ -76,16 +76,16 @@ module Tests
         # 
         # TODO should better explain how this relates to the test above with the simpler utf-8 default string
         define_method "test interpolation: given a utf-8 translation and a euc-jp value it raises Encoding::CompatibilityError" do
-          assert_raises(Encoding::CompatibilityError) do
+          assert_raise(Encoding::CompatibilityError) do
             interpolate(:default => 'こんにちは、{{name}}さん!', :name => euc_jp('ゆきひろ'))
           end
         end
       end
 
       define_method "test interpolation: given a translations containing a reserved key it raises I18n::ReservedInterpolationKey" do
-        assert_raises(I18n::ReservedInterpolationKey) { interpolate(:default => '{{default}}',   :foo => :bar) }
-        assert_raises(I18n::ReservedInterpolationKey) { interpolate(:default => '{{scope}}',     :foo => :bar) }
-        assert_raises(I18n::ReservedInterpolationKey) { interpolate(:default => '{{separator}}', :foo => :bar) }
+        assert_raise(I18n::ReservedInterpolationKey) { interpolate(:default => '{{default}}',   :foo => :bar) }
+        assert_raise(I18n::ReservedInterpolationKey) { interpolate(:default => '{{scope}}',     :foo => :bar) }
+        assert_raise(I18n::ReservedInterpolationKey) { interpolate(:default => '{{separator}}', :foo => :bar) }
       end
     end
   end

data/test/api/{link.rb → tests/link.rb}

@@ -35,12 +35,12 @@ module Tests
         assert_equal('linked', I18n.backend.translate('en', :'foo.link'))
       end
       
-      define_method "test linked lookup: links refer to absolute keys even if a scope was given" do
+      define_method "test linked lookup: links refer to a key relative to the given scope" do
         I18n.backend.store_translations 'en', {
-          :foo => { :link  => :linked, :linked => 'linked in foo' },
+          :foo => { :link => :linked, :linked => 'linked in foo' },
           :linked => 'linked absolutely'
         }
-        assert_equal 'linked absolutely', I18n.backend.translate('en', :link, :scope => :foo)
+        assert_equal 'linked in foo', I18n.backend.translate('en', :link, :scope => :foo)
       end
 
       define_method "test linked lookup: a link can resolve to a namespace in the middle of a dot-separated key" do
@@ -49,6 +49,7 @@ module Tests
           :activerecord => { :errors => { :messages => :"activemodel.errors.messages" } }
         }
         assert_equal "can't be blank", I18n.t(:"activerecord.errors.messages.blank")
+        assert_equal "can't be blank", I18n.t(:"activerecord.errors.messages.blank")
       end
     end
   end

data/test/api/{localization → tests/localization}/date.rb

@@ -55,11 +55,15 @@ module Tests
         end
 
         define_method "test localize Date: given nil it raises I18n::ArgumentError" do
-          assert_raises(I18n::ArgumentError) { I18n.l(nil) }
+          assert_raise(I18n::ArgumentError) { I18n.l(nil) }
         end
 
         define_method "test localize Date: given a plain Object it raises I18n::ArgumentError" do
-          assert_raises(I18n::ArgumentError) { I18n.l(Object.new) }
+          assert_raise(I18n::ArgumentError) { I18n.l(Object.new) }
+        end
+
+        define_method "test localize Date: given a format is missing it raises I18n::MissingTranslationData" do
+          assert_raise(I18n::MissingTranslationData) { I18n.l(@date, :format => :missing) }
         end
         
         define_method "test localize Date: it does not alter the format string" do

data/test/api/{localization → tests/localization}/date_time.rb

@@ -10,7 +10,7 @@ module Tests
           @datetime = ::DateTime.new(2008, 3, 1, 6)
           @other_datetime = ::DateTime.new(2008, 3, 1, 18)
         end
-        
+
         define_method "test localize DateTime: given the short format it uses it" do
           # TODO should be Mrz, shouldn't it?
           assert_equal '01. Mar 06:00', I18n.l(@datetime, :format => :short, :locale => :de)
@@ -61,13 +61,15 @@ module Tests
         define_method "test localize DateTime: given an unknown format it does not fail" do
           assert_nothing_raised { I18n.l(@datetime, :format => '%x') }
         end
-        
+
+        define_method "test localize DateTime: given a format is missing it raises I18n::MissingTranslationData" do
+          assert_raise(I18n::MissingTranslationData) { I18n.l(@datetime, :format => :missing) }
+        end
+
         protected
-        
+
           def setup_datetime_translations
             # time translations might have been set up in Tests::Api::Localization::Time
-            I18n.t(:'time.formats.default', :locale => :de, :raise => true)
-          rescue
             store_translations :de, {
               :time => {
                 :formats => {

data/test/api/{localization → tests/localization}/time.rb

@@ -10,38 +10,38 @@ module Tests
           @time = ::Time.parse('2008-03-01 6:00 UTC')
           @other_time = ::Time.parse('2008-03-01 18:00 UTC')
         end
-        
+
         define_method "test localize Time: given the short format it uses it" do
           # TODO should be Mrz, shouldn't it?
           assert_equal '01. Mar 06:00', I18n.l(@time, :format => :short, :locale => :de)
         end
-        
+
         define_method "test localize Time: given the long format it uses it" do
           assert_equal '01. März 2008 06:00', I18n.l(@time, :format => :long, :locale => :de)
         end
-        
+
         # TODO Seems to break on Windows because ENV['TZ'] is ignored. What's a better way to do this?
         # def test_localize_given_the_default_format_it_uses_it
         #   assert_equal 'Sa, 01. Mar 2008 06:00:00 +0000', I18n.l(@time, :format => :default, :locale => :de)
         # end
-        
+
         define_method "test localize Time: given a day name format it returns the correct day name" do
           assert_equal 'Samstag', I18n.l(@time, :format => '%A', :locale => :de)
         end
-        
+
         define_method "test localize Time: given an abbreviated day name format it returns the correct abbreviated day name" do
           assert_equal 'Sa', I18n.l(@time, :format => '%a', :locale => :de)
         end
-        
+
         define_method "test localize Time: given a month name format it returns the correct month name" do
           assert_equal 'März', I18n.l(@time, :format => '%B', :locale => :de)
         end
-        
+
         define_method "test localize Time: given an abbreviated month name format it returns the correct abbreviated month name" do
           # TODO should be Mrz, shouldn't it?
           assert_equal 'Mar', I18n.l(@time, :format => '%b', :locale => :de)
         end
-        
+
         define_method "test localize Time: given a meridian indicator format it returns the correct meridian indicator" do
           assert_equal 'am', I18n.l(@time, :format => '%p', :locale => :de)
           assert_equal 'pm', I18n.l(@other_time, :format => '%p', :locale => :de)
@@ -52,18 +52,22 @@ module Tests
             assert_equal '[Sat, 01 Mar 2008 06:00:00 +0000, {}]', I18n.l(@datetime, :format => :proc, :locale => :de)
           end
         end
-        
+
         # TODO fails, but something along these lines probably should pass
         # define_method "test localize Time: given a format that resolves to a Proc it calls the Proc with the object and extra options" do
         #   assert_equal '[Sat Mar 01 06:00:00 UTC 2008, {:foo=>"foo"}]', I18n.l(@time, :format => :proc, :foo => 'foo', :locale => :de)
         # end
-        
+
         define_method "test localize Time: given an unknown format it does not fail" do
           assert_nothing_raised { I18n.l(@time, :format => '%x') }
         end
-        
+
+        define_method "test localize Time: given a format is missing it raises I18n::MissingTranslationData" do
+          assert_raise(I18n::MissingTranslationData) { I18n.l(@time, :format => :missing) }
+        end
+
         protected
-        
+
           def setup_time_translations
             store_translations :de, {
               :time => {

data/test/api/{lookup.rb → tests/lookup.rb}

@@ -5,7 +5,7 @@ module Tests
     module Lookup
       def setup
         super
-        store_translations(:foo => { :bar => 'bar', :baz => 'baz' }, :bla => false)
+        store_translations(:foo => { :bar => 'bar', :baz => 'baz' }, :bla => false, :ble => %(a b c))
       end
 
       define_method "test lookup: given a nested key it looks up the nested hash value" do
@@ -21,7 +21,11 @@ module Tests
       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) }
+        assert_raise(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
+      end
+
+      define_method "test lookup: does not raise an exception if no translation data is present for the given locale" do
+        assert_nothing_raised { I18n.t(:foo, :locale => :xx) }
       end
 
       define_method "test lookup: given an array of keys it translates all of them" do
@@ -37,9 +41,22 @@ module Tests
       # In fact it probably *should* fail but Rails currently relies on using the default locale instead.
       # So we'll stick to this for now until we get it fixed in Rails.
       define_method "test lookup: given nil as a locale it does not raise but use the default locale" do
-        # assert_raises(I18n::InvalidLocale) { I18n.t(:bar, :locale => nil) }
+        # assert_raise(I18n::InvalidLocale) { I18n.t(:bar, :locale => nil) }
         assert_nothing_raised { I18n.t(:bar, :locale => nil) }
       end
+
+      define_method "test lookup: a resulting String is not frozen" do
+        I18n.t(:'foo.bar')
+        assert !I18n.t(:'foo.bar').frozen?
+      end
+
+      define_method "test lookup: a resulting Array is not frozen" do
+        assert !I18n.t(:'foo.bar').frozen?
+      end
+
+      define_method "test lookup: a resulting Hash is not frozen" do
+        assert !I18n.t(:'foo').frozen?
+      end
     end
   end
 end

data/test/api/{pluralization.rb → tests/pluralization.rb}

@@ -28,7 +28,7 @@ module Tests
       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) }
+        assert_raise(I18n::InvalidPluralizationData) { I18n.t(:default => { :one => 'bar' }, :count => 2) }
       end
     end
   end

data/test/api/{procs.rb → tests/procs.rb}

@@ -23,7 +23,7 @@ module Tests
         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')
@@ -35,6 +35,15 @@ module Tests
         assert_equal 'one',   I18n.t(:default => proc, :count => 1)
         assert_equal 'other', I18n.t(:default => proc, :count => 2)
       end
+
+      define_method "test lookup: given the option :resolve => false was passed it does not resolve proc translations" do
+        store_translations(:a_lambda => lambda { |*args| args.inspect })
+        assert_equal Proc, I18n.t(:a_lambda, :resolve => false).class
+      end
+
+      define_method "test lookup: given the option :resolve => false was passed it does not resolve proc default" do
+        assert_equal Proc, I18n.t(nil, :default => lambda { |*args| args.inspect }, :resolve => false).class
+      end
     end
   end
 end

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

@@ -1,7 +1,8 @@
 # encoding: utf-8
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../')); $:.uniq!
+require 'test_helper'
 
-setup_active_record
+require_active_record!
 
 class I18nActiveRecordMissingTest < Test::Unit::TestCase
   def setup
@@ -13,47 +14,37 @@ class I18nActiveRecordMissingTest < Test::Unit::TestCase
     I18n::Backend::ActiveRecord::Translation.delete_all
   end
   
-  def test_can_persist_interpolations
-    translation = I18n::Backend::ActiveRecord::Translation.new \
-      :key => 'foo', 
-      :value => 'bar', 
-      :locale => :en
-    
-    translation.interpolations = %w{ count name }
+  test "can persist interpolations" do
+    translation = I18n::Backend::ActiveRecord::Translation.new(:key => 'foo', :value => 'bar', :locale => :en)
+    translation.interpolations = %w(count name)
     translation.save
-    
     assert translation.valid?
   end
 
-  def test_lookup_persists_key
+  test "lookup persists the key" do
     I18n.t('foo.bar.baz')
-    
     assert_equal 1, I18n::Backend::ActiveRecord::Translation.count
   end
 
-  def test_lookup_does_not_persist_key_twice
+  test "lookup does not persist the key twice" do
     2.times { I18n.t('foo.bar.baz') }
-    
     assert_equal 1, I18n::Backend::ActiveRecord::Translation.count
   end
   
-  def test_persists_interpolation_keys_when_looked_up_directly
+  test "lookup persists interpolation keys when looked up directly" do
     I18n.t('foo.bar.baz', :cow => "lucy" )  # creates stub translation.
-    
     translation_stub = I18n::Backend::ActiveRecord::Translation.locale(:en).lookup('foo.bar.baz').first
     assert translation_stub.interpolates?(:cow)
   end
 
-  def test_creates_one_stub_per_pluralization
+  test "creates one stub per pluralization" do
     I18n.t('foo', :count => 999)
-    
     translations = I18n::Backend::ActiveRecord::Translation.locale(:en).find_all_by_key %w{ foo.zero foo.one foo.other }
     assert_equal 3, translations.length
   end
-  
-  def test_creates_no_stub_for_base_key_in_pluralization
+
+  test "creates no stub for base key in pluralization" do
     I18n.t('foo', :count => 999)
-    
     translations = I18n::Backend::ActiveRecord::Translation.locale(:en).find_by_key %w{ foo.zero foo.one foo.other }
     assert !I18n::Backend::ActiveRecord::Translation.locale(:en).find_by_key("foo")
   end

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
-
-setup_active_record
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../')); $:.uniq!
+require 'test_helper'
 
+require_active_record!
 
 class I18nBackendActiveRecordTest < Test::Unit::TestCase
   def setup
@@ -15,7 +15,7 @@ class I18nBackendActiveRecordTest < Test::Unit::TestCase
     super
   end
 
-  def test_store_translations_does_not_allow_ambigous_keys_1
+  test "store_translations does not allow ambiguous keys (1)" do
     I18n::Backend::ActiveRecord::Translation.delete_all
     I18n.backend.store_translations(:en, :foo => 'foo')
     I18n.backend.store_translations(:en, :foo => { :bar => 'bar' })
@@ -27,7 +27,7 @@ class I18nBackendActiveRecordTest < Test::Unit::TestCase
     assert_equal({ :bar => 'bar', :baz => 'baz' }, I18n.t(:foo))
   end
 
-  def test_store_translations_does_not_allow_ambigous_keys_2
+  test "store_translations does not allow ambiguous keys (2)" do
     I18n::Backend::ActiveRecord::Translation.delete_all
     I18n.backend.store_translations(:en, :foo => { :bar => 'bar' })
     I18n.backend.store_translations(:en, :foo => { :baz => 'baz' })
@@ -38,9 +38,14 @@ class I18nBackendActiveRecordTest < Test::Unit::TestCase
 
     assert_equal 'foo', I18n.t(:foo)
   end
+  
+  test "can store translations with keys that are translations containing special chars" do
+    I18n.backend.store_translations(:es, :"Pagina's" => "Pagina's" )
+    assert_equal "Pagina's", I18n.t(:"Pagina's", :locale => :es)
+  end
 
   with_mocha do
-    def test_missing_translations_table_does_not_cause_available_locales_to_error
+    test "missing translations table does not cause an error in #available_locales" do
       I18n::Backend::ActiveRecord::Translation.expects(:available_locales).raises(::ActiveRecord::StatementInvalid)
       assert_equal [], I18n.backend.available_locales
     end