r18n-rails-api 0.4.14 → 1.0.0

data/.yardopts

@@ -1,3 +1,3 @@
 --charset utf-8
 -
-README.rdoc
+README.md

data/LICENSE

@@ -10,7 +10,7 @@
 the terms and conditions of version 3 of the GNU General Public
 License, supplemented by the additional permissions listed below.
 
-  0. Additional Definitions. 
+  0. Additional Definitions.
 
   As used herein, "this License" refers to version 3 of the GNU Lesser
 General Public License, and the "GNU GPL" refers to version 3 of the GNU
@@ -111,7 +111,7 @@ the following:
        a copy of the Library already present on the user's computer
        system, and (b) will operate properly with a modified version
        of the Library that is interface-compatible with the Linked
-       Version. 
+       Version.
 
    e) Provide Installation Information, but only if you would otherwise
    be required to provide such information under section 6 of the

data/README.md

@@ -0,0 +1,85 @@
+# R18n Rails API
+
+Rails I18n compatibility for R18n:
+* filters to work with named variables in Rails translation format;
+* R18n loader for Rails I18n translation format;
+* R18n backend.
+
+## How To
+
+### Variables
+
+After require-ing `r18n-rails-api` you can use named variables in all
+translations:
+
+```yaml
+greeting: "Hi, %{name}"
+users: !!pl
+  1: One user
+  n: %{count} users
+```
+
+```ruby
+require 'r18n-rails-api'
+
+i18n.greeting(:name => 'John') #=> "Hi, John"
+i18n.users(:count => 5)        #=> "5 users"
+```
+
+### Rails Translations
+
+You can use `R18n::Loader::Rails` to load translations from `I18n.load_path`:
+
+`i18n/en.yml`:
+
+```yaml
+en:
+  posts:
+    one: One post
+    many: %{count} posts
+```
+
+`example.rb`:
+
+```ruby
+require 'r18n-rails-api'
+
+I18n.load_path = ['i18n/en.yml']
+i18n = R18n::I18n.new('en', R18n::Loader::Rails)
+
+i18n.posts(:count => 5) #=> "5 posts"
+```
+
+### Backend
+
+You can use R18n as a backend for Rails I18n:
+
+```ruby
+require 'r18n-rails-api'
+
+R18n.set('en', 'path/to/translation')
+I18n.backend = R18n::Backend
+
+I18n.l Time.now, :format => :full #=> "6th of December, 2009 22:44"
+I18n.t :greeting, :name => 'John' #=> "Hi, John"
+I18n.t :users, :count => 5        #=> "5 users"
+```
+
+## R18n Features
+
+* Nice Ruby-style syntax.
+* Filters.
+* Flexible locales.
+* Custom translations loaders.
+* Translation support for any classes.
+* Time and number localization.
+* Several user languages support.
+
+## License
+
+R18n is licensed under the GNU Lesser General Public License version 3.
+You can read it in LICENSE file or in http://www.gnu.org/licenses/lgpl.html.
+
+## Author
+
+Andrey “A.I.” Sitnik <andrey@sitnik.ru>

data/Rakefile

@@ -22,7 +22,8 @@ YARD::Rake::YardocTask.new do |yard|
 end
 
 task :clobber_doc do
-  rm_r 'doc' rescue nil
+  rm_r 'doc'     rescue nil
+  rm_r '.yardoc' rescue nil
 end
 task :clobber_package do
   rm_r 'pkg' rescue nil

data/lib/r18n-rails-api/backend.rb

@@ -57,10 +57,10 @@ module R18n
       end
     end
 
-    # Convert +object+ to String, according to the rules of the current 
+    # Convert +object+ to String, according to the rules of the current
     # R18n locale. It didn’t use +locale+ argument, only current R18n I18n
     # object. It support Fixnum, Bignum, Float, Time, Date and DateTime.
-    # 
+    #
     # Support Rails I18n (+:default+, +:short+, +:long+, +:long_ordinal+,
     # +:only_day+ and +:only_second+) and R18n (+:full+, +:human+, +:standard+
     # and +:month+) time formatters.

data/lib/r18n-rails-api/filters.rb

@@ -26,9 +26,12 @@ R18n::Filters.add(String, :named_variables) do |content, config, params|
   if params.is_a? Hash
     content = content.clone
     params.each_pair do |name, value|
-      v = config[:locale].localize(value)
-      content.gsub! "%{#{name}}", v
-      content.gsub! "{{#{name}}}", v
+      value = config[:locale].localize(value)
+      if defined? ActiveSupport::SafeBuffer
+        value = ActiveSupport::SafeBuffer.new + value
+      end
+      content.gsub! "%{#{name}}",  value
+      content.gsub! "{{#{name}}}", value
     end
   end
   content

