i18n 0.3.3 → 0.3.4

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

@@ -1,8 +1,6 @@
 # encoding: utf-8
-
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
-require 'i18n/backend/gettext'
-require 'i18n/helpers/gettext'
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../')); $:.uniq!
+require 'test_helper'
 
 class I18nGettextBackendTest < Test::Unit::TestCase
   include I18n::Helpers::Gettext
@@ -16,11 +14,13 @@ class I18nGettextBackendTest < Test::Unit::TestCase
     I18n.backend = Backend.new
     I18n.locale = :en
     I18n.load_path = ["#{locales_dir}/de.po"]
+    @old_separator, I18n.default_separator = I18n.default_separator, '|'
   end
 
   def teardown
     I18n.load_path = nil
     I18n.backend = nil
+    I18n.default_separator = @old_separator
   end
 
   def test_backend_loads_po_file

data/test/{cases/i18n_exceptions_test.rb → i18n_exceptions_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__) + '/')
+require 'test_helper'
 
 class I18nExceptionsTest < Test::Unit::TestCase
   def test_invalid_locale_stores_locale
@@ -44,7 +44,7 @@ class I18nExceptionsTest < Test::Unit::TestCase
   end
 
   def test_missing_interpolation_argument_stores_key_and_string
-    assert_raises(I18n::MissingInterpolationArgument) { force_missing_interpolation_argument } 
+    assert_raise(I18n::MissingInterpolationArgument) { force_missing_interpolation_argument } 
     force_missing_interpolation_argument
   rescue I18n::ArgumentError => e
     # assert_equal :bar, e.key

data/test/{cases/i18n_load_path_test.rb → i18n_load_path_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__) + '/')
+require 'test_helper'
 
 class I18nLoadPathTest < Test::Unit::TestCase
   # include Tests::Backend::Simple::Setup::Base

