r18n-core 1.1.6 → 1.1.7

data/spec/locale_spec.rb

@@ -8,17 +8,17 @@ describe R18n::Locale do
     @en = R18n.locale('en')
   end
 
-  it "should return all available locales" do
+  it "returns all available locales" do
     R18n::Locale.available.class.should == Array
     R18n::Locale.available.should_not be_empty
   end
 
-  it "should check is locale exists" do
+  it "checks is locale exists" do
     R18n::Locale.exists?('ru').should be_true
     R18n::Locale.exists?('nolocale').should be_false
   end
 
-  it "should set locale properties" do
+  it "sets locale properties" do
     locale_class = Class.new(R18n::Locale) do
       set :one => 1
       set :two => 2
@@ -28,32 +28,32 @@ describe R18n::Locale do
     locale.two.should == 2
   end
 
-  it "should load locale" do
+  it "loads locale" do
     @ru.class.should == R18n::Locales::Ru
     @ru.code.should  == 'ru'
     @ru.title.should == 'Русский'
   end
 
-  it "should load locale by Symbol" do
+  it "loads locale by Symbol" do
     R18n.locale(:ru).should == R18n.locale('ru')
   end
 
-  it "should be equal to another locale with same code" do
+  it "equals to another locale with same code" do
     @en.should_not == @ru
     @en.should == R18n.locale('en')
   end
 
-  it "should print human readable representation" do
+  it "prints human readable representation" do
     @ru.inspect.should == 'Locale ru (Русский)'
   end
 
-  it "should return pluralization type by elements count" do
+  it "returns pluralization type by elements count" do
     @en.pluralize(0).should == 0
     @en.pluralize(1).should == 1
     @en.pluralize(5).should == 'n'
   end
 
-  it "should use UnsupportedLocale if locale file isn't exists" do
+  it "uses UnsupportedLocale if locale file isn't exists" do
     @en.should be_supported
 
     unsupported = R18n.locale('nolocale-DL')
@@ -68,16 +68,16 @@ describe R18n::Locale do
     unsupported.inspect.downcase.should == 'unsupported locale nolocale-dl'
   end
 
-  it "should format number in local traditions" do
+  it "formats number in local traditions" do
     @en.localize(-123456789).should == "−123,456,789"
   end
 
-  it "should format float in local traditions" do
+  it "formats float in local traditions" do
     @en.localize(-12345.67).should == "−12,345.67"
     @en.localize(BigDecimal.new("-12345.67")).should == "−12,345.67"
   end
 
-  it "should translate month, week days and am/pm names in strftime" do
+  it "translates month, week days and am/pm names in strftime" do
     i18n = R18n::I18n.new('ru')
     time = Time.at(0).utc
 
@@ -86,12 +86,12 @@ describe R18n::Locale do
     @ru.localize(time, '%H:%M%p').should == '00:00 утра'
   end
 
-  it "should generate locale code by locale class name" do
+  it "generates locale code by locale class name" do
     R18n.locale('ru').code.should    == 'ru'
     R18n.locale('zh-CN').code.should == 'zh-CN'
   end
 
-  it "should localize date for human" do
+  it "localizes date for human" do
     i18n = R18n::I18n.new('en')
 
     @en.localize(Date.today + 2, :human, i18n).should == 'after 2 days'
@@ -105,7 +105,7 @@ describe R18n::Locale do
     @en.localize(y2k, :human, i18n, y2k - 365).should == '8th of January, 2000'
   end
 
-  it "should localize times for human" do
+  it "localizes times for human" do
     minute = 60
     hour   = 60 * minute
     day    = 24 * hour
@@ -130,29 +130,29 @@ describe R18n::Locale do
     @en.localize( zero - 365 * day, *p).should == '1st of January, 1969 00:00'
   end
 
-  it "should use standard formatter by default" do
+  it "uses standard formatter by default" do
     @ru.localize(Time.at(0).utc).should == '01.01.1970 00:00'
   end
 
-  it "shouldn't localize time without i18n object" do
+  it "doesn't localize time without i18n object" do
     @ru.localize(Time.at(0)).should_not == Time.at(0).to_s
     @ru.localize(Time.at(0), :full).should_not == Time.at(0).to_s
 
     @ru.localize(Time.at(0), :human).should == Time.at(0).to_s
   end
 
-  it "should raise error on unknown formatter" do
+  it "raises error on unknown formatter" do
     lambda {
       @ru.localize(Time.at(0).utc, R18n::I18n.new('ru'), :unknown)
     }.should raise_error(ArgumentError, /formatter/)
   end
 
