r18n-rails 1.1.11 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b28a469d1a2dea1c66e6ae2463f76766f7b98c27
-  data.tar.gz: 2a3667b2a627c871d5e9f8c9d7e1496fb0d01fde
+  metadata.gz: 19b4862889c33630c6afe6f3889527eebc349c83
+  data.tar.gz: c70239c24e688f0df03e9bb3e0dcfc0db897dd0d
 SHA512:
-  metadata.gz: 26d4b4523a8de3d1cc7f80925146caa48d2aa6a69c1749af614ce010520f0b1df880142c3335f5cd8cd36f7b01af040073a329ff558788bff95305ab54e70dc7
-  data.tar.gz: 994bc1253b941331deec13e8d074887d19031e39d208b2bf73c67e3dd15b94bd87362884b8e862d1e93d98f044419de6f0a94868ab4193775e6864a808b331de
+  metadata.gz: 701eec0d8c117df40209f856f6f81b1c64ec66bf3bd5f8e92c9d159b8e623e3c5fcc21d0697ae681e6e48c29214a87a10ccfca3f8925c096913852f094e0dbb7
+  data.tar.gz: d4b2340e6b4feee15fab4765c4fefda4a839715a725461c6ed3d68698406dcfd92aae3dba98409097bff6f45aa5e56337aad21e7207c83b57ee742777755cf24

data/README.md

@@ -71,14 +71,14 @@ See full features in [main README](https://github.com/ai/r18n/blob/master/README
 5. Use translated messages in views. You can use Rails I18n syntax:
 
      ```ruby
-    t 'user.name',  :name => 'John'
-    t 'user.count', :count => 5
+    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.name(name: 'John') # for Rails I18n named variables
+    t.user.name('John')       # for R18n variables
     t.user.count(5)
      ```
 

data/lib/r18n-rails/controller.rb

@@ -39,7 +39,7 @@ module R18n
           end
 
           i18n = R18n::I18n.new(locales, R18n.default_places,
-            :off_filters => :untranslated, :on_filters => :untranslated_html)
+            off_filters: :untranslated, on_filters: :untranslated_html)
           ::I18n.locale = i18n.locale.code.to_sym
           i18n
         end

data/lib/r18n-rails/helpers.rb

@@ -46,9 +46,9 @@ module R18n
 
       # 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
+      #   l Time.now                 # Rails I18n default format
+      #   l Time.now, format: :short # Rails I18n style
+      #   l Time.now, :human         # R18n style
       def l(obj, *params)
         if params.empty? or params.first.is_a? Hash
           super(obj, *params)

data/lib/r18n-rails.rb

@@ -44,8 +44,8 @@ ActiveSupport.on_load(:after_initialize) do
   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)
+                            off_filters: :untranslated,
+                            on_filters:  :untranslated_bash)
     R18n.set(i18n)
   else
     R18n.set(locale)

data/r18n-rails.gemspec

@@ -2,9 +2,10 @@ require File.expand_path('../../r18n-core/lib/r18n-core/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
-  s.name = 'r18n-rails'
-  s.version = R18n::VERSION.dup
-  s.date = Time.now.strftime('%Y-%m-%d')
+  s.name     = 'r18n-rails'
+  s.version  = R18n::VERSION.dup
+  s.date     = Time.now.strftime('%Y-%m-%d')
+
   s.summary = 'R18n for Rails'
   s.description = <<-EOF
     Out-of-box R18n support for Ruby on Rails.

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

@@ -1,19 +1,19 @@
 class TestController < ApplicationController
   layout false
 
-  before_filter :reload_r18n, :only => :filter
+  before_filter :reload_r18n, only: :filter
 
   def locales
-    render :text => R18n.get.locales.map { |i| i.code }.join(', ')
+    render text: R18n.get.locales.map { |i| i.code }.join(', ')
   end
 
   def translations
-    render :text => "R18n: #{R18n.get.r18n.translations}. " +
+    render text: "R18n: #{R18n.get.r18n.translations}. " +
                     "Rails I18n: #{R18n.get.i18n.translations}"
   end
 
   def available
-    render :text => R18n.get.available_locales.map { |i| i.code }.sort.join(' ')
+    render text: R18n.get.available_locales.map { |i| i.code }.sort.join(' ')
   end
 
   def helpers
@@ -22,24 +22,24 @@ class TestController < ApplicationController
   end
 
   def untranslated
-    render :text => "#{R18n.get.user.not.exists}"
+    render text: "#{R18n.get.user.not.exists}"
   end
 
   def controller
-    render :text => "#{t.user.name} #{r18n.t.user.name} #{t('user.name')}"
+    render text: "#{t.user.name} #{r18n.t.user.name} #{t('user.name')}"
   end
 
   def time
-    render :text => l(Time.at(0).utc) + "\n" +
-                    l(Time.at(0).utc, :format => :short)
+    render text: l(Time.at(0).utc) + "\n" +
+                    l(Time.at(0).utc, format: :short)
   end
 
   def human_time
-    render :text => l(Time.now, :human)
+    render text: l(Time.now, :human)
   end
 
   def filter
-    render :text => t.ruby
+    render text: t.ruby
   end
 
   def format

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

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

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

@@ -1 +1 @@
-<%= number_to_currency(1000.12345, :precision => 1) %>
+<%= number_to_currency(1000.12345, precision: 1) %>

data/spec/app/config/application.rb

@@ -6,7 +6,7 @@ require "action_mailer/railtie"
 require "rails/test_unit/railtie"
 
 if defined?(Bundler)
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  Bundler.require(*Rails.groups(assets: %w(development test)))
 end
 
 module App

data/spec/app/config/routes.rb

@@ -1,6 +1,6 @@
 App::Application.routes.draw do
   controller :test do
-    match '/:action', :via => 'get'
-    match '/:locale/:action', :via => 'get'
+    match '/:action',         via: 'get'
+    match '/:locale/:action', via: 'get'
   end
 end

data/spec/app/db/schema.rb

@@ -10,9 +10,9 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20091218123631) do
+ActiveRecord::Schema.define(version: 20091218123631) do
 
-  create_table "posts", :force => true do |t|
+  create_table "posts", force: true do |t|
     t.string "title_en"
     t.string "title_ru"
   end

data/spec/rails_spec.rb

@@ -1,160 +1,164 @@
-# encoding: utf-8
 require File.expand_path('../spec_helper', __FILE__)
 
-describe TestController, :type => :controller do
+describe TestController, type: :controller do
   render_views
 
   it "uses default locale" do
     get :locales
-    response.should be_success
-    response.body.should == 'ru'
+    expect(response).to be_success
+    expect(response.body).to eq 'ru'
   end
 
   it "gets locale from param" do
-    get :locales, :locale => 'ru'
-    response.should be_success
-    response.body.should == 'ru, en'
+    get :locales, locale: 'ru'
+    expect(response).to be_success
+    expect(response.body).to eq 'ru, en'
   end
 
   it "gets locale from session" do
-    get :locales, {}, { :locale => 'ru' }
-    response.should be_success
-    response.body.should == 'ru, en'
+    get :locales, {}, { locale: 'ru' }
+    expect(response).to be_success
+    expect(response.body).to eq 'ru, en'
   end
 
   it "gets locales from http" do
     request.env['HTTP_ACCEPT_LANGUAGE'] = 'ru,fr;q=0.9'
     get :locales
-    response.should be_success
-    response.body.should == 'ru, fr, en'
+    expect(response).to be_success
+    expect(response.body).to eq 'ru, fr, en'
   end
 
   it "loads translations" do
-    get :translations, :locale => 'en'
-    response.should be_success
-    response.body.should == 'R18n: supported. Rails I18n: supported'
+    get :translations, locale: 'en'
+    expect(response).to be_success
+    expect(response.body).to eq 'R18n: supported. Rails I18n: supported'
   end
 
   it "returns available translations" do
     get :available
-    response.should be_success
-    response.body.should == 'en ru'
+    expect(response).to be_success
+    expect(response.body).to eq 'en ru'
   end
 
   it "adds helpers" do
-    get :helpers, :locale => 'en'
-    response.should be_success
-    response.body.should == "Name\nName\nName\nName\n"
+    get :helpers, locale: 'en'
+    expect(response).to be_success
+    expect(response.body).to eq "Name\nName\nName\nName\n"
   end
 
   it "formats untranslated" do
     get :untranslated
-    response.should be_success
-    response.body.should == 'user.<span style="color: red">[not.exists]</span>'
+    expect(response).to be_success
+    expect(response.body).to eq(
+      'user.<span style="color: red">[not.exists]</span>')
   end
 
   it "adds methods to controller" do
-    get :controller, :locale => 'en'
-    response.should be_success
-    response.body.should == "Name Name Name"
+    get :controller, locale: 'en'
+    expect(response).to be_success
+    expect(response.body).to eq "Name Name Name"
   end
 
   it "localizes time by Rails I18n" do
-    get :time, :locale => 'en'
-    response.should be_success
-    response.body.should == "Thu, 01 Jan 1970 00:00:00 +0000\n01 Jan 00:00"
+    get :time, locale: 'en'
+    expect(response).to be_success
+    expect(response.body).to eq "Thu, 01 Jan 1970 00:00:00 +0000\n01 Jan 00:00"
   end
 
   it "localizes time by R18n" do
-    get :human_time, :locale => 'en'
-    response.should be_success
-    response.body.should == "now"
+    get :human_time, locale: 'en'
+    expect(response).to be_success
+    expect(response.body).to eq 'now'
   end
 
   it "translates models" do
     ActiveRecord::Schema.verbose = false
-    ActiveRecord::Schema.define(:version => 20091218130034) do
-      create_table "posts", :force => true do |t|
+    ActiveRecord::Schema.define(version: 20091218130034) do
+      create_table "posts", force: true do |t|
         t.string "title_en"
         t.string "title_ru"
       end
     end
 
-    Post.unlocalized_getters(:title).should == { 'ru' => 'title_ru',
-                                                 'en' => 'title_en' }
-    Post.unlocalized_setters(:title).should == { 'ru' => 'title_ru=',
-                                                 'en' => 'title_en=' }
+    expect(Post.unlocalized_getters(:title)).to eq({
+      'ru' => 'title_ru',
+      'en' => 'title_en'
+    })
+    expect(Post.unlocalized_setters(:title)).to eq({
+      'ru' => 'title_ru=',
+      'en' => 'title_en='
+    })
 
     @post = Post.new
     @post.title_en = 'Record'
 
     R18n.set('ru')
-    @post.title.should == 'Record'
+    expect(@post.title).to eq 'Record'
 
     @post.title = 'Запись'
-    @post.title_ru.should == 'Запись'
-    @post.title_en.should == 'Record'
-    @post.title.should    == 'Запись'
+    expect(@post.title_ru).to eq 'Запись'
+    expect(@post.title_en).to eq 'Record'
+    expect(@post.title).to eq 'Запись'
   end
 
   it "sets default places" do
-    R18n.default_places.should == [Rails.root.join('app/i18n'),
-                                   R18n::Loader::Rails.new]
+    expect(R18n.default_places).to eq([
+      Rails.root.join('app/i18n'), R18n::Loader::Rails.new])
+
     R18n.set('en')
-    R18n.get.user.name.should == 'Name'
+    expect(R18n.get.user.name).to eq 'Name'
   end
 
   it "translates mails" do
     R18n.set('en')
     email = TestMailer.test.deliver
-    email.body.to_s.should == "Name\nName\nName\n"
+    expect(email.body.to_s).to eq "Name\nName\nName\n"
   end
 
   it "reloads 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]
+    get :filter, locale: 'en'
+    expect(response).to be_success
+    expect(response.body).to eq 'Rails'
+    expect(R18n::Rails::Filters.loaded).to eq [:rails_custom_filter]
 
     R18n::Filters.defined[:rails_custom_filter].block = proc { 'No' }
-    get :filter, :locale => 'en'
+    get :filter, locale: 'en'
 
-    response.should be_success
-    response.body.should == 'Rails'
+    expect(response).to be_success
+    expect(response.body).to eq 'Rails'
   end
 
   it "escapes 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"
+    get :safe, locale: 'en'
+    expect(response).to be_success
+    expect(response.body).to eq(
+      "<b> user.<span style=\"color: red\">[no_tr]</span>\n")
   end
 
   it "works with Rails build-in herlpers" do
     get :format
-    response.should be_success
-    response.body.should == "1 000,1 руб.\n"
+    expect(response).to be_success
+    expect(response.body).to eq "1 000,1 руб.\n"
   end
 
   it "caches I18n object" do
     R18n.clear_cache!
 
     get :translations
-    R18n.cache.keys.length.should == 1
+    expect(R18n.cache.keys.length).to eq 1
 
     get :translations
-    R18n.cache.keys.length.should == 1
+    expect(R18n.cache.keys.length).to eq 1
 
     get :translations
     request.env['HTTP_ACCEPT_LANGUAGE'] = 'ru,fr;q=0.9'
-    R18n.cache.keys.length.should == 1
+    expect(R18n.cache.keys.length).to eq 1
 
-    get :translations, :locale => 'en'
-    R18n.cache.keys.length.should == 2
+    get :translations, locale: 'en'
+    expect(R18n.cache.keys.length).to eq 2
   end
 
   it "parameterizes strigns" do
-    'One two три'.parameterize.should == 'one-two'
+    expect('One two три'.parameterize).to eq 'one-two'
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r18n-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 2.0.0
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r18n-rails-api
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: 2.0.0
 description: |2
       Out-of-box R18n support for Ruby on Rails.
       It is just a wrapper for R18n Rails API and R18n core libraries.
@@ -50,7 +50,6 @@ files:
 - r18n-rails.gemspec
 - spec/app/app/controllers/application_controller.rb
 - 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
@@ -72,7 +71,6 @@ files:
 - spec/app/config/routes.rb
 - spec/app/db/migrate/20091218123631_create_posts.rb
 - spec/app/db/schema.rb
-- spec/app/script/rails
 - spec/rails_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ai/r18n/tree/master/r18n-rails
@@ -102,7 +100,6 @@ summary: R18n for Rails
 test_files:
 - spec/app/app/controllers/application_controller.rb
 - 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
@@ -124,6 +121,5 @@ test_files:
 - spec/app/config/routes.rb
 - spec/app/db/migrate/20091218123631_create_posts.rb
 - spec/app/db/schema.rb
-- spec/app/script/rails
 - spec/rails_spec.rb
 - spec/spec_helper.rb

data/spec/app/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end

data/spec/app/script/rails

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'