r18n-core 0.2.3 → 0.3

data/spec/translation_spec.rb

@@ -2,46 +2,44 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe R18n::Translation do
+  before :all do
+    @en = R18n::Locale.load('en')
+    @ru = R18n::Locale.load('ru')
+  end
 
   it "should return all available translations" do
-    R18n::Translation.available(DIR).sort.should == ['en', 'no_LC', 'ru']
-    R18n::Translation.available([TWO, DIR]).sort.should == [
-        'en', 'fr', 'no_LC', 'ru']
+    R18n::Translation.available(DIR).should =~ ['en', 'no-lc', 'ru']
+    R18n::Translation.available([TWO, DIR]).should =~ [
+        'en', 'fr', 'no-lc', 'ru']
   end
 
   it "should load translations" do
-    translation = R18n::Translation.load('en', DIR)
+    translation = R18n::Translation.load([@en], DIR)
     translation.one.should == 'One'
     translation['one'].should == 'One'
   end
 
   it "should find in subtranslations" do
-    translation = R18n::Translation.load(['ru', 'en'], DIR)
+    translation = R18n::Translation.load([@ru, @en], DIR)
     translation.one.should == 'Один'
     translation.two.should == 'Two'
   end
 
   it "should return nil if translation isn't found" do
-    translation = R18n::Translation.load('en', DIR)
+    translation = R18n::Translation.load([@en], DIR)
     translation.not.exists.should be_nil
     translation['not']['exists'].should be_nil
   end
 
-  it "should can use params in translation" do
-    translation = R18n::Translation.load('en', DIR)
-    translation.params(1, 2).should == 'Is 1 between 1 and 2?'
-    translation['params', 1, 2].should == 'Is 1 between 1 and 2?'
-  end
-
   it "should load use hierarchical translations" do
-    translation = R18n::Translation.load(['ru', 'en'], DIR)
+    translation = R18n::Translation.load([@ru, @en], DIR)
     translation.in.another.level.should == 'Иерархический'
     translation['in']['another']['level'].should == 'Иерархический'
     translation.only.english.should == 'Only in English'
   end
   
   it "should save path for translation" do
-    translation = R18n::Translation.load('en', DIR)
+    translation = R18n::Translation.load([@en], DIR)
     
     translation.in.another.level.path.should == 'in.another.level'
     
@@ -54,21 +52,21 @@ describe R18n::Translation do
   end
 
   it "should return string with locale info" do
-    translation = R18n::Translation.load(['no_LC', 'en'], DIR)
-    translation.one.locale.should == R18n::UnsupportedLocale.new('no_LC')
+    translation = R18n::Translation.load([R18n::Locale.load('no-LC'), @en], DIR)
+    translation.one.locale.should == R18n::UnsupportedLocale.new('no-LC')
     translation.two.locale.should == R18n::Locale.load('en')
   end
 
   it "should load translations from several dirs" do
-    translation = R18n::Translation.load(['no_LC', 'en'], [TWO, DIR])
-    translation.in.two.should == 'Two'
-    translation.in.another.level.should == 'Hierarchical'
+    tr = R18n::Translation.load([R18n::Locale.load('no-LC'), @en], [TWO, DIR])
+    tr.in.two.should == 'Two'
+    tr.in.another.level.should == 'Hierarchical'
   end
 
   it "should use extension translations" do
     R18n::Translation.extension_translations << EXT
     
-    translation = R18n::Translation.load('en', DIR)
+    translation = R18n::Translation.load([@en], DIR)
     translation.ext.should == 'Extension'
     translation.one.should == 'One'
   end
@@ -76,46 +74,16 @@ describe R18n::Translation do
   it "shouldn't use extension without app translations with same locale" do
     R18n::Translation.extension_translations << EXT
     
-    translation = R18n::Translation.load(['no_TR', 'en'], DIR)
+    translation = R18n::Translation.load([R18n::Locale.load('no-TR'), @en], DIR)
     translation.ext.should == 'Extension'
   end
-
-  it "should call proc in translation" do
-    translation = R18n::Translation.load('en', DIR)
-    translation.sum(2, 3).should == 5
-  end
   
-  it "shouldn't call proc if it isn't secure" do
-    translation = R18n::Translation.load('en', DIR)
-    R18n::Translation.call_proc = false
-    R18n::Translation.call_proc.should be_false
-    translation.sum(2, 3).should == '|x, y| x + y'
-    R18n::Translation.call_proc = true
-  end
-
-  it "should pluralize translation" do
-    translation = R18n::Translation.load('en', DIR)
-    translation.comments(0, 'article').should == 'no comments for article'
-    translation.comments(1, 'article').should == 'one comment for article'
-    translation.comments(5, 'article').should == '5 comments for article'
-    
-    translation.files(0).should == '0 files'
-    translation.files(-5.5).should == '−5.5 files'
-    translation.files(5000).should == '5,000 files'
-  end
-
-  it "should return unknown YAML type" do
-    translation = R18n::Translation.load('en', DIR)
+  it "should ignore case on loading" do
+    translation = R18n::Translation.load([R18n::Locale.load('no-lc')], [DIR])
+    translation.one.should == 'ONE'
     