-  it "should delete slashed from locale for security reasons" do
+  it "deletes slashed from locale for security reasons" do
     locale = R18n.locale('../spec/translations/general/en')
     locale.should be_a(R18n::UnsupportedLocale)
   end
 
-  it "should ignore code case in locales" do
+  it "ignores code case in locales" do
     upcase   = R18n.locale('RU')
     downcase = R18n.locale('ru')
     upcase.should == downcase
@@ -166,7 +166,7 @@ describe R18n::Locale do
     downcase.code.should == 'nolocale'
   end
 
-  it "should load locale with underscore" do
+  it "loads locale with underscore" do
     R18n.locale('nolocale-DL').code.should == 'nolocale-dl'
   end
 

data/spec/locales/cs_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Cs do
-  it "should use Czech pluralization" do
+  it "uses Czech pluralization" do
     cs = R18n.locale('cs')
     cs.pluralize(0).should == 0
     cs.pluralize(1).should == 1

data/spec/locales/en-us_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::EnUs do
-  it "should format American English date" do
+  it "formats American English date" do
     enUS = R18n::I18n.new('en-US')
     enUS.l(Date.parse('2009-05-01'), :full).should ==  'May 1st, 2009'
     enUS.l(Date.parse('2009-05-02'), :full).should ==  'May 2nd, 2009'

data/spec/locales/en_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::En do
-  it "should format English date" do
+  it "formats English date" do
     en = R18n::I18n.new('en')
     en.l(Date.parse('2009-05-01'), :full).should ==  '1st of May, 2009'
     en.l(Date.parse('2009-05-02'), :full).should ==  '2nd of May, 2009'

data/spec/locales/fr_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Fr do
-  it "should format French date" do
+  it "formats French date" do
     fr = R18n::I18n.new('fr')
     fr.l(Date.parse('2009-07-01'), :full).should ==  '1er juillet 2009'
     fr.l(Date.parse('2009-07-02'), :full).should ==  ' 2 juillet 2009'

data/spec/locales/hu_spec.rb

@@ -2,7 +2,7 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Hu do
-  it "should use Hungarian digits groups" do
+  it "uses Hungarian digits groups" do
     hu = R18n::I18n.new('hu')
     hu.l(1000).should   ==  '1000'
     hu.l(10000).should  ==  '10 000'
@@ -10,7 +10,7 @@ describe R18n::Locales::Hu do
     hu.l(100000).should ==  '100 000'
   end
 
-  it "should use Hungarian time format" do
+  it "uses Hungarian time format" do
     hu = R18n::I18n.new('hu')
     hu.l(Time.at(0).utc).should        == '1970. 01. 01., 00:00'
     hu.l(Time.at(0).utc, :full).should == '1970. január  1., 00:00'

data/spec/locales/it_spec.rb

@@ -2,7 +2,7 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::It do
-  it "should format Italian date" do
+  it "formats Italian date" do
     italian = R18n::I18n.new('it')
     italian.l(Date.parse('2009-07-01'), :full).should == "1º luglio 2009"
     italian.l(Date.parse('2009-07-02'), :full).should == ' 2 luglio 2009'

data/spec/locales/pl_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Pl do
-  it "should use Polish pluralization" do
+  it "uses Polish pluralization" do
     pl = R18n.locale('pl')
     pl.pluralize(0).should == 0
     pl.pluralize(1).should == 1

data/spec/locales/ru_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Ru do
-  it "should use Russian pluralization" do
+  it "uses Russian pluralization" do
     ru = R18n.locale('ru')
     ru.pluralize(0).should == 0
 

data/spec/locales/sk_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Sk do
-  it "should use Slovak pluralization" do
+  it "uses Slovak pluralization" do
     sk = R18n.locale('Sk')
     sk.pluralize(0).should == 0
     sk.pluralize(1).should == 1

data/spec/locales/th_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Ru do
-  it "should use Thai calendar" do
+  it "uses Thai calendar" do
     th = R18n::I18n.new('th')
     th.l(Time.at(0).utc, '%Y %y').should ==  '2513 13'
     th.l(Time.at(0).utc).should == '01/01/2513 00:00'

data/spec/r18n_spec.rb

@@ -10,7 +10,7 @@ describe R18n do
     R18n.reset!
   end
 
-  it "should store I18n" do
+  it "stores I18n" do
     i18n = R18n::I18n.new('en')
     R18n.set(i18n)
     R18n.get.should == i18n
@@ -19,7 +19,7 @@ describe R18n do
     R18n.get.should be_nil
   end
 
-  it "should set setter to I18n" do
+  it "sets setter to I18n" do
     i18n = R18n::I18n.new('en')
     R18n.set(i18n)
 
