i18n 0.3.0 → 0.3.1

data/test/api/link.rb

@@ -1,47 +1,40 @@
 # encoding: utf-8
 
 module Tests
-  module Backend
-    module Api
-      module Link
-        def test_translate_calls_translate_if_resolves_to_a_symbol
-          setup_linked_translations
-          assert_equal 'foo', I18n.backend.translate('en', :link_to_foo)
-        end
-
-        def test_translate_calls_translate_if_resolves_to_a_symbol2
-          setup_linked_translations
-          assert_equal('baz', I18n.backend.translate('en', :link_to_baz))
-        end
-
-        def test_translate_calls_translate_if_resolves_to_a_symbol3
-          setup_linked_translations
-          assert I18n.backend.translate('en', :link_to_bar).key?(:baz)
-        end
+  module Api
+    module Link
+      define_method "test linked lookup: given the key resolves to a symbol it looks up the symbol" do
+        setup_linked_translations
+        assert_equal 'foo', I18n.backend.translate('en', :link_to_foo)
+      end
 
-        def test_translate_calls_translate_if_resolves_to_a_symbol_with_scope_1
-          setup_linked_translations
-          assert_equal('baz', I18n.backend.translate('en', :link_to_baz, :scope => :bar))
-        end
+      define_method "test linked lookup: given the key resolves to a dot-separated symbol it looks up the dot-separated symbol (1)" do
+        setup_linked_translations
+        assert_equal('baz', I18n.backend.translate('en', :link_to_baz))
+      end
+      
+      define_method "test linked lookup: given the key resolves to a dot-separated symbol it looks up the dot-separated symbol (2)" do
+        setup_linked_translations
+        assert_equal('buz', I18n.backend.translate('en', :'bar.link_to_buz'))
+      end
+      
+      define_method "test linked lookup: given a scope and the key resolves to a symbol it looks up the symbol within the scope" do
+        setup_linked_translations
+        assert_equal('baz', I18n.backend.translate('en', :link_to_baz, :scope => :bar))
+      end
+      
+      protected
 
-        def test_translate_calls_translate_if_resolves_to_a_symbol_with_scope_1
-          setup_linked_translations
-          assert_equal('buz', I18n.backend.translate('en', :'bar.link_to_buz'))
+        def setup_linked_translations
+          I18n.backend.store_translations 'en', {
+            :foo => 'foo',
+            :bar => { :baz => 'baz', :link_to_baz => :baz, :link_to_buz => :'boz.buz' },
+            :boz => { :buz => 'buz' },
+            :link_to_foo => :foo,
+            :link_to_bar => :bar,
+            :link_to_baz => :'bar.baz'
+          }
         end
-
-        private
-
-          def setup_linked_translations
-            I18n.backend.store_translations 'en', {
-              :foo => 'foo',
-              :bar => { :baz => 'baz', :link_to_baz => :baz, :link_to_buz => :'boz.buz' },
-              :boz => { :buz => 'buz' },
-              :link_to_foo => :foo,
-              :link_to_bar => :bar,
-              :link_to_baz => :'bar.baz'
-            }
-          end
-      end
     end
   end
 end

data/test/api/localization/date.rb

@@ -1,71 +1,90 @@
 # encoding: utf-8
 
 module Tests
-  module Backend
-    module Api
-      module Localization
-        module Date
+  module Api
+    module Localization
+      module Date
+        def setup
+          super
+          setup_date_translations
+          @date = ::Date.new(2008, 3, 1)
+        end
+        
+        define_method "test localize Date: given the short format it uses it" do
           # TODO should be Mrz, shouldn't it?
-          def test_localize_given_the_short_format_it_uses_it
-            assert_equal '01. Mar', I18n.backend.localize('de', date, :short)
-          end
+          assert_equal '01. Mar', I18n.l(@date, :format => :short, :locale => :de)
+        end
 
-          def test_localize_given_the_long_format_it_uses_it
-            assert_equal '01. März 2008', I18n.backend.localize('de', date, :long)
-          end
+        define_method "test localize Date: given the long format it uses it" do
+          assert_equal '01. März 2008', I18n.l(@date, :format => :long, :locale => :de)
+        end
 