-    translation.my_type.class.should == YAML::PrivateType
-    translation.my_type.type_id.should == 'special_type'
-    translation.my_type.value.should == {'attr' => 'value'}
-  end
-
-  it "should pluralize translation without locale" do
-    translation = R18n::Translation.load('no_LC', DIR)
-    translation.entries(1).should == 'ONE'
-    translation.entries(5).should == 'N'
+    translation = R18n::Translation.load([R18n::Locale.load('no-LC')], [DIR])
+    translation.one.should == 'ONE'
   end
 
 end

data/spec/translations/general/en.yml

@@ -21,5 +21,18 @@ files: !!pl
   1: 1 file
   n: %1 files
 
-my_type: !!special_type
-  attr: value
+my_filter:  !!my value
+my_tree_filter: !!my
+    name: value
+
+unknown_filter: !!unknown value
+
+html: !!escape
+  <script>true && false</script>
+greater: 1 < 2 is true
+no_escape: !!html
+  <b>Warning</b>
+
+markdown: !!markdown **Hi!**
+
+textile: !!textile _Hi!_

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: r18n-core
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: "0.3"
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-22 00:00:00 +08:00
+date: 2009-09-26 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
-description: R18n is a i18n tool to translate your Ruby application. It can format numbers and time to the rules of the user locale, has translation for common words, storage translation in YAML format with pluralization and procedures and has special support for countries with two official languages.
+description: R18n is a i18n tool to translate your Ruby application. It can format numbers and time to the rules of the user locale, has translation for common words, storage translation in YAML format with pluralization, procedures and user filters and has special support for countries with two official languages.
 email: andrey@sitnik.ru
 executables: []
 
@@ -23,32 +23,41 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
-- base/de.yml
-- base/en.yml
+- base/ru.yml
+- base/kk.yml
 - base/fr.yml
+- base/en.yml
 - base/pl.yml
-- base/ru.yml
+- base/de.yml
+- base/cs.yml
 - base/eo.yml
-- base/kk.yml
-- lib/r18n-core.rb
 - lib/r18n-core
-- lib/r18n-core/unsupported_locale.rb
-- lib/r18n-core/translation.rb
 - lib/r18n-core/untranslated.rb
+- lib/r18n-core/translated.rb
 - lib/r18n-core/i18n.rb
-- lib/r18n-core/translated_string.rb
 - lib/r18n-core/locale.rb
+- lib/r18n-core/utils.rb
 - lib/r18n-core/version.rb
-- locales/de.yml
-- locales/en.yml
+- lib/r18n-core/translation.rb
+- lib/r18n-core/translated_string.rb
+- lib/r18n-core/filters.rb
+- lib/r18n-core/unsupported_locale.rb
+- lib/r18n-core.rb
 - locales/ru.rb
-- locales/pl.rb
+- locales/ru.yml
+- locales/en.rb
+- locales/kk.yml
 - locales/fr.yml
+- locales/en.yml
 - locales/pl.yml
-- locales/ru.yml
-- locales/en_US.yml
+- locales/de.yml
+- locales/cs.yml
+- locales/fr.rb
+- locales/cs.rb
 - locales/eo.yml
-- locales/kk.yml
+- locales/en-us.rb
+- locales/en-us.yml
+- locales/pl.rb
 - LICENSE
 - README.rdoc
 has_rdoc: true
@@ -78,22 +87,28 @@ signing_key:
 specification_version: 2
 summary: I18n tool to translate your Ruby application.
 test_files: 
-- spec/translations
-- spec/translations/extension
-- spec/translations/extension/no_TR.yml
-- spec/translations/extension/en.yml
-- spec/translations/general
-- spec/translations/general/en.yml
-- spec/translations/general/no_LC.yml
-- spec/translations/general/ru.yml
-- spec/translations/two
-- spec/translations/two/en.yml
-- spec/translations/two/fr.yml
 - spec/locales
+- spec/locales/en_spec.rb
 - spec/locales/pl_spec.rb
+- spec/locales/cs_spec.rb
+- spec/locales/en-us_spec.rb
+- spec/locales/fr_spec.rb
 - spec/locales/ru_spec.rb
-- spec/locale_spec.rb
-- spec/i18n_spec.rb
-- spec/r18n_spec.rb
 - spec/spec_helper.rb
+- spec/translations
+- spec/translations/two
+- spec/translations/two/fr.yml
+- spec/translations/two/en.yml
+- spec/translations/general
+- spec/translations/general/ru.yml
+- spec/translations/general/en.yml
+- spec/translations/general/no-lc.yml
+- spec/translations/extension
+- spec/translations/extension/no-tr.yml
+- spec/translations/extension/en.yml
 - spec/translation_spec.rb
+- spec/r18n_spec.rb
+- spec/filters_spec.rb
+- spec/locale_spec.rb
+- spec/i18n_spec.rb
+- spec/translated_spec.rb

data/locales/en_US.yml

@@ -1,14 +0,0 @@
-include: en
-
-code: en_US
-title: English (US)
-sublocales: [en]
-
-formats:
-  time: "%H:%M"
-  date: "%m/%d/%Y"
-  short_date: "%b %d"
-  long_date: "%B %d, %Y"
-  datetime: "%a %b %d %H:%M:%S %Z %Y"
-  short_datetime: "%b %d %H:%M"
-  long_datetime: "%B %d, %Y %H:%M"