r18n-rails 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,154 @@
+# R18n for Rails
+
+R18n-rails is a gem to add out-of-box R18n support to Rails I18n.
+
+It is a wrapper for R18n Rails API and R18n core libraries. See R18n core
+documentation for more information.
+
+## Features
+
+R18n for Rails is fully compatibile with Rails I18n, and add extra features:
+
+* Nice Ruby-style syntax.
+* Filters.
+* Model Translation (or any Ruby object).
+* Autodetect user locales.
+* Flexible locales.
+* Total flexibility.
+
+See full features in [main README](https://github.com/ai/r18n/blob/master/README.md).
+
+## How To
+
+1. Add `r18n-rails` gem to your `Gemfile`:
+
+     ```
+    gem 'r18n-rails'
+     ```
+   Now R18n will autodetect user locales.
+2. Define your way to set locale manually. R18n will find it in
+   `params[:locale]` or `session[:locale]`. Best way is a put optional
+   locale prefix to URLs:
+
+     ```ruby
+    match ':controller/:action'
+    match ':locale/:controller/:action'
+     ```
+
+3. Print available translations, to choose from them manually (and to help
+   search engines):
+
+     ```haml
+      %ul
+        - r18n.available_locales.each do |locale|
+          %li
+            %a( href="/#{locale.code}/" )= locale.title
+     ```
+
+4. Translations in I18n format are stored in
+   <tt>config/locales/<i>locale</i>.yml</tt>:
+
+     ```yaml
+    en:
+      user:
+        name: "User name is %{name}"
+        count:
+          zero: "No users"
+          one:  "One user"
+          many: "%{count} users"
+     ```
+   Translations in R18n format go to <tt>app/i18n/<i>locale</i>.yml</tt>:
+
+     ```yaml
+    user:
+      name: User name is %1
+      count: !!pl
+        0: No users
+        1: 1 user
+        n: %1 users
+     ```
+
+5. Use translated messages in views. You can use Rails I18n syntax:
+
+     ```ruby
+    t 'user.name',  :name => 'John'
+    t 'user.count', :count => 5
+     ```
+   or R18n syntax:
+
+     ```ruby
+    t.user.name(:name => 'John') # for Rails I18n named variables
+    t.user.name('John')          # for R18n variables
+    t.user.count(5)
+     ```
+
+6. Print dates and numbers in user’s tradition:
+
+     ```ruby
+    l Date.today, :standard #=> "20/12/2009"
+    l Time.now,   :full     #=> "20th of December, 2009 12:00"
+    l 1234.5                #=> "1,234.5"
+     ```
+
+7. Translate models. You can use `R18n::Translated` mixin for any Ruby class,
+   not only for ActiveRecord models
+
+   1. Add to migration columns for each of the supported locales, named as
+      <tt><i>name</i>_<i>locale</i></tt>:
+
+         ```ruby
+        t.string :title_en
+        t.string :title_ru
+
+        t.string :text_en
+        t.string :text_ru
+         ```
+
+   2. Add `R18n::Translated` mixin to model:
+
+        ```ruby
+       class Post < ActiveRecord::Base
+          include R18n::Translated
+        ```
+
+   3. Call `translations` method in model with all columns to be translated:
+
+        ```ruby
+       translations :title, :text
+        ```
+      Now model will have virtual methods `title`, `text`, `title=`
+      and `text=`, which will call `title_ru` or `title_en` and etc based
+      on current user locales.
+
+8. Download translations for Rails system messages (validation, etc) from
+   https://github.com/svenfuchs/rails-i18n/tree/master/rails/locale and
+   put them to `config/locales/` (because them use Rails I18n format).
+9. Add your own translations filters to `app/i18n/filters.rb`:
+
+     ```ruby
+    R18n::Filters.add('gender') do |translation, config, user|
+      translation[user.gender]
+    end
+     ```
+   And use in translations:
+
+     ```yaml
+    log:
+      signup: !!gender
+        male: Он зарегистрировался
+        female: Она зарегистрировалась
+     ```
+   and application:
+
+     ```ruby
+    t.log.signup(user)
+     ```
+
+## 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

@@ -21,7 +21,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.rb

@@ -19,19 +19,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'pathname'
 require 'r18n-core'
-require 'r18n-core/translated'
 require 'r18n-rails-api'
 
 dir = Pathname(__FILE__).dirname.expand_path + 'r18n-rails'
 require dir + 'helpers'
 require dir + 'controller'
 require dir + 'translated'
+require dir + 'filters'
 
-R18n::Filters.off(:untranslated)
-R18n::Filters.on(:untranslated_html)
+R18n.default_places { [Rails.root.join('app/i18n'), R18n::Loader::Rails.new] }
 
 ActionController::Base.helper(R18n::Rails::Helpers)
 ActionController::Base.send(:include, R18n::Rails::Controller)
 ActionController::Base.send(:before_filter, :set_r18n)
-
-ActionMailer::Base.helper(R18n::Rails::Helpers)
+unless Rails.env.production?
+  ActionController::Base.send(:before_filter, :reload_r18n_filters)
+end
+
+ActionMailer::Base.helper(R18n::Rails::Helpers) if defined? ActionMailer
+
+ActiveSupport.on_load(:after_initialize) do
+  env = ENV['LANG']
+  env = env.split('.').first if env
+  locale = env || I18n.default_locale.to_s
+  if defined? Rails::Console and not defined? Wirble
+    i18n   = R18n::I18n.new(locale, R18n.default_places,
+                            :off_filters => :untranslated,
+                            :on_filters  => :untranslated_bash)
+    R18n.set(i18n)
+  else
+    R18n.set(locale)
+  end
+end

data/lib/r18n-rails/controller.rb

@@ -38,13 +38,17 @@ module R18n
             locales.insert(0, session[:locale])
           end
 
-          places = [::Rails.root.join('app/i18n'), R18n::Loader::Rails.new]
-
-          R18n::I18n.new(locales, places)
+          R18n::I18n.new(locales, R18n.default_places,
+            :off_filters => :untranslated, :on_filters => :untranslated_html)
         end
 
         ::I18n.backend = R18n::Backend.new
       end
+
+      # Reload filters from ruby files in `app/i18n`.
+      def reload_r18n_filters
+        R18n::Rails::Filters.reload!
+      end
     end
   end
 end

data/lib/r18n-rails/filters.rb

@@ -0,0 +1,57 @@
+=begin
+Load R18n filters from Rails app directory.
+
+Copyright (C) 2012 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+module R18n
+  module Rails
+    # Load and remove filters from ruby files in `app/i18n`.
+    class Filters
+      class << self
+        # Path list of filters, which are loaded from app dir.
+        attr_accessor :loaded
+
+        # Path to filters. Should be set to `app/i18n`.
+        attr_writer :path
+        def path
+          @path || ::Rails.root.join('app/i18n')
+        end
+
+        # Load all ruby files from `app/i18n` and remember loaded filters.
+        def load!
+          @loaded = R18n::Filters.listen {
+            Pathname.glob(path.join('**/*.rb').to_s) { |i| load i.to_s; }
+          }.map { |i| i.name }
+        end
+
+        # Shortcut to call `remove!` and `load!`.
+        def reload!
+          remove!
+          load!
+        end
+
+        # Remove filters, loaded by `load!`.
+        def remove!
+          @loaded.each { |i| R18n::Filters.delete(i) }
+          @loaded = []
+        end
+      end
+    end
+
+    Filters.loaded = []
+  end
+end

data/lib/r18n-rails/helpers.rb

@@ -24,7 +24,7 @@ module R18n
       # * <tt>r18n.available_locales</tt> – available application translations.
       # * <tt>r18n.locales</tt> – List of user locales
       # * <tt>r18n.reload!</tt> – Reload R18n translations
-      # 
+      #
       # You can get translations by <tt>r18n.user.name</tt>, but +t+ helper is
       # more beautiful, short and also support R18n syntax.
       def r18n
@@ -32,7 +32,7 @@ module R18n
       end
 
       # Extend +t+ helper to use also R18n syntax.
-      # 
+      #
       #   t 'user.name' # Rails I18n style
       #   t.user.name   # R18n style
       def t(*params)
@@ -45,7 +45,7 @@ module R18n
       alias :translate :t
 
       # Extend +l+ helper to use also R18n syntax.
-      # 
+      #
       #   l Time.now                    # Rails I18n default format
       #   l Time.now, :format => :short # Rails I18n style
       #   l Time.now, :human            # R18n style

data/r18n-rails.gemspec

@@ -12,18 +12,17 @@ Gem::Specification.new do |s|
     R18n has nice Ruby-style syntax, filters, flexible locales, custom loaders,
     translation support for any classes, time and number localization, several
     user language support, agnostic core package with out-of-box support for
-    Rails, Sinatra, Merb and desktop applications.
+    Rails, Sinatra 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'
+  s.author   = 'Andrey "A.I." Sitnik'
+  s.email    = 'andrey@sitnik.ru'
+  s.homepage = 'https://github.com/ai/r18n/tree/master/r18n-rails'
 
   s.add_dependency 'r18n-rails-api', ["= #{R18n::VERSION}"]
 
@@ -33,5 +32,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rails",       [">= 3"]
   s.add_development_dependency "rspec",       [">= 2"]
   s.add_development_dependency "rspec-rails", [">= 2"]
+  s.add_development_dependency "redcarpet",   [">= 0"]
 end
 

data/spec/app/app/controllers/test_controller.rb

@@ -36,4 +36,8 @@ class TestController < ApplicationController
   def human_time
     render :text => l(Time.now, :human)
   end
+
+  def filter
+    render :text => t.ruby
+  end
 end

data/spec/app/app/i18n/en.yml

@@ -1,2 +1,6 @@
 r18n:
   translations: supported
+ruby: !!rails
+  Ruby
+html:
+  <b>

data/spec/app/app/i18n/filters.rb

@@ -0,0 +1,3 @@
+R18n::Filters.add('rails', :rails_custom_filter) do |content, config, *params|
+  content.gsub('Ruby', 'Rails')
+end

data/spec/app/app/mailers/test_mailer.rb

@@ -0,0 +1,7 @@
+class TestMailer < ActionMailer::Base
+  default :from => 'from@example.com'
+
+  def test
+    mail(:to => 'to@example.com')
+  end
+end

data/spec/app/app/views/test/safe.html.erb

@@ -0,0 +1 @@
+<%= t.html %> <%= t.user.no_tr %>

data/spec/app/app/views/test_mailer/test.text.erb

@@ -0,0 +1,3 @@
+<%= r18n.user.name %>
+<%= t 'user.name' %>
+<%= t.user.name %>

data/spec/app/config/application.rb

@@ -15,5 +15,11 @@ module App
     config.action_view.javascript_expansions[:defaults] = []
     config.encoding = "utf-8"
     config.filter_parameters += [:password]
+
+    def config.database_configuration
+      sqlite = { 'adapter' => 'sqlite3', 'database' => ':memory:' }
+      sqlite['adapter'] = 'jdbcsqlite3' if RUBY_PLATFORM == 'java'
+      { 'development' => sqlite, 'test' => sqlite, 'production' => sqlite }
+    end
   end
 end

data/spec/app/config/environments/test.rb

@@ -1,10 +1,10 @@
 App::Application.configure do
-  config.cache_classes = true
-  config.whiny_nils = true
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-  config.action_dispatch.show_exceptions = false
-  config.action_controller.allow_forgery_protection    = false
-  config.action_mailer.delivery_method = :test
-  config.active_support.deprecation = :stderr
+  config.cache_classes                              = true
+  config.whiny_nils                                 = true
+  config.consider_all_requests_local                = true
+  config.action_controller.perform_caching          = false
+  config.action_dispatch.show_exceptions            = false
+  config.action_controller.allow_forgery_protection = false
+  config.action_mailer.delivery_method              = :test
+  config.active_support.deprecation                 = :stderr
 end

data/spec/rails_spec.rb

@@ -50,7 +50,7 @@ describe TestController, :type => :controller do
   it 'should format untranslated' do
     get :untranslated
     response.should be_success
-    response.body.should == 'user.<span style="color: red">not.exists</span>'
+    response.body.should == 'user.<span style="color: red">[not.exists]</span>'
   end
 
   it "should add methods to controller" do
@@ -94,7 +94,39 @@ describe TestController, :type => :controller do
     @post.title = 'Запись'
     @post.title_ru.should == 'Запись'
     @post.title_en.should == 'Record'
-    @post.title.should == 'Запись'
+    @post.title.should    == 'Запись'
+  end
+
+  it "should set default places" do
+    R18n.default_places.should == [Rails.root.join('app/i18n'),
+                                   R18n::Loader::Rails.new]
+    R18n.set('en')
+    R18n.get.user.name.should == 'Name'
+  end
+
+  it "should translate mails" do
+    email = TestMailer.test.deliver
+    email.encoded.should =~ /Name\r\nName\r\nName\r\n$/
+  end
+
+  it "should reload filters from app directory" do
+    get :filter, :locale => 'en'
+    response.should be_success
+    response.body.should == 'Rails'
+    R18n::Rails::Filters.loaded.should == [:rails_custom_filter]
+
+    R18n::Filters.defined[:rails_custom_filter].block = proc { 'No' }
+    get :filter, :locale => 'en'
+
+    response.should be_success
+    response.body.should == 'Rails'
+  end
+
+  it "should escape html inside R18n" do
+    get :safe, :locale => 'en'
+    response.should be_success
+    response.body.should ==
+      "<b> user.<span style=\"color: red\">[no_tr]</span>\n"
   end
 
 end

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
-require 'rubygems'
+require 'pp'
 
 ENV['RAILS_ENV'] ||= 'test'
-require 'pp'
-require File.expand_path(File.join(File.dirname(__FILE__), 'app/config/environment'))
+dir = File.dirname(__FILE__)
+require File.expand_path(File.join(dir, 'app/config/environment'))
+require File.expand_path(File.join(dir, '../lib/r18n-rails'))
 
-require 'rspec'
 require 'rspec/rails'
-

metadata

@@ -1,151 +1,170 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: r18n-rails
-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-rails-api
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 4
-        - 14
-        version: 0.4.14
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
   prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id002 !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: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: yard
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  requirement: *id003
-- !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: &id004 !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: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: rails
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        version: "3"
   prerelease: false
-  requirement: *id005
-- !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: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
-  name: rspec
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
   prerelease: false
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: *id007
-description: "    Out-of-box R18n support for Ruby on Rails.\n    It is just a wrapper for R18n Rails API and R18n core libraries.\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'
+description: ! "    Out-of-box R18n support for Ruby on Rails.\n    It is just a wrapper
+  for R18n Rails API and R18n core libraries.\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 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.rb
 - lib/r18n-rails/controller.rb
+- lib/r18n-rails/filters.rb
 - lib/r18n-rails/helpers.rb
 - lib/r18n-rails/translated.rb
 - r18n-rails.gemspec
@@ -153,16 +172,17 @@ files:
 - spec/app/app/controllers/test_controller.rb
 - spec/app/app/helpers/application_helper.rb
 - spec/app/app/i18n/en.yml
+- spec/app/app/i18n/filters.rb
 - spec/app/app/i18n/ru.yml
+- spec/app/app/mailers/test_mailer.rb
 - spec/app/app/models/post.rb
 - spec/app/app/views/test/helpers.html.erb
+- spec/app/app/views/test/safe.html.erb
+- spec/app/app/views/test_mailer/test.text.erb
 - spec/app/config.ru
 - spec/app/config/application.rb
 - spec/app/config/boot.rb
-- spec/app/config/database.yml
 - spec/app/config/environment.rb
-- spec/app/config/environments/development.rb
-- spec/app/config/environments/production.rb
 - spec/app/config/environments/test.rb
 - spec/app/config/initializers/secret_token.rb
 - spec/app/config/initializers/session_store.rb
@@ -173,39 +193,35 @@ files:
 - spec/app/script/rails
 - spec/rails_spec.rb
 - spec/spec_helper.rb
-homepage: http://r18n.rubyforge.org/
+homepage: https://github.com/ai/r18n/tree/master/r18n-rails
 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: -282881312323170006
+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: -282881312323170006
 requirements: []
-
-rubyforge_project: r18n-rails
-rubygems_version: 1.7.2
+rubyforge_project: 
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: R18n for Rails
 test_files: []
-
 has_rdoc: 

data/Gemfile

@@ -1,12 +0,0 @@
-source :rubygems
-
-group :test do
-  gem 'sqlite3'
-end
-
-gem 'psych', :platforms => :mri_19, :group => [ :test, :development ]
-
-gem 'r18n-core', :path => '../r18n-core/'
-gem 'r18n-rails-api', :path => '../r18n-rails-api/'
-
-gemspec

data/Gemfile.lock

@@ -1,130 +0,0 @@
-PATH
-  remote: .
-  specs:
-    r18n-rails (0.4.14)
-      r18n-rails-api (= 0.4.14)
-
-PATH
-  remote: ../r18n-core/
-  specs:
-    r18n-core (0.4.14)
-
-PATH
-  remote: ../r18n-rails-api/
-  specs:
-    r18n-rails-api (0.4.14)
-      i18n
-      r18n-core (= 0.4.14)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.0)
-      actionpack (= 3.2.0)
-      mail (~> 2.4.0)
-    actionpack (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.0)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.1)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.0)
-      activesupport (= 3.2.0)
-      builder (~> 3.0.0)
-    activerecord (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-      arel (~> 3.0.0)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-    activesupport (3.2.0)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.0)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.0)
-    json (1.6.5)
-    mail (2.4.1)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
-    polyglot (0.3.3)
-    psych (1.2.2)
-    rack (1.4.1)
-    rack-cache (1.1)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.0)
-      actionmailer (= 3.2.0)
-      actionpack (= 3.2.0)
-      activerecord (= 3.2.0)
-      activeresource (= 3.2.0)
-      activesupport (= 3.2.0)
-      bundler (~> 1.0)
-      railties (= 3.2.0)
-    railties (3.2.0)
-      actionpack (= 3.2.0)
-      activesupport (= 3.2.0)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec (~> 2.8.0)
-    sprockets (2.1.2)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    yard (0.7.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (>= 1.0.10)
-  psych
-  r18n-core!
-  r18n-rails!
-  r18n-rails-api!
-  rails (>= 3)
-  rake (>= 0, != 0.9.0)
-  rspec (>= 2)
-  rspec-rails (>= 2)
-  sqlite3
-  yard

data/README.rdoc

@@ -1,230 +0,0 @@
-= R18n for Rails
-
-R18n-rails is a gem to add out-of-box R18n support to Rails I18n.
-
-It is a wrapper for R18n Rails API and R18n core libraries. See R18n core
-documentation for more information.
-
-== Features
-
-R18n for Rails is fully compatibile with Rails I18n, and add extra features:
-
-=== R18n Syntax
-
-You can use more compact, explicit and ruby-style syntax.
-
-Translations in R18n format will be loaded from <tt>app/i18n/_locale_.yml</tt>:
-
-  user:
-    name: User name is %1
-    count: !!pl
-      0: No users
-      1: 1 user
-      n: %1 users
-
-R18n extends +t+ helper to add optional R18n syntax:
-
-  t.user.name('John')      #=> "User name is John"
-  t.user.count(5)          #=> "5 users"
-  t.not.exists | 'default' #=> "default"
-
-=== Filters
-
-R18n has flexible architecture based on filters. Variables, pluralization,
-untranslated are common filters, and you can change them all. For example,
-write untranslated keys to file:
-
-  R18n::Filters.add(::R18n::Untranslated, :write_untranslated) do
-  |v, c, translated, untranslated, path|
-    File.open('untranslated.list', 'w') do |io|
-      io.puts(path)
-    end
-  end
-
-R18n already has filters for HTML escaping, lambdas, Textile and Markdown:
-
-  hi: !!markdown
-    **Hi**, people!
-  greater: !!escape
-    1 < 2 is true
-
-  i18n.hi      #=> "<p><strong>Hi</strong>, people!</p>"
-  i18n.greater #=> "1 &lt; 2 is true"
-
-=== Model Translation
-
-R18n can add i18n support for your ActiveRecord model and any other class
-(include DataMapper, MongoMapper, Mongoid):
-
-1. Add separate columns for all supported translations:
-
-     def self.up
-       create_table :posts do |t|
-         t.string :title_en
-         t.string :title_ru
-       end
-     end
-
-2. Add virtual method +title+, which will use <tt>title_<i>locale</i></tt>
-   methods to find actual translation:
-
-     class Post < ActiveRecord::Base
-       include R18n::Translated
-       translations :title
-     end
-
-     # For Russian user
-     post = Post.new
-     post.title_en = 'Post'
-     post.title_ru = 'Запись'
-     post.title = 'Запись'
-
-     post.title = 'Другая' # will use title_ru, by first user's locale
-
-=== Time Fomatters
-
-R18n add +full+ time formatter based on locale info:
-
-  # English
-  l Time.now, :full #=> "1st of December, 2009 12:00"
-
-  # French
-  l Time.now, :full #=> "1er décembre 2009 12:00"
-
-=== Locales
-
-R18n contains locales info, so it supports locale pluralization and fallback
-rules for non-English locales out-of-box:
-
-  # Russian have different plural rules:
-  user:
-    count: !!pl
-      0: Нет пользователей
-      1: %1 пользователь
-      2: %1 пользователя
-      n: %1 пользователей
-
-  t.user.count(2)  #=> "2 пользователя"
-  t.user.count(21) #=> "21 пользователь"
-
-=== Autodetect User Locales
-
-R18n automatically generate fallbacks for current user, based on
-user locales list from HTTP_ACCEPT_LANGUAGE, locale info (in some countries
-people know several languages), and default locale.
-
-For example, if user know Kazakh and German, R18n will try find translations in:
-Kazakh → German → Russian (second language in Kazakhstan) → English (default
-locale).
-
-=== Separated I18n
-
-You can create another R18n I18n instance with another languages. For example,
-to send e-mail for English admin on error with French user:
-
-  puts I18n.t :error # Show error in French
-
-  admin_i18n = R18n::I18n.new(@admin_locales, Rails.root + 'app/i18n')
-  send_email(admin_i18n.error_messages)
-
-== How To
-
-1. Add <tt>r18n-rails</tt> gem to your <tt>config/environment.rb</tt>:
-
-     config.gem 'r18n-rails'
-
-   Now R18n will autodetect user locales.
-2. Define your way to set locale manually. R18n will find it in
-   <tt>params[:locale]</tt> or <tt>session[:locale]</tt>. Best way is a put
-   optional locale prefix to URLs:
-
-       map.connect ':controller/:action'
-       map.connect ':locale/:controller/:action'
-
-3. Print available translations, to choose from them manually (and to helpsearch
-   engines):
-
-     <ul>
-     <% r18n.available_locales.each do |locale| %>
-         <li>
-           <a href="/<%= locale.code %>/"><%= locale.title %></a>
-         </li>
-     <% end %>
-     </ul>
-
-4. Translations in I18n format are stored in
-   <tt>config/locales/_locale_.yml</tt>:
-
-     en:
-       user:
-         name: "User name is %{name}"
-         count:
-           zero: "No users"
-           one:  "One user"
-           many: "%{count} users"
-
-   Translations in R18n format go to <tt>app/i18n/_locale_.yml</tt>:
-
-     user:
-       name: User name is %1
-       count: !!pl
-         0: No users
-         1: 1 user
-         n: %1 users
-
-5. Use translated messages in views. You can use Rails I18n syntax:
-
-     t 'user.name', :name => 'John'
-     t 'user.count', :count => 5
-
-   or R18n syntax:
-
-     t.user.name(:name => 'John') # for Rails I18n named variables
-     t.user.name('John')          # for R18n variables
-     t.user.count(5)
-
-6. Print dates and numbers in user’s tradition:
-
-     l Date.today, :standard #=> "20/12/2009"
-     l Time.now,   :full     #=> "20th of December, 2009 12:00"
-     l 1234.5                #=> "1,234.5"
-
-7. Translate models:
-
-   1. Add to migration columns for each of the supported locales, named as
-      <tt><i>name</i>_<i>locale</i></tt>:
-
-         t.string :title_en
-         t.string :title_ru
-
-         t.string :text_en
-         t.string :text_ru
-
-   2. Add <tt>R18n::Translated</tt> mixin to model:
-
-        class Post < ActiveRecord::Base
-          include R18n::Translated
-
-   3. Call +translations+ method in model with all columns to be translated:
-
-          translations :title, :text
-
-      Now model will have virtual methods +title+, +text+, <tt>title=</tt>
-      and <tt>text=</tt>, which will call +title_ru+ or +title_en+ and etc based
-      on current user locales.
-
-   You can use <tt>R18n::Translated</tt> mixin for any Ruby class, not only for
-   ActiveRecord models.
-
-8. Download translations for Rails system messages (validation, etc) from
-   https://github.com/svenfuchs/rails-i18n/tree/master/rails/locale and
-   put them to <tt>config/locales/</tt> (because them use Rails I18n format).
-
-== 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/spec/app/config/database.yml

@@ -1,17 +0,0 @@
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-
-test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000

data/spec/app/config/environments/development.rb

@@ -1,11 +0,0 @@
-App::Application.configure do
-  config.cache_classes = false
-  config.whiny_nils = true
-  config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
-  config.action_controller.perform_caching = false
-  config.action_mailer.raise_delivery_errors = false
-  config.active_support.deprecation = :log
-  config.action_dispatch.best_standards_support = :builtin
-end
-

data/spec/app/config/environments/production.rb

@@ -1,9 +0,0 @@
-App::Application.configure do
-  config.cache_classes = true
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
-  config.serve_static_assets = false
-  config.i18n.fallbacks = true
-  config.active_support.deprecation = :notify
-end