r18n-core 0.4.8 → 0.4.9

data/spec/filters_spec.rb

@@ -28,12 +28,15 @@ describe R18n::Filters do
     filter.should be_enabled
     
     R18n::Filters.defined.should have_key(:my_filter)
+    
+    @i18n.reload!
     @i18n.my_filter.should == 'value'
     @i18n.my_tree_filter.should == {'name' => 'value'}
   end
   
   it "should add filter for several types" do
     filter = R18n::Filters.add(['my', 'your']) { |i, config| i + '1' }
+    @i18n.reload!
     @i18n.my_filter.should   == 'value1'
     @i18n.your_filter.should == 'another1'
   end

data/spec/locale_spec.rb

@@ -85,17 +85,17 @@ describe R18n::Locale do
   end
   
   it "should localize date for human" do
-    i18n = R18n::I18n.new('ru')
+    i18n = R18n::I18n.new('en')
     
-    @ru.localize(Date.today + 2, :human, i18n).should == 'через 2 дня'
-    @ru.localize(Date.today + 1, :human, i18n).should == 'завтра'
-    @ru.localize(Date.today,     :human, i18n).should == 'сегодня'
-    @ru.localize(Date.today - 1, :human, i18n).should == 'вчера'
-    @ru.localize(Date.today - 3, :human, i18n).should == '3 дня назад'
+    @en.localize(Date.today + 2, :human, i18n).should == 'after 2 days'
+    @en.localize(Date.today + 1, :human, i18n).should == 'tomorrow'
+    @en.localize(Date.today,     :human, i18n).should == 'today'
+    @en.localize(Date.today - 1, :human, i18n).should == 'yesterday'
+    @en.localize(Date.today - 3, :human, i18n).should == '3 days ago'
     
-    y2000 = Date.parse('2000-01-08')
-    @ru.localize(y2000, :human, i18n, y2000 + 8  ).should == ' 8 января'
-    @ru.localize(y2000, :human, i18n, y2000 - 365).should == ' 8 января 2000'
+    y2k = Date.parse('2000-01-08')
+    @en.localize(y2k, :human, i18n, y2k + 8  ).should == '8th of January'
+    @en.localize(y2k, :human, i18n, y2k - 365).should == '8th of January, 2000'
   end
   
   it "should localize times for human" do
@@ -103,23 +103,24 @@ describe R18n::Locale do
     hour   = 60 * minute
     day    = 24 * hour
     zero   = Time.at(0).utc
-    params = [:human, R18n::I18n.new('ru'), zero]
+    p = [:human, R18n::I18n.new('en'), zero]
     
-    @ru.localize( zero + 7  * day,    *params).should == ' 8 января 00:00'
-    @ru.localize( zero + 50 * hour,   *params).should == 'через 2 дня 02:00'
-    @ru.localize( zero + 25 * hour,   *params).should == 'завтра 01:00'
-    @ru.localize( zero + 70 * minute, *params).should == 'через 1 час'
-    @ru.localize( zero + hour,        *params).should == 'через 1 час'
-    @ru.localize( zero + 38 * minute, *params).should == 'через 38 минут'
-    @ru.localize( zero + 5,           *params).should == 'сейчас'
-    @ru.localize( zero - 15,          *params).should == 'сейчас'
-    @ru.localize( zero - minute,      *params).should == '1 минуту назад'
-    @ru.localize( zero - 2  * hour,   *params).should == '2 часа назад'
-    @ru.localize( zero - 13 * hour,   *params).should == 'вчера 11:00'
-    @ru.localize( zero - 50 * hour,   *params).should == '3 дня назад 22:00'
-    @ru.localize( zero - 9  * day,    *params).should == '23 декабря 1969 00:00'
+    @en.localize( zero + 7  * day,    *p).should == '8th of January 00:00'
+    @en.localize( zero + 50 * hour,   *p).should == 'after 2 days 02:00'
+    @en.localize( zero + 25 * hour,   *p).should == 'tomorrow 01:00'
+    @en.localize( zero + 70 * minute, *p).should == 'after 1 hour'
+    @en.localize( zero + hour,        *p).should == 'after 1 hour'
+    @en.localize( zero + 38 * minute, *p).should == 'after 38 minutes'
+    @en.localize( zero + 5,           *p).should == 'now'
+    @en.localize( zero - 15,          *p).should == 'now'
+    @en.localize( zero - minute,      *p).should == '1 minute ago'
+    @en.localize( zero - hour + 59,   *p).should == '59 minutes ago'
+    @en.localize( zero - 2  * hour,   *p).should == '2 hours ago'
+    @en.localize( zero - 13 * hour,   *p).should == 'yesterday 11:00'
+    @en.localize( zero - 50 * hour,   *p).should == '3 days ago 22:00'
     