@@ -29,25 +29,25 @@ describe R18n do
     R18n.get.should == i18n
   end
 
-  it "shuld create I18n object by shortcut" do
+  it "creates I18n object by shortcut" do
     R18n.set('en', DIR)
     R18n.get.should be_a(R18n::I18n)
     R18n.get.locales.should == [R18n.locale('en')]
     R18n.get.translation_places.should == [R18n::Loader::YAML.new(DIR)]
   end
 
-  it "should allow to return I18n arguments in setter block" do
+  it "allows to return I18n arguments in setter block" do
     R18n.set { 'en' }
     R18n.get.locales.should == [R18n.locale('en')]
   end
 
-  it "should clear cache" do
+  it "clears cache" do
     R18n.cache[:a] = 1
     R18n.clear_cache!
     R18n.cache.should be_empty
   end
 
-  it "should reset I18n objects and cache" do
+  it "resets I18n objects and cache" do
     R18n.cache[:a] = 1
     R18n.set('en')
     R18n.thread_set('en')
@@ -57,7 +57,7 @@ describe R18n do
     R18n.cache.should be_empty
   end
 
-  it "should store I18n via thread_set" do
+  it "stores I18n via thread_set" do
     i18n = R18n::I18n.new('en')
     R18n.thread_set(i18n)
     R18n.get.should == i18n
@@ -67,36 +67,36 @@ describe R18n do
     R18n.get.should == i18n
   end
 
-  it "should allow to temporary change locale" do
+  it "allows to temporary change locale" do
     R18n.default_places = DIR
     R18n.change('en').locales.should == [R18n.locale('en')]
     R18n.change('en').should have(1).translation_places
     R18n.change('en').translation_places.first.dir.should == DIR.to_s
   end
 
-  it "should allow to temporary change current locales" do
+  it "allows to temporary change current locales" do
     R18n.set('ru')
     R18n.change('en').locales.should == [R18n.locale('en'), R18n.locale('ru')]
     R18n.change('en').translation_places.should == R18n.get.translation_places
     R18n.get.locale.code.should.should == 'ru'
   end
 
-  it "should allow to get Locale to temporary change" do
+  it "allows to get Locale to temporary change" do
     R18n.set('ru')
     R18n.change(R18n.locale('en')).locale.code.should == 'en'
   end
 
-  it "should have shortcut to load locale" do
+  it "has shortcut to load locale" do
     R18n.locale('ru').should == R18n::Locale.load('ru')
   end
 
-  it "should store default loader class" do
+  it "stores default loader class" do
     R18n.default_loader.should == R18n::Loader::YAML
     R18n.default_loader = Class
     R18n.default_loader.should == Class
   end
 
-  it "should store cache" do
+  it "stores cache" do
     R18n.cache.should be_a(Hash)
 
     R18n.cache = { 1 => 2 }
@@ -106,16 +106,16 @@ describe R18n do
     R18n.cache.should == { }
   end
 
-  it "should convert Time to Date" do
-      R18n::Utils.to_date(Time.now).should == Date.today
+  it "converts Time to Date" do
+    R18n::Utils.to_date(Time.now).should == Date.today
   end
 
-  it "should map hash" do
+  it "maps hash" do
     R18n::Utils.hash_map({'a' => 1, 'b' => 2}) { |k, v| [k + 'a', v + 1] }.
       should == { 'aa' => 2, 'ba' => 3 }
   end
 
-  it "should merge hash recursively" do
+  it "merges hash recursively" do
     a = { :a => 1, :b => {:ba => 1, :bb => 1}, :c => 1 }
     b = {          :b => {:bb => 2, :bc => 2}, :c => 2 }
 
@@ -123,13 +123,13 @@ describe R18n do
     a.should == { :a => 1, :b => { :ba => 1, :bb => 2, :bc => 2 }, :c => 2 }
   end
 
-  it "should have l and t methods" do
+  it "has l and t methods" do
     R18n.set('en')
     t.yes.should == 'Yes'
     l(Time.at(0).utc).should == '01/01/1970 00:00'
   end
 
-  it "should have helpers mixin" do
+  it "has helpers mixin" do
     obj = R18n::I18n.new('en')
     R18n.set(obj)
 
@@ -139,13 +139,13 @@ describe R18n do
     l(Time.at(0).utc).should == '01/01/1970 00:00'
   end
 
-  it "should return available translations" do
+  it "returns available translations" do
     R18n.available_locales(DIR).should =~ [R18n.locale('nolocale'),
                                            R18n.locale('ru'),
                                            R18n.locale('en')]
   end
 
