r18n-core 0.4.14 → 1.0.0

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'rubygems'
 require 'pp'
 
 dir = Pathname(__FILE__).dirname
@@ -16,7 +15,7 @@ RSpec.configure do |config|
   config.before { R18n.cache.clear }
 end
 
-gem 'maruku'
+gem 'kramdown'
 gem 'RedCloth'
 
 class CounterLoader
@@ -24,7 +23,7 @@ class CounterLoader
   attr_reader :loaded
 
   def initialize(*available)
-    @available = available.map { |i| R18n::Locale.load(i) }
+    @available = available.map { |i| R18n.locale(i) }
     @loaded = 0
   end
 

data/spec/translated_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require File.expand_path('../spec_helper', __FILE__)
-require File.expand_path('../../lib/r18n-core/translated', __FILE__)
 
 describe R18n::Translated do
   before do
@@ -51,7 +50,7 @@ describe R18n::Translated do
     obj = ::SomeTranslatedClass.new
 
     obj.name.should be_a(R18n::TranslatedString)
-    obj.name.locale.should == R18n::Locale.load('en')
+    obj.name.locale.should == R18n.locale('en')
     obj.name.path.should == 'SomeTranslatedClass#name'
   end
 
@@ -61,7 +60,7 @@ describe R18n::Translated do
 
     R18n.set(['no-LC', 'ru', 'en'])
     user.name_ru = 'Иван'
-    user.name.locale.should == R18n::Locale.load('ru')
+    user.name.locale.should == R18n.locale('ru')
   end
 
   it "should use default locale" do
@@ -70,7 +69,7 @@ describe R18n::Translated do
 
     R18n.set('no-LC')
     user.name_en = 'John'
-    user.name.locale.should == R18n::Locale.load('en')
+    user.name.locale.should == R18n.locale('en')
   end
 
   it "should use filters" do
@@ -133,4 +132,19 @@ describe R18n::Translated do
     user.name.should == :ivan
   end
 
+  it "should allow to change I18n object" do
+    @user_class.class_eval do
+      translation :name
+      attr_accessor :r18n
+    end
+    user = @user_class.new
+    user.name_ru = 'Иван'
+    user.name_en = 'John'
+
+    user.r18n = R18n::I18n.new('ru')
+    user.name.should == 'Иван'
+    user.r18n = R18n::I18n.new('en')
+    user.name.should == 'John'
+  end
+
 end

data/spec/translation_spec.rb

@@ -15,6 +15,18 @@ describe R18n::Translation do
     (i18n.one | 'default').should == 'One'
   end
 
+  it "should return html escaped string" do
+    klass = Class.new(R18n::TranslatedString) do
+      def html_safe
+        '2'
+      end
+    end
+    str = klass.new('1', nil, nil)
+
+    str.should be_html_safe
+    str.html_safe.should == '2'
+  end
+
   it "should load use hierarchical translations" do
     i18n = R18n::I18n.new(['ru', 'en'], DIR)
     i18n.in.another.level.should == 'Иерархический'
@@ -38,20 +50,19 @@ describe R18n::Translation do
 
   it "should return translation keys" do
     i18n = R18n::I18n.new('en', [DIR, TWO])
-    i18n.in._keys.should =~ ['another', 'two']
+    i18n.in.translation_keys.should =~ ['another', 'two']
   end
 
   it "should return string with locale info" do
     i18n = R18n::I18n.new(['no-LC', 'en'], DIR)
     i18n.one.locale.should == R18n::UnsupportedLocale.new('no-LC')
-    i18n.two.locale.should == R18n::Locale.load('en')
+    i18n.two.locale.should == R18n.locale('en')
   end
 
   it "should filter typed data" do
-    en = R18n::Locale.load('en')
-    translation = R18n::Translation.new(en, '', en, {
-      'count' => R18n::Typed.new('pl', { 1 => 'one', 'n' => 'many' })
-    })
+    en = R18n.locale('en')
+    translation = R18n::Translation.new(en, '', :locale => en, :translations =>
+      { 'count' => R18n::Typed.new('pl', { 1 => 'one', 'n' => 'many' }) })
 
     translation.count(1).should == 'one'
     translation.count(5).should == 'many'

data/spec/translations/general/en.yml

@@ -31,6 +31,7 @@ html: !!escape
 greater: 1 < 2 is %1
 no_escape: !!html
   <b>Warning</b>
+escape_params: <b>%1</b>
 
 markdown:
   simple: !!markdown "**Hi!**"

data/spec/yaml_loader_spec.rb

@@ -24,13 +24,13 @@ describe R18n::Loader::YAML do
   end
 
   it "should return all available translations" do
-    @loader.available.should =~ [R18n::Locale.load('ru'),
-                                 R18n::Locale.load('en'),
-                                 R18n::Locale.load('no-lc')]
+    @loader.available.should =~ [R18n.locale('ru'),
+                                 R18n.locale('en'),
+                                 R18n.locale('no-lc')]
   end
 
   it "should load translation" do