-          def test_localize_given_the_default_format_it_uses_it
-            assert_equal '01.03.2008', I18n.backend.localize('de', date, :default)
-          end
+        define_method "test localize Date: given the default format it uses it" do
+          assert_equal '01.03.2008', I18n.l(@date, :format => :default, :locale => :de)
+        end
 
-          def test_localize_given_a_day_name_format_it_returns_a_day_name
-            assert_equal 'Samstag', I18n.backend.localize('de', date, '%A')
-          end
+        define_method "test localize Date: given a day name format it returns the correct day name" do
+          assert_equal 'Samstag', I18n.l(@date, :format => '%A', :locale => :de)
+        end
 
-          def test_localize_given_an_abbr_day_name_format_it_returns_an_abbrevated_day_name
-            assert_equal 'Sa', I18n.backend.localize('de', date, '%a')
-          end
+        define_method "test localize Date: given an abbreviated day name format it returns the correct abbreviated day name" do
+          assert_equal 'Sa', I18n.l(@date, :format => '%a', :locale => :de)
+        end
 
-          def test_localize_given_a_month_name_format_it_returns_a_month_name
-            assert_equal 'März', I18n.backend.localize('de', date, '%B')
-          end
+        define_method "test localize Date: given a month name format it returns the correct month name" do
+          assert_equal 'März', I18n.l(@date, :format => '%B', :locale => :de)
+        end
 
+        define_method "test localize Date: given an abbreviated month name format it returns the correct abbreviated month name" do
           # TODO should be Mrz, shouldn't it?
-          def test_localize_given_an_abbr_month_name_format_it_returns_an_abbrevated_month_name
-            assert_equal 'Mar', I18n.backend.localize('de', date, '%b')
-          end
-
-          def test_localize_given_a_format_specified_as_a_proc
-            assert_equal '1ter März 2008', I18n.backend.localize('de', date, :long_ordinalized)
-          end
+          assert_equal 'Mar', I18n.l(@date, :format => '%b', :locale => :de)
+        end
 
-          def test_localize_given_a_format_specified_as_a_proc_with_additional_options
-            assert_equal '1ter März 2008 (MEZ)', I18n.backend.localize('de', date, :long_ordinalized, :timezone => 'MEZ')
-          end
+        define_method "test localize Date: given a format that resolves to a Proc it calls the Proc with the object" do
+          # TODO should be Mrz, shouldn't it?
+          assert_equal '[Sat, 01 Mar 2008, {}]', I18n.l(@date, :format => :proc, :locale => :de)
+        end
 
-          def test_localize_does_not_alter_the_stored_format_string
-            first_of_jan = I18n.backend.localize(:de, ::Date.parse('2009-01-01'), :long)
-            first_of_oct = I18n.backend.localize(:de, ::Date.parse('2009-10-01'), :long)
-            assert_equal '01. Januar 2009', first_of_jan
-            assert_equal '01. Oktober 2009', first_of_oct
-          end
+        # TODO fails, but probably should pass
+        # define_method "test localize Date: 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
 
-          def test_localize_given_no_format_it_does_not_fail
-            assert_nothing_raised{ I18n.backend.localize 'de', date }
-          end
+        define_method "test localize Date: given an unknown format it does not fail" do
+          assert_nothing_raised { I18n.l(@date, :format => '%x') }
+        end
 
-          def test_localize_given_an_unknown_format_it_does_not_fail
-            assert_nothing_raised{ I18n.backend.localize 'de', date, '%x' }
-          end
+        define_method "test localize Date: given nil it raises I18n::ArgumentError" do
+          assert_raises(I18n::ArgumentError) { I18n.l(nil) }
+        end
 
-          def test_localize_nil_raises_argument_error
-            assert_raises(I18n::ArgumentError) { I18n.backend.localize 'de', nil }
-          end
+        define_method "test localize Date: given a plain Object it raises I18n::ArgumentError" do
+          assert_raises(I18n::ArgumentError) { I18n.l(Object.new) }
+        end
+        
+        define_method "test localize Date: it does not alter the format string" do
+          assert_equal '01. Februar 2009', I18n.l(::Date.parse('2009-02-01'), :format => :long, :locale => :de)
+          assert_equal '01. Oktober 2009', I18n.l(::Date.parse('2009-10-01'), :format => :long, :locale => :de)
+        end
 