data/lib/r18n-rails-api/loader.rb

@@ -29,7 +29,7 @@ module R18n
     # It use Rails I18n backend to load translations. By default, simple
     # backend will be used, by you can change it, if use extended backend
     # (for example, with ActiveRecord storage):
-    # 
+    #
     #   R18n::I18n.new('en',
     #                  R18n::Loader::Rails.new(I18n::Backend::ActiveRecord.new))
     class Rails
@@ -50,7 +50,7 @@ module R18n
       # Array of locales, which has translations in +I18n.load_path+.
       def available
         reload!
-        @translations.keys.map { |code| R18n::Locale.load(code) }
+        @translations.keys.map { |code| R18n.locale(code) }
       end
 
       # Return Hash with translations for +locale+.

data/r18n-rails-api.gemspec

@@ -15,15 +15,14 @@ Gem::Specification.new do |s|
     Rails, Sinatra, Merb and desktop applications.
   EOF
 
-  s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
-  s.require_path = 'lib'
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.extra_rdoc_files = ['README.md', 'LICENSE']
+  s.require_path     = 'lib'
 
-  s.author = 'Andrey "A.I." Sitnik'
-  s.email = 'andrey@sitnik.ru'
-  s.homepage = 'http://r18n.rubyforge.org/'
-  s.rubyforge_project = 'r18n-rails-api'
+  s.author   = 'Andrey "A.I." Sitnik'
+  s.email    = 'andrey@sitnik.ru'
+  s.homepage = 'https://github.com/ai/r18n/tree/master/r18n-rails-api'
 
   s.add_dependency 'r18n-core', ["= #{R18n::VERSION}"]
   s.add_dependency 'i18n'
@@ -34,4 +33,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-core",         [">= 0"]
   s.add_development_dependency "rspec-expectations", [">= 0"]
   s.add_development_dependency "rspec-mocks",        [">= 0"]
+  s.add_development_dependency "redcarpet",          [">= 0"]
 end

data/spec/filters_spec.rb

@@ -2,28 +2,33 @@
 require File.expand_path('../spec_helper', __FILE__)
 
 describe 'Rails filters' do
-  before :all do
-    @en = R18n::Locale.load('en')
-  end
 
   it "should use named variables" do
-    i18n = R18n::Translation.new(@en, '', @en, {'echo' => 'Value is %{value}'})
+    i18n = R18n::Translation.new(EN, '', :locale => EN,
+      :translations => { 'echo' => 'Value is %{value}' })
 
     i18n.echo(:value => 'R18n').should == 'Value is R18n'
-    i18n.echo(:value => -5.5).should == 'Value is −5.5'
-    i18n.echo(:value => 5000).should == 'Value is 5,000'
+    i18n.echo(:value => -5.5).should   == 'Value is −5.5'
+    i18n.echo(:value => 5000).should   == 'Value is 5,000'
+    i18n.echo(:value => '<b>').should  == 'Value is &lt;b&gt;'
     i18n.echo.should == 'Value is %{value}'
   end
 
   it "should use old variables syntax" do
-    i18n = R18n::Translation.new(@en, '', @en, {'echo' => 'Value is {{value}}',})
+    i18n = R18n::Translation.new(EN, '', :locale => EN,
+      :translations => { 'echo' => 'Value is {{value}}' })
     i18n.echo(:value => 'Old').should == 'Value is Old'
   end
 
   it "should pluralize by variable %{count}" do
-    i18n = R18n::Translation.new(@en, '', @en, {'users' => R18n::Typed.new('pl',
-      { 0 => 'no users', 1 => '1 user', 'n' => '%{count} users' }
-    ) })
+    i18n = R18n::Translation.new(EN, '', :locale => EN,
+      :translations => {
+        'users' => R18n::Typed.new('pl', {
+          0 => 'no users',
+          1 => '1 user',
+          'n' => '%{count} users'
+        })
+      })
 
     i18n.users(:count => 0).should == 'no users'
     i18n.users(:count => 1).should == '1 user'

data/spec/spec_helper.rb

@@ -1,11 +1,12 @@
-require 'rubygems'
+# encoding: utf-8
 require 'pp'
 require 'i18n'
+require 'active_support'
 
 require File.join(File.dirname(__FILE__), '../lib/r18n-rails-api')
 
-EN = R18n::Locale.load(:en)
-RU = R18n::Locale.load(:ru)
+EN = R18n.locale(:en)
+RU = R18n.locale(:ru)
 
 GENERAL = Dir.glob(File.join(File.dirname(__FILE__), 'data/general/*'))
 SIMPLE  = Dir.glob(File.join(File.dirname(__FILE__), 'data/simple/*'))

metadata