-  it "should use default places" do
+  it "uses default places" do
     R18n.default_places = DIR
     R18n.set('en')
     t.one.should == 'One'
@@ -154,12 +154,12 @@ describe R18n do
                                       R18n.locale('nolocale')]
   end
 
-  it "should set default places by block" do
+  it "sets default places by block" do
     R18n.default_places { DIR }
     R18n.default_places.should == DIR
   end
 
-  it "should allow to ignore default places" do
+  it "allows to ignore default places" do
     R18n.default_places = DIR
     i18n = R18n::I18n.new('en', nil)
     i18n.one.should_not be_translated

data/spec/translated_spec.rb

@@ -13,13 +13,13 @@ describe R18n::Translated do
     R18n.set('en')
   end
 
-  it "should save methods map" do
+  it "saves methods map" do
     @user_class.translation :name, :methods => { :ru => :name_ru }
     @user_class.unlocalized_getters(:name).should == { 'ru' => 'name_ru' }
     @user_class.unlocalized_setters(:name).should == { 'ru' => 'name_ru=' }
   end
 
-  it "should autodetect methods map" do
+  it "autodetects methods map" do
     @user_class.translation :name
     @user_class.unlocalized_getters(:name).should == {
         'en' => 'name_en', 'ru' => 'name_ru' }
@@ -27,11 +27,10 @@ describe R18n::Translated do
         'en' => 'name_en=', 'ru' => 'name_ru=' }
   end
 
-  it "should translate methods" do
+  it "translates methods" do
     @user_class.translation :name
     user = @user_class.new
 
-    user.name.should_not be_translated
     user.name = 'John'
     user.name.should == 'John'
 
@@ -41,7 +40,7 @@ describe R18n::Translated do
     user.name.should == 'Джон'
   end
 
-  it "should return TranslatedString" do
+  it "returns TranslatedString" do
     class ::SomeTranslatedClass
       include R18n::Translated
       def name_en; 'John'; end
@@ -54,7 +53,7 @@ describe R18n::Translated do
     obj.name.path.should == 'SomeTranslatedClass#name'
   end
 
-  it "should search translation by locales priority" do
+  it "searchs translation by locales priority" do
     @user_class.translation :name
     user = @user_class.new
 
@@ -63,7 +62,7 @@ describe R18n::Translated do
     user.name.locale.should == R18n.locale('ru')
   end
 
-  it "should use default locale" do
+  it "uses default locale" do
     @user_class.translation :name
     user = @user_class.new
 
@@ -72,7 +71,7 @@ describe R18n::Translated do
     user.name.locale.should == R18n.locale('en')
   end
 
-  it "should use filters" do
+  it "uses filters" do
     @user_class.class_eval do
       def age_en; {1 => '%1 year', 'n' => '%1 years'} end
       translation :age, :type => 'pl', :no_params => true
@@ -82,7 +81,7 @@ describe R18n::Translated do
     user.age(20).should == '20 years'
   end
 
-  it "should send params to method if user want it" do
+  it "sends params to method if user want it" do
     @user_class.class_eval do
       def no_params_en(*params) params.join(' '); end
       def params_en(*params)    params.join(' '); end
@@ -94,20 +93,7 @@ describe R18n::Translated do
     user.params(1, 2).should == '1 2'
   end
 
-  it "should return Untranslated when can't find translation" do
-    class ::SomeUntranslatedClass
-      include R18n::Translated
-
-      translation :no
-    end
-    obj = ::SomeUntranslatedClass.new
-
-    obj.no.should be_a(R18n::Untranslated)
-    obj.no.translated_path.should == 'SomeUntranslatedClass#'
-    obj.no.untranslated_path.should == 'no'
-  end
-
-  it "should translate virtual methods" do
+  it "translates virtual methods" do
     @virtual_class = Class.new do
       include R18n::Translated
       translation :no_method, :methods => { :en => :no_method_en }
@@ -120,7 +106,7 @@ describe R18n::Translated do
     virtual.no_method.should == 'no_method_en'
   end
 
-  it "should return original type of result" do
+  it "returns original type of result" do
     @user_class.class_eval do
       translation :name
       def name_en
@@ -132,7 +118,19 @@ describe R18n::Translated do
     user.name.should == :ivan
   end
 
-  it "should allow to change I18n object" do
+  it "returns nil" do
+    @user_class.class_eval do
+      translation :name
+      def name_en
+        nil
+      end
+    end
+    user = @user_class.new
+
+    user.name.should be_nil
+  end
+
+  it "allows to change I18n object" do
     @user_class.class_eval do
       translation :name
       attr_accessor :r18n