-          def test_localize_object_raises_argument_error
-            assert_raises(I18n::ArgumentError) { I18n.backend.localize 'de', Object.new }
+        protected
+        
+          def setup_date_translations
+            store_translations :de, {
+              :date => {
+                :formats => {
+                  :default => "%d.%m.%Y",
+                  :short => "%d. %b",
+                  :long => "%d. %B %Y",
+                  :proc => lambda { |*args| args.inspect }
+                },
+                :day_names => %w(Sonntag Montag Dienstag Mittwoch Donnerstag Freitag Samstag),
+                :abbr_day_names => %w(So Mo Di Mi Do Fr  Sa),
+                :month_names => %w(Januar Februar März April Mai Juni Juli August September Oktober November Dezember).unshift(nil),
+                :abbr_month_names => %w(Jan Feb Mar Apr Mai Jun Jul Aug Sep Okt Nov Dez).unshift(nil)
+              }
+            }
           end
-        end
       end
     end
   end

data/test/api/localization/date_time.rb

@@ -1,62 +1,86 @@
 # encoding: utf-8
 
 module Tests
-  module Backend
-    module Api
-      module Localization
-        module DateTime
+  module Api
+    module Localization
+      module DateTime
+        def setup
+          super
+          setup_datetime_translations
+          @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?
-          def test_localize_given_the_short_format_it_uses_it
-            assert_equal '01. Mar 06:00', I18n.backend.localize('de', morning_datetime, :short)
-          end
+          assert_equal '01. Mar 06:00', I18n.l(@datetime, :format => :short, :locale => :de)
+        end
 
-          def test_localize_given_the_long_format_it_uses_it
-            assert_equal '01. März 2008 06:00', I18n.backend.localize('de', morning_datetime, :long)
-          end
+        define_method "test localize DateTime: given the long format it uses it" do
+          assert_equal '01. März 2008 06:00', I18n.l(@datetime, :format => :long, :locale => :de)
+        end
 
+        define_method "test localize DateTime: given the default format it uses it" do
           # TODO should be Mrz, shouldn't it?
-          def test_localize_given_the_default_format_it_uses_it
-            assert_equal 'Sa, 01. Mar 2008 06:00:00 +0000', I18n.backend.localize('de', morning_datetime, :default)
-          end
+          assert_equal 'Sa, 01. Mar 2008 06:00:00 +0000', I18n.l(@datetime, :format => :default, :locale => :de)
+        end
 
-          def test_localize_given_a_day_name_format_it_returns_the_correct_day_name
-            assert_equal 'Samstag', I18n.backend.localize('de', morning_datetime, '%A')
-          end
+        define_method "test localize DateTime: given a day name format it returns the correct day name" do
+          assert_equal 'Samstag', I18n.l(@datetime, :format => '%A', :locale => :de)
+        end
 
-          def test_localize_given_an_abbr_day_name_format_it_returns_the_correct_abbrevated_day_name
-            assert_equal 'Sa', I18n.backend.localize('de', morning_datetime, '%a')
-          end
+        define_method "test localize DateTime: given an abbreviated day name format it returns the correct abbreviated day name" do
+          assert_equal 'Sa', I18n.l(@datetime, :format => '%a', :locale => :de)
+        end
 
-          def test_localize_given_a_month_name_format_it_returns_the_correct_month_name
-            assert_equal 'März', I18n.backend.localize('de', morning_datetime, '%B')
-          end
+        define_method "test localize DateTime: given a month name format it returns the correct month name" do
+          assert_equal 'März', I18n.l(@datetime, :format => '%B', :locale => :de)
+        end
 
+        define_method "test localize DateTime: given an abbreviated month name format it returns the correct abbreviated month name" do
           # TODO should be Mrz, shouldn't it?
-          def test_localize_given_an_abbr_month_name_format_it_returns_the_correct_abbrevated_month_name
-            assert_equal 'Mar', I18n.backend.localize('de', morning_datetime, '%b')
-          end
-
-          def test_localize_given_a_meridian_indicator_format_it_returns_the_correct_meridian_indicator
-            assert_equal 'am', I18n.backend.localize('de', morning_datetime, '%p')
-            assert_equal 'pm', I18n.backend.localize('de', evening_datetime, '%p')
-          end
+          assert_equal 'Mar', I18n.l(@datetime, :format => '%b', :locale => :de)
+        end
 