-    @loader.load(R18n::Locale.load('ru')).should == {
+    @loader.load(R18n.locale('ru')).should == {
       'one' => 'Один', 'in' => {'another' => {'level' => 'Иерархический'}},
       'typed' => R18n::Typed.new('my', 'value') }
   end
@@ -41,13 +41,13 @@ describe R18n::Loader::YAML do
 
   it "should load in dir recursively" do
     loader = R18n::Loader::YAML.new(TRANSLATIONS)
-    loader.available.should =~ [R18n::Locale.load('ru'),
-                                R18n::Locale.load('en'),
-                                R18n::Locale.load('fr'),
-                                R18n::Locale.load('no-tr'),
-                                R18n::Locale.load('no-lc')]
+    loader.available.should =~ [R18n.locale('ru'),
+                                R18n.locale('en'),
+                                R18n.locale('fr'),
+                                R18n.locale('no-tr'),
+                                R18n.locale('no-lc')]
 
-    translation = loader.load(R18n::Locale.load('en'))
+    translation = loader.load(R18n.locale('en'))
     translation['two'].should       == 'Two'
     translation['in']['two'].should == 'Two'
     translation['ext'].should       == 'Extension'

metadata

@@ -1,162 +1,184 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: r18n-core
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.0.0
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 14
-  version: 0.4.14
 platform: ruby
-authors: 
+authors:
 - Andrey "A.I." Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :development
+date: 2012-06-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.10
-  prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.10
+- !ruby/object:Gem::Dependency
   name: yard
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-    - - "!="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ! '!='
+      - !ruby/object:Gem::Version
         version: 0.9.0
-  prerelease: false
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
   name: rspec-core
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec-expectations
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec-mocks
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: maruku
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: RedCloth
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: *id008
-description: "    R18n is a i18n tool to translate your Ruby application.\n    It has nice Ruby-style syntax, filters, flexible locales, custom loaders,\n    translation support for any classes, time and number localization, several\n    user language support, agnostic core package with out-of-box support for\n    Rails, Sinatra, Merb and desktop applications.\n"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "    R18n is a i18n tool to translate your Ruby application.\n    It
+  has nice Ruby-style syntax, filters, flexible locales, custom loaders,\n    translation
+  support for any classes, time and number localization, several\n    user language
+  support, agnostic core package with out-of-box support for\n    Rails, Sinatra and
+  desktop applications.\n"
 email: andrey@sitnik.ru
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files:
+- README.md
 - LICENSE
 - ChangeLog
-files: 
+files:
 - .rspec
 - .yardopts
 - ChangeLog
-- Gemfile
-- Gemfile.lock
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - base/bg.yml
 - base/ca.yml
@@ -168,6 +190,7 @@ files:
 - base/es.yml
 - base/fi.yml
 - base/fr.yml
+- base/gl.yml
 - base/hu.yml
 - base/it.yml
 - base/ja.yml
@@ -185,6 +208,7 @@ files:
 - base/uk.yml
 - base/zh.yml
 - lib/r18n-core.rb
+- lib/r18n-core/filter_list.rb
 - lib/r18n-core/filters.rb
 - lib/r18n-core/helpers.rb
 - lib/r18n-core/i18n.rb
@@ -210,6 +234,7 @@ files:
 - locales/es.rb
 - locales/fi.rb
 - locales/fr.rb
+- locales/gl.rb
 - locales/hu.rb
 - locales/it.rb
 - locales/ja.rb
@@ -226,6 +251,8 @@ files:
 - locales/th.rb
 - locales/tr.rb
 - locales/uk.rb
+- locales/zh-cn.rb
+- locales/zh-tw.rb
 - locales/zh.rb
 - r18n-core.gemspec
 - spec/filters_spec.rb
@@ -245,7 +272,6 @@ files:
 - spec/spec_helper.rb
 - spec/translated_spec.rb
 - spec/translation_spec.rb
-- spec/translations/empty/en.yml
 - spec/translations/extension/deep/en.yml
 - spec/translations/extension/en.yml
 - spec/translations/extension/no-tr.yml
@@ -255,39 +281,35 @@ files:
 - spec/translations/two/en.yml
 - spec/translations/two/fr.yml
 - spec/yaml_loader_spec.rb
-homepage: http://r18n.rubyforge.org/
+homepage: https://github.com/ai/r18n
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1924687969248369443
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -1924687969248369443
 requirements: []
-
-rubyforge_project: r18n-core
-rubygems_version: 1.7.2
+rubyforge_project: 
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: I18n tool to translate your Ruby application.
 test_files: []
-
 has_rdoc: 

data/Gemfile

@@ -1,5 +0,0 @@
-source :rubygems
-
-gem 'psych', :group => [ :test, :development ], :platforms => :mri_19
-
-gemspec

data/Gemfile.lock

@@ -1,35 +0,0 @@
-PATH
-  remote: .
-  specs:
-    r18n-core (0.4.14)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    RedCloth (4.2.9)
-    diff-lcs (1.1.3)
-    maruku (0.6.0)
-      syntax (>= 1.0.0)
-    psych (1.2.2)
-    rake (0.9.2.2)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    syntax (1.0.0)
-    yard (0.7.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  bundler (>= 1.0.10)
-  maruku
-  psych
-  r18n-core!
-  rake (>= 0, != 0.9.0)
-  rspec-core
-  rspec-expectations
-  rspec-mocks
-  yard