@@ -1,162 +1,182 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: r18n-rails-api
-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: :runtime
+date: 2012-06-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: r18n-core
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 4
-        - 14
-        version: 0.4.14
-  prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: i18n
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.10
-  prerelease: false
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: yard
-  version_requirements: &id004 !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 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.10
+- !ruby/object:Gem::Dependency
+  name: yard
+  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: rake
-  version_requirements: &id005 !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
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ! '!='
+      - !ruby/object:Gem::Version
         version: 0.9.0
-  prerelease: false
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: rspec-core
-  version_requirements: &id006 !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 
+  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
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rspec-expectations
-  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: rspec-expectations
+  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: rspec-mocks
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: *id008
-description: "    R18n backend for Rails I18n and R18n filters and loader to support Rails\n    translation format.\n    R18n 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 backend for Rails I18n and R18n filters and loader to support
+  Rails\n    translation format.\n    R18n 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"
 email: andrey@sitnik.ru
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files:
+- README.md
 - LICENSE
-files: 
+files:
 - .rspec
 - .yardopts
-- Gemfile
-- Gemfile.lock
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - lib/r18n-rails-api.rb
 - lib/r18n-rails-api/backend.rb
@@ -173,39 +193,35 @@ files:
 - spec/filters_spec.rb
 - spec/loader_spec.rb
 - spec/spec_helper.rb
-homepage: http://r18n.rubyforge.org/
+homepage: https://github.com/ai/r18n/tree/master/r18n-rails-api
 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: 1882288151975101443
+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: 1882288151975101443
 requirements: []
-
-rubyforge_project: r18n-rails-api
-rubygems_version: 1.7.2
+rubyforge_project: 
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rails I18n compatibility for R18n
 test_files: []
-
 has_rdoc: 

data/Gemfile

@@ -1,7 +0,0 @@
-source :rubygems
-
-gem 'psych', :group => :development, :platforms => :mri_19
-
-gem 'r18n-core', :path => '../r18n-core/'
-
-gemspec

data/Gemfile.lock

@@ -1,38 +0,0 @@
-PATH
-  remote: .
-  specs:
-    r18n-rails-api (0.4.14)
-      i18n
-      r18n-core (= 0.4.14)
-
-PATH
-  remote: ../r18n-core/
-  specs:
-    r18n-core (0.4.14)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    i18n (0.6.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)
-    yard (0.7.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (>= 1.0.10)
-  psych
-  r18n-core!
-  r18n-rails-api!
-  rake (>= 0, != 0.9.0)
-  rspec-core
-  rspec-expectations
-  rspec-mocks
-  yard

data/README.rdoc

@@ -1,74 +0,0 @@
-= R18n Rails API
-
-Rails I18n compatibility for R18n:
-* filters to work with named variables in Rails translation format;
-* R18n loader for Rails I18n translation format;
-* R18n backend.
-
-== How To
-
-=== Variables
-
-After require-ing <tt>r18n-rails-api</tt> you can use named variables in all
-translations:
-
-  greeting: "Hi, %{name}"
-  users: !!pl
-    1: One user
-    n: %{count} users
-
-  require 'r18n-rails-api'
-
-  i18n.greeting(:name => 'John') #=> "Hi, John"
-  i18n.users(:count => 5) #=> "5 users"
-
-=== Rails Translations
-
-You can use <tt>R18n::Loader::Rails</tt> to load translations from
-<tt>I18n.load_path</tt>:
-
-i18n/en.yml:
-  en:
-    posts:
-      one: One post
-      many: %{count} posts
-
-example.rb:
-  require 'r18n-rails-api'
-
-  I18n.load_path = ['i18n/en.yml']
-  i18n = R18n::I18n.new('en', R18n::Loader::Rails)
-
-  i18n.posts(:count => 5) #=> "5 posts"
-
-=== Backend
-
-You can use R18n as a backend for Rails I18n:
-
-  require 'r18n-rails-api'
-
-  R18n.set('en', 'path/to/translation')
-  I18n.backend = R18n::Backend
-
-  I18n.l Time.now, :format => :full #=> "6th of December, 2009 22:44"
-  I18n.t :greeting, :name => 'John' #=> "Hi, John"
-  I18n.t :users, :count => 5        #=> "5 users"
-
-== R18n Features
-
-* Nice Ruby-style syntax.
-* Filters.
-* Flexible locales.
-* Custom translations loaders.
-* Translation support for any classes.
-* Time and number localization.
-* Several user languages support.
-
-== License
-
-R18n is licensed under the GNU Lesser General Public License version 3.
-You can read it in LICENSE file or in http://www.gnu.org/licenses/lgpl.html.
-
-== Author
-
-Andrey “A.I.” Sitnik <andrey@sitnik.ru>