-          def test_localize_given_a_format_specified_as_a_proc
-            assert_equal '1ter März 2008, 06:00 Uhr', I18n.backend.localize('de', morning_datetime, :long_ordinalized)
-          end
+        define_method "test localize DateTime: given a meridian indicator format it returns the correct meridian indicator" do
+          assert_equal 'am', I18n.l(@datetime, :format => '%p', :locale => :de)
+          assert_equal 'pm', I18n.l(@other_datetime, :format => '%p', :locale => :de)
+        end
 
-          def test_localize_given_a_format_specified_as_a_proc_with_additional_options
-            assert_equal '1ter März 2008, 06:00 Uhr (MEZ)', I18n.backend.localize('de', morning_datetime, :long_ordinalized, :timezone => 'MEZ')
-          end
+        define_method "test localize Date: given a format that resolves to a Proc it calls the Proc with the object" do
+          assert_equal '[Sat Mar 01 06:00:00 UTC 2008, {}]', I18n.l(@time, :format => :proc, :locale => :de)
+        end
 
-          def test_localize_given_no_format_it_does_not_fail
-            assert_nothing_raised{ I18n.backend.localize 'de', morning_datetime }
-          end
+        # define_method "test localize DateTime: given a format that resolves to a Proc it calls the Proc with the object and extra options" do
+        #   assert_equal '1ter März 2008, 06:00 Uhr', I18n.l(@datetime, :long_ordinalized)
+        # end
 
-          def test_localize_given_an_unknown_format_it_does_not_fail
-            assert_nothing_raised{ I18n.backend.localize 'de', morning_datetime, '%x' }
-          end
+        define_method "test localize DateTime: given an unknown format it does not fail" do
+          assert_nothing_raised { I18n.l(@datetime, :format => '%x') }
         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 => {
+                  :default => "%a, %d. %b %Y %H:%M:%S %z",
+                  :short => "%d. %b %H:%M",
+                  :long => "%d. %B %Y %H:%M",
+                  :long_ordinalized => lambda { |date, options|
+                    tz = " (#{options[:timezone]})" if options[:timezone]
+                    "#{date.day}ter %B %Y, %H:%M Uhr#{tz}"
+                  }
+                },
+                :am => 'am',
+                :pm => 'pm'
+              }
+            }
+          end
       end
     end
   end

data/test/api/localization/procs.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+
+module Tests
+  module Api
+    module Localization
+      module Procs
+        define_method "test localize: using day names from lambdas" do
+          setup_time_proc_translations
+          time = ::Time.parse('2008-03-01 6:00 UTC')
+          assert_match /Суббота/, I18n.l(time, :format => "%A, %d %B", :locale => :ru)
+          assert_match /суббота/, I18n.l(time, :format => "%d %B (%A)", :locale => :ru)
+        end
+
+        define_method "test localize: using month names from lambdas" do
+          setup_time_proc_translations
+          time = ::Time.parse('2008-03-01 6:00 UTC')
+          assert_match /марта/, I18n.l(time, :format => "%d %B %Y", :locale => :ru)
+          assert_match /Март /, I18n.l(time, :format => "%B %Y", :locale => :ru)
+        end
+
+        define_method "test localize: using abbreviated day names from lambdas" do
+          setup_time_proc_translations
+          time = ::Time.parse('2008-03-01 6:00 UTC')
+          assert_match /марта/, I18n.l(time, :format => "%d %b %Y", :locale => :ru)
+          assert_match /март /, I18n.l(time, :format => "%b %Y", :locale => :ru)
+        end
+
+        protected
+
+          def setup_time_proc_translations
+            store_translations :ru, {
+              :date => {
+                :'day_names' => lambda { |key, options|
+                  (options[:format] =~ /^%A/) ?
+                  %w(Воскресенье Понедельник Вторник Среда Четверг Пятница Суббота) :
+                  %w(воскресенье понедельник вторник среда четверг пятница суббота)
+                },
+                :'month_names' => lambda { |key, options|
+                  (options[:format] =~ /(%d|%e)(\s*)?(%B)/) ?
+                  %w(января февраля марта апреля мая июня июля августа сентября октября ноября декабря).unshift(nil) :
+                  %w(Январь Февраль Март Апрель Май Июнь Июль Август Сентябрь Октябрь Ноябрь Декабрь).unshift(nil)
+                },
+                :'abbr_month_names' => lambda { |key, options|
+                  (options[:format] =~ /(%d|%e)(\s*)(%b)/) ?
+                  %w(янв. февр. марта апр. мая июня июля авг. сент. окт. нояб. дек.).unshift(nil) :
+                  %w(янв. февр. март апр. май июнь июль авг. сент. окт. нояб. дек.).unshift(nil)
+                },
+              }
+            }
+          end
+      end
+    end
+  end
+end