-    @ru.localize( zero - 365 * day,   *params).should == ' 1 января 1969 00:00'
+    @en.localize( zero - 9  * day,  *p).should == '23rd of December, 1969 00:00'
+    @en.localize( zero - 365 * day, *p).should == '1st of January, 1969 00:00'
   end
   
   it "should use standard formatter by default" do

data/spec/spec_helper.rb

@@ -37,3 +37,7 @@ class CounterLoader
     @available.hash
   end
 end
+
+if not ENV['test_syck'] and '1.8.' != RUBY_VERSION[0..3]
+  YAML::ENGINE.yamler = 'psych'
+end

data/spec/translated_spec.rb

@@ -7,6 +7,9 @@ describe R18n::Translated do
     @user_class = Class.new do
       include R18n::Translated
       attr_accessor :name_ru, :name_en
+      
+      def name_ru?; end
+      def name_ru!; end
     end
     R18n.set(R18n::I18n.new('en'))
   end
@@ -105,4 +108,29 @@ describe R18n::Translated do
     obj.no.untranslated_path.should == 'no'
   end
   
+  it "should translate virtual methods" do
+    @virtual_class = Class.new do
+      include R18n::Translated
+      translation :no_method, :methods => { :en => :no_method_en }
+      def method_missing(name, *params)
+        name.to_s
+      end
+    end
+    virtual = @virtual_class.new
+    
+    virtual.no_method.should == 'no_method_en'
+  end
+  
+  it "should return original type of result" do
+    @user_class.class_eval do
+      translation :name
+      def name_en
+        :ivan
+      end
+    end
+    user = @user_class.new
+    
+    user.name.should == :ivan
+  end
+  
 end

data/spec/translations/general/en.yml

@@ -10,21 +10,21 @@ in:
 only:
   english: Only in English
 
-sum: !!proc |x, y| x + y
+sum: !!proc "|x, y| x + y"
 
 comments: !!pl
-  0: no comments for %2
-  1: one comment for %2
-  n: %1 comments for %2
+  0: "no comments for %2"
+  1: "one comment for %2"
+  n: "%1 comments for %2"
 
 files: !!pl
-  1: 1 file
-  n: %1 files
+  1: "1 file"
+  n: "%1 files"
 
 your_filter:  !!your another
 my_filter:  !!my value
 my_tree_filter: !!my
-    name: value
+  name: value
 
 html: !!escape
   <script>true && false</script>
@@ -33,8 +33,8 @@ no_escape: !!html
   <b>Warning</b>
 
 markdown:
-  simple: !!markdown **Hi!**
-  html: !!markdown **Hi!** <br />
+  simple: !!markdown "**Hi!**"
+  html: !!markdown "**Hi!** <br />"
 
 textile:
   simple: !!textile _Hi!_

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: r18n-core
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 4
-  - 8
-  version: 0.4.8
+  - 9
+  version: 0.4.9
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 +04:00
+date: 2011-02-06 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -30,90 +30,93 @@ extra_rdoc_files:
 - LICENSE
 - ChangeLog
 files: 
-- base/th.yml
-- base/zh.yml
 - base/eo.yml
+- base/lv.yml
 - base/hu.yml
+- base/pt_br.yml
+- base/en.yml
+- base/da.yml
 - base/pl.yml
-- base/sk.yml
 - base/kk.yml
-- base/es.yml
-- base/da.yml
-- base/fi.yml
-- base/lv.yml
-- base/de.yml
-- base/en.yml
 - base/ca.yml
+- base/de.yml
+- base/cs.yml
+- base/fr.yml
 - base/it.yml
-- base/ru.yml
-- base/pt_br.yml
+- base/fi.yml
+- base/zh.yml
+- base/th.yml
+- base/es.yml
 - base/ja.yml
-- base/fr.yml
-- base/cs.yml
+- base/ru.yml
+- base/sk.yml
+- base/bg.yml
+- lib/r18n-core.rb
+- lib/r18n-core/locale.rb
+- lib/r18n-core/translation.rb
+- lib/r18n-core/translated_string.rb
 - lib/r18n-core/version.rb
 - lib/r18n-core/i18n.rb
+- lib/r18n-core/untranslated.rb
 - lib/r18n-core/translated.rb
-- lib/r18n-core/translation.rb
-- lib/r18n-core/unsupported_locale.rb
+- lib/r18n-core/utils.rb
 - lib/r18n-core/yaml_loader.rb
-- lib/r18n-core/untranslated.rb
-- lib/r18n-core/translated_string.rb
-- lib/r18n-core/filters.rb
+- lib/r18n-core/unsupported_locale.rb
 - lib/r18n-core/helpers.rb
-- lib/r18n-core/utils.rb
-- lib/r18n-core/locale.rb
-- lib/r18n-core.rb
-- locales/pl.rb
+- lib/r18n-core/filters.rb
 - locales/es.rb