data/test/{cases/i18n_test.rb → i18n_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 I18nTest < Test::Unit::TestCase
   def setup
@@ -55,20 +55,20 @@ class I18nTest < Test::Unit::TestCase
   end
 
   def test_normalize_keys
-    assert_equal [:en, :foo, :bar], I18n.send(:normalize_translation_keys, :en, :bar, :foo)
-    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.send(:normalize_translation_keys, :en, :'baz.buz', :'foo.bar')
-    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.send(:normalize_translation_keys, :en, 'baz.buz', 'foo.bar')
-    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.send(:normalize_translation_keys, :en, %w(baz buz), %w(foo bar))
-    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.send(:normalize_translation_keys, :en, [:baz, :buz], [:foo, :bar])
+    assert_equal [:en, :foo, :bar], I18n.normalize_keys(:en, :bar, :foo)
+    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.normalize_keys(:en, :'baz.buz', :'foo.bar')
+    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.normalize_keys(:en, 'baz.buz', 'foo.bar')
+    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.normalize_keys(:en, %w(baz buz), %w(foo bar))
+    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.normalize_keys(:en, [:baz, :buz], [:foo, :bar])
   end
 
   def test_normalize_keys_should_not_attempt_to_sym_on_empty_string
-    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.send(:normalize_translation_keys, :en, :'baz.buz', :'foo..bar')
-    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.send(:normalize_translation_keys, :en, :'baz.buz', :'foo......bar')
+    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.normalize_keys(:en, :'baz.buz', :'foo..bar')
+    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.normalize_keys(:en, :'baz.buz', :'foo......bar')
   end
 
   def test_uses_passed_separator_to_normalize_keys
-    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.send(:normalize_translation_keys, :en, :'baz|buz', :'foo|bar', '|')
+    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.normalize_keys(:en, :'baz|buz', :'foo|bar', '|')
   end
 
   def test_can_set_exception_handler
@@ -85,17 +85,17 @@ class I18nTest < Test::Unit::TestCase
     end
 
     def test_delegates_translate_to_backend
-      I18n.backend.expects(:translate).with 'de', :foo, {}
+      I18n.backend.expects(:translate).with('de', :foo, {})
       I18n.translate :foo, :locale => 'de'
     end
 
     def test_delegates_localize_to_backend
-      I18n.backend.expects(:localize).with 'de', :whatever, :default
+      I18n.backend.expects(:localize).with('de', :whatever, :default, {})
       I18n.localize :whatever, :locale => 'de'
     end
 
     def test_translate_given_no_locale_uses_i18n_locale
-      I18n.backend.expects(:translate).with :en, :foo, {}
+      I18n.backend.expects(:translate).with(:en, :foo, {})
       I18n.translate :foo
     end
   end
@@ -142,11 +142,11 @@ class I18nTest < Test::Unit::TestCase
   end
 
   def test_localize_nil_raises_argument_error
-    assert_raises(I18n::ArgumentError) { I18n.l nil }
+    assert_raise(I18n::ArgumentError) { I18n.l nil }
   end
 
   def test_localize_object_raises_argument_error
-    assert_raises(I18n::ArgumentError) { I18n.l Object.new }
+    assert_raise(I18n::ArgumentError) { I18n.l Object.new }
   end
 
   def test_proc_exception_handler

data/test/{cases/locale → locale}/fallbacks_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'
 
 include I18n::Locale
 

data/test/{cases/locale → locale}/tag/rfc4646_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 I18nLocaleTagRfc4646ParserTest < Test::Unit::TestCase
   include I18n::Locale
@@ -9,7 +9,7 @@ class I18nLocaleTagRfc4646ParserTest < Test::Unit::TestCase
     assert_equal ['de', nil, nil, nil, nil, nil, nil], Tag::Rfc4646::Parser.match('de')
   end
 
-  test "Rfc4646::Parser given a valid tag 'de' returns an array of subtags" do
+  test "Rfc4646::Parser given a valid tag 'de-DE' returns an array of subtags" do
     assert_equal ['de', nil, 'DE', nil, nil, nil, nil], Tag::Rfc4646::Parser.match('de-DE')
   end
 

data/test/{cases/locale → locale}/tag/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 I18nLocaleTagSimpleTest < Test::Unit::TestCase
   include I18n::Locale

data/test/test_data/locales/cldr/de/calendars.yml

@@ -0,0 +1,152 @@
+de: 
+  calendars: 
+    gregorian: 
+      days: 
+        format: 
+          abbreviated: 
+            fri: Fr.
+            mon: Mo.
+            sat: Sa.
+            sun: So.
+            thu: Do.
+            tue: Di.
+            wed: Mi.
+          narrow: :"calendars.gregorian.days.stand-alone.narrow"
+          wide: 
+            fri: Freitag
+            mon: Montag
+            sat: Samstag
+            sun: Sonntag
+            thu: Donnerstag
+            tue: Dienstag
+            wed: Mittwoch
+        stand-alone: 
+          abbreviated: :"calendars.gregorian.days.format.abbreviated"
+          narrow: 
+            fri: F
+            mon: M
+            sat: S
+            sun: S
+            thu: D
+            tue: D
+            wed: M
+          wide: :"calendars.gregorian.days.format.wide"
+      fields: 
+        day: Tag
+        dayperiod: Tageshälfte
+        era: Epoche
+        hour: Stunde
+        minute: Minute
+        month: Monat
+        second: Sekunde
+        week: Woche
+        weekday: Wochentag
+        year: Jahr
+        zone: Zone
+      formats: 
+        date: 
+          default: :"calendars.gregorian.formats.date.medium"
+          full: 
+            pattern: "EEEE, d. MMMM y"
+          long: 
+            pattern: "d. MMMM y"
+          medium: 
+            pattern: dd.MM.yyyy
+          short: 
+            pattern: dd.MM.yy
+        datetime: 
+          default: :"calendars.gregorian.formats.datetime.medium"
+          full: 
+            pattern: "{{date}} {{time}}"
+          long: 
+            pattern: "{{date}} {{time}}"
+          medium: 
+            pattern: "{{date}} {{time}}"
+          short: 
+            pattern: "{{date}} {{time}}"
+        time: 
+          default: :"calendars.gregorian.formats.time.medium"
+          full: 
+            pattern: "HH:mm:ss zzzz"
+          long: 
+            pattern: "HH:mm:ss z"
+          medium: 
+            pattern: "HH:mm:ss"
+          short: 
+            pattern: "HH:mm"
+      months: 
+        format: 
+          abbreviated: 
+            1: Jan
+            10: Okt
+            11: Nov
+            12: Dez
+            2: Feb
+            3: Mär
+            4: Apr
+            5: Mai
+            6: Jun
+            7: Jul
+            8: Aug
+            9: Sep
+          narrow: :"calendars.gregorian.months.stand-alone.narrow"
+          wide: 
+            1: Januar
+            10: Oktober
+            11: November
+            12: Dezember
+            2: Februar
+            3: März
+            4: April
+            5: Mai
+            6: Juni
+            7: Juli
+            8: August
+            9: September
+        stand-alone: 
+          abbreviated: 
+            10: Okt
+            11: Nov
+            12: Dez
+            3: Mär
+            7: Jul
+            8: Aug
+            9: Sep
+          narrow: 
+            1: J
+            10: O
+            11: N
+            12: D
+            2: F
+            3: M
+            4: A
+            5: M
+            6: J
+            7: J
+            8: A
+            9: S
+          wide: :"calendars.gregorian.months.format.wide"
+      periods: 
+        am: vorm.
+        pm: nachm.
+      quarters: 
+        format: 
+          abbreviated: 
+            1: Q1
+            2: Q2
+            3: Q3
+            4: Q4
+          narrow: :"calendars.gregorian.quarters.stand-alone.narrow"
+          wide: 
+            1: "1. Quartal"
+            2: "2. Quartal"
+            3: "3. Quartal"
+            4: "4. Quartal"
+        stand-alone: 
+          abbreviated: :"calendars.gregorian.quarters.format.abbreviated"
+          narrow: 
+            1: 1
+            2: 2
+            3: 3
+            4: 4
+          wide: :"calendars.gregorian.quarters.format.wide"

data/test/test_data/locales/cldr/de/currencies.yml

@@ -0,0 +1,8 @@
+de: 
+  currencies: 
+    EUR: 
+      one: Euro
+      other: Euro
+    IEP: 
+      one: "Irisches Pfund"
+      other: "Irische Pfund"

data/test/test_data/locales/cldr/de/numbers.yml

@@ -0,0 +1,31 @@
+de: 
+  numbers: 
+    formats: 
+      currency: 
+        patterns: 
+          default: "#,##0.00 ¤"
+        unit: 
+          one: "{0} {1}"
+          other: "{0} {1}"
+      decimal: 
+        patterns: 
+          default: "#,##0.###"
+      percent: 
+        patterns: 
+          default: "#,##0 %"
+      scientific: 
+        patterns: 
+          default: "#E0"
+    symbols: 
+      decimal: ","
+      exponential: E
+      group: "."
+      infinity: ∞
+      list: ;
+      minus_sign: "-"
+      nan: NaN
+      native_zero_digit: 0
+      pattern_digit: "#"
+      per_mille: ‰
+      percent_sign: "%"
+      plus_sign: +

data/test/test_helper.rb

@@ -1,7 +1,10 @@
 # encoding: utf-8
 
+$KCODE = 'u' unless RUBY_VERSION >= '1.9'
+
 $:.unshift File.expand_path("../lib", File.dirname(__FILE__))
-$:.unshift File.expand_path(File.dirname(__FILE__))
+$:.unshift(File.expand_path(File.dirname(__FILE__)))
+$:.uniq!
 
 require 'i18n'
 require 'i18n/core_ext/object/meta_class'
@@ -11,29 +14,33 @@ require 'test/unit'
 require 'time'
 require 'yaml'
 
+# Overwrite *gem* to not load i18n gem by libraries like active_support
+def gem(gem_name, *version_requirements)
+  if gem_name =='i18n'
+    puts "Skiping loading i18n gem..."
+    return
+  end
+  super(gem_name, *version_requirements)
+end unless RUBY_VERSION >= '1.9' # TODO fix this for 1.9. gives a super ugly seg fault
+
 begin
   require 'mocha'
 rescue LoadError
   puts "skipping tests using mocha as mocha can't be found"
 end
 
-
-Dir[File.dirname(__FILE__) + '/api/**/*.rb'].each do |filename|
-  require filename
-end
-
-$KCODE = 'u' unless RUBY_VERSION >= '1.9'
-
-# 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)
+    test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
+    defined = instance_method(test_name) rescue false
+    raise "#{test_name} is already defined in #{self}" if defined
+    if block_given?
+      define_method(test_name, &block)
+    else
+      define_method(test_name) do
+        flunk "No implementation provided for #{name}"
+      end
+    end
   end
 
   def self.with_mocha
@@ -59,7 +66,7 @@ class Test::Unit::TestCase
   end
 
   def locales_dir
-    File.dirname(__FILE__) + '/fixtures/locales'
+    File.dirname(__FILE__) + '/test_data/locales'
   end
 
   def euc_jp(string)
@@ -72,29 +79,35 @@ class Test::Unit::TestCase
   end
 end
 
-def setup_active_record
+def require_active_record!
   begin
-    require 'activerecord'
+    require 'active_record'
+    ActiveRecord::Base.connection
+    true
+  rescue ActiveRecord::ConnectionNotEstablished
     require 'i18n/backend/active_record'
     require 'i18n/backend/active_record/store_procs'
-
-    if I18n::Backend::Simple.method_defined?(:interpolate_with_deprecated_syntax)
-      I18n::Backend::Simple.send(:remove_method, :interpolate) rescue NameError
-    end
-
-    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
-
+    setup_active_record
+    true
   rescue LoadError
     puts "skipping tests using activerecord as activerecord can't be found"
   end
 end
+
+def setup_active_record
+  if I18n::Backend::Simple.method_defined?(:interpolate_with_deprecated_syntax)
+    I18n::Backend::Simple.send(:remove_method, :interpolate) rescue NameError
+  end
+
+  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
+end