data/test/api/localization/time.rb

@@ -1,62 +1,81 @@
 # encoding: utf-8
 
 module Tests
-  module Backend
-    module Api
-      module Localization
-        module Time
+  module Api
+    module Localization
+      module Time
+        def setup
+          super
+          setup_time_translations
+          @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?
-          def test_localize_given_the_short_format_it_uses_it
-            assert_equal '01. Mar 06:00', I18n.backend.localize('de', morning_time, :short)
-          end
-
-          def test_localize_given_the_long_format_it_uses_it
-            assert_equal '01. März 2008 06:00', I18n.backend.localize('de', morning_time, :long)
-          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.backend.localize('de', morning_time, :default)
-          # end
-
-          def test_localize_given_a_day_name_format_it_returns_the_correct_day_name
-            assert_equal 'Samstag', I18n.backend.localize('de', morning_time, '%A')
-          end
-
-          def test_localize_given_an_abbr_day_name_format_it_returns_the_correct_abbrevated_day_name
-            assert_equal 'Sa', I18n.backend.localize('de', morning_time, '%a')
-          end
-
-          def test_localize_given_a_month_name_format_it_returns_the_correct_month_name
-            assert_equal 'März', I18n.backend.localize('de', morning_time, '%B')
-          end
-
+          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?
-          def test_localize_given_an_abbr_month_name_format_it_returns_the_correct_abbrevated_month_name
-            assert_equal 'Mar', I18n.backend.localize('de', morning_time, '%b')
-          end
-
-          def test_localize_given_a_meridian_indicator_format_it_returns_the_correct_meridian_indicator
-            assert_equal 'am', I18n.backend.localize('de', morning_time, '%p')
-            assert_equal 'pm', I18n.backend.localize('de', evening_time, '%p')
-          end
-
-          def test_localize_given_a_format_specified_as_a_proc
-            assert_equal '1ter März 2008, 06:00 Uhr', I18n.backend.localize('de', morning_time, :long_ordinalized)
-          end
-
-          def test_localize_given_a_format_specified_as_a_proc_with_additional_options
-            assert_equal '1ter März 2008, 06:00 Uhr (MEZ)', I18n.backend.localize('de', morning_time, :long_ordinalized, :timezone => 'MEZ')
-          end
-
-          def test_localize_given_no_format_it_does_not_fail
-            assert_nothing_raised{ I18n.backend.localize 'de', morning_time }
-          end
+          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)
+        end
 
-          def test_localize_given_an_unknown_format_it_does_not_fail
-            assert_nothing_raised{ I18n.backend.localize 'de', morning_time, '%x' }
-          end
+        define_method "test localize Time: given a format that resolves to a Proc it calls the Proc with the object" do
+          assert_equal '[Sat Mar 01 06:00:00 UTC 2008, {}]', I18n.l(@time, :format => :proc, :locale => :de)
+        end
+        
+        # TODO fails, but 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
+        
+        protected
+        
+          def setup_time_translations
+            store_translations :de, {
+              :time => {
+                :formats => {
+                  :default => "%a, %d. %b %Y %H:%M:%S %z",
+                  :short => "%d. %b %H:%M",
+                  :long => "%d. %B %Y %H:%M",
+                  :proc => lambda { |*args| args.inspect }
+                },
+                :am => 'am',
+                :pm => 'pm'
+              }
+            }
+          end
       end
     end
   end