-- locales/fi.rb
-- locales/sk.rb
+- locales/lv.rb
+- locales/de.rb
+- locales/kk.rb
+- locales/ca.rb
+- locales/zh.rb
+- locales/bg.rb
+- locales/en-au.rb
+- locales/pt-br.rb
+- locales/pl.rb
+- locales/en.rb
+- locales/hu.rb
 - locales/eo.rb
-- locales/cs.rb
+- locales/sk.rb
 - locales/th.rb
-- locales/it.rb
-- locales/en.rb
-- locales/zh.rb
+- locales/en-gb.rb
 - locales/fr.rb
-- locales/kk.rb
-- locales/lv.rb
-- locales/ru.rb
 - locales/en-us.rb
-- locales/ja.rb
+- locales/ru.rb
 - locales/da.rb
-- locales/en-gb.rb
-- locales/de.rb
-- locales/hu.rb
-- locales/pt-br.rb
-- locales/ca.rb
+- locales/fi.rb
+- locales/it.rb
+- locales/ja.rb
+- locales/cs.rb
 - LICENSE
 - ChangeLog
 - README.rdoc
-- spec/yaml_loader_spec.rb
-- spec/translations/general/no-lc.yml
-- spec/translations/general/en.yml
-- spec/translations/general/ru.yml
-- spec/translations/two/en.yml
-- spec/translations/two/fr.yml
-- spec/translations/extension/no-tr.yml
-- spec/translations/extension/en.yml
-- spec/translations/extension/deep/en.yml
+- spec/translation_spec.rb
+- spec/r18n_spec.rb
 - spec/spec_helper.rb
+- spec/locale_spec.rb
 - spec/i18n_spec.rb
-- spec/translation_spec.rb
-- spec/locales/hu_spec.rb
-- spec/locales/en-us_spec.rb
-- spec/locales/cs_spec.rb
-- spec/locales/sk_spec.rb
-- spec/locales/ru_spec.rb
-- spec/locales/fr_spec.rb
 - spec/locales/th_spec.rb
 - spec/locales/en_spec.rb
+- spec/locales/cs_spec.rb
+- spec/locales/sk_spec.rb
 - spec/locales/it_spec.rb
+- spec/locales/fr_spec.rb
+- spec/locales/en-us_spec.rb
 - spec/locales/pl_spec.rb
-- spec/translated_spec.rb
-- spec/r18n_spec.rb
+- spec/locales/hu_spec.rb
+- spec/locales/ru_spec.rb
+- spec/translations/two/en.yml
+- spec/translations/two/fr.yml
+- spec/translations/general/en.yml
+- spec/translations/general/no-lc.yml
+- spec/translations/general/ru.yml
+- spec/translations/extension/en.yml
+- spec/translations/extension/no-tr.yml
+- spec/translations/extension/deep/en.yml
 - spec/filters_spec.rb
-- spec/locale_spec.rb
+- spec/yaml_loader_spec.rb
+- spec/translated_spec.rb
 has_rdoc: true
 homepage: http://r18n.rubyforge.org/
 licenses: []
@@ -149,29 +152,29 @@ signing_key:
 specification_version: 3
 summary: I18n tool to translate your Ruby application.
 test_files: 
-- spec/yaml_loader_spec.rb
-- spec/translations/general/no-lc.yml
-- spec/translations/general/en.yml
-- spec/translations/general/ru.yml
-- spec/translations/two/en.yml
-- spec/translations/two/fr.yml
-- spec/translations/extension/no-tr.yml
-- spec/translations/extension/en.yml
-- spec/translations/extension/deep/en.yml
+- spec/translation_spec.rb
+- spec/r18n_spec.rb
 - spec/spec_helper.rb
+- spec/locale_spec.rb
 - spec/i18n_spec.rb
-- spec/translation_spec.rb
-- spec/locales/hu_spec.rb
-- spec/locales/en-us_spec.rb
-- spec/locales/cs_spec.rb
-- spec/locales/sk_spec.rb
-- spec/locales/ru_spec.rb
-- spec/locales/fr_spec.rb
 - spec/locales/th_spec.rb
 - spec/locales/en_spec.rb
+- spec/locales/cs_spec.rb
+- spec/locales/sk_spec.rb
 - spec/locales/it_spec.rb
+- spec/locales/fr_spec.rb
+- spec/locales/en-us_spec.rb
 - spec/locales/pl_spec.rb
-- spec/translated_spec.rb
-- spec/r18n_spec.rb
+- spec/locales/hu_spec.rb
+- spec/locales/ru_spec.rb
+- spec/translations/two/en.yml
+- spec/translations/two/fr.yml
+- spec/translations/general/en.yml
+- spec/translations/general/no-lc.yml
+- spec/translations/general/ru.yml
+- spec/translations/extension/en.yml
+- spec/translations/extension/no-tr.yml
+- spec/translations/extension/deep/en.yml
 - spec/filters_spec.rb
-- spec/locale_spec.rb
+- spec/yaml_loader_spec.rb
+- spec/translated_spec.rb