r18n-rails 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7671766f66e26384fe607a6bffa9fb0cbc986e4
-  data.tar.gz: fc095a07dc698fc6e8e2c24cf455a8505cc634c9
+  metadata.gz: 98e0ae526a2605f8e9639f16128c3e3284b0845e
+  data.tar.gz: 5f4b7aca9b579aea6d1bbee1acf08b04bb64c0ca
 SHA512:
-  metadata.gz: fa0e187445b4beb3147caa14d2f593e8305ebeca92f0fda2aea2c20b01d6a2096e6c9c7143452570f989b37ae7d3dbdd8f051801396dbfd43de0962d8634176e
-  data.tar.gz: b56f306aa2fc25a67275dd417a6928d589a2c0bd7611ca1fc6089530d46d4cb2db806ae0fb85569c22e485f68e13b0b060292e701754fd82d6998d197760177d
+  metadata.gz: 3fc5d0693ae5d250a139d11bdf9dbc1637269b4f56741762da35e8ebb023a692f110b432ed7d8897559bcf632d92268e377b995de01e2d1ade8cc8c4cd841635
+  data.tar.gz: 585f0a5140517de98501d025562815aec480b8736b697cdc8ddd6d4808d96fe7841e3688682b524a2070d9f20cd259621a160c809c5c667a6e0ced1c7c7942d5

data/lib/r18n-rails.rb

@@ -31,9 +31,17 @@ 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)
-if Rails.env.development?
-  ActionController::Base.send(:before_filter, :reload_r18n)
+
+if ActionController::Base.respond_to? :before_action
+  ActionController::Base.send(:before_action, :set_r18n)
+  if Rails.env.development?
+    ActionController::Base.send(:before_action, :reload_r18n)
+  end
+else
+  ActionController::Base.send(:before_filter, :set_r18n)
+  if Rails.env.development?
+    ActionController::Base.send(:before_filter, :reload_r18n)
+  end
 end
 
 ActionMailer::Base.helper(R18n::Rails::Helpers) if defined? ActionMailer

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

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

data/spec/rails_spec.rb

@@ -10,13 +10,13 @@ describe TestController, type: :controller do
   end
 
   it "gets locale from param" do
-    get :locales, locale: 'ru'
+    get :locales, params: { 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' }
+    get :locales, session: { locale: 'ru' }
     expect(response).to be_success
     expect(response.body).to eq 'ru, en'
   end
@@ -29,7 +29,7 @@ describe TestController, type: :controller do
   end
 
   it "loads translations" do
-    get :translations, locale: 'en'
+    get :translations, params: { locale: 'en' }
     expect(response).to be_success
     expect(response.body).to eq 'R18n: supported. Rails I18n: supported'
   end
@@ -41,7 +41,7 @@ describe TestController, type: :controller do
   end
 
   it "adds helpers" do
-    get :helpers, locale: 'en'
+    get :helpers, params: { locale: 'en' }
     expect(response).to be_success
     expect(response.body).to eq "Name\nName\nName\nName\n"
   end
@@ -54,19 +54,19 @@ describe TestController, type: :controller do
   end
 
   it "adds methods to controller" do
-    get :controller, locale: 'en'
+    get :controller, params: { 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'
+    get :time, params: { 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'
+    get :human_time, params: { locale: 'en' }
     expect(response).to be_success
     expect(response.body).to eq 'now'
   end
@@ -116,20 +116,20 @@ describe TestController, type: :controller do
   end
 
   it "reloads filters from app directory" do
-    get :filter, locale: 'en'
+    get :filter, params: { 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, params: { locale: 'en' }
 
     expect(response).to be_success
     expect(response.body).to eq 'Rails'
   end
 
   it "escapes html inside R18n" do
-    get :safe, locale: 'en'
+    get :safe, params: { locale: 'en' }
     expect(response).to be_success
     expect(response.body).to eq(
       "<b> user.<span style=\"color: red\">[no_tr]</span>\n")
@@ -154,7 +154,7 @@ describe TestController, type: :controller do
     request.env['HTTP_ACCEPT_LANGUAGE'] = 'ru,fr;q=0.9'
     expect(R18n.cache.keys.length).to eq 1
 
-    get :translations, locale: 'en'
+    get :translations, params: { locale: 'en' }
     expect(R18n.cache.keys.length).to eq 2
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r18n-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-05-20 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: 2.1.5
+        version: 2.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 2.1.6
 description: |2
       Out-of-box R18n support for Ruby on Rails.
       It is just a wrapper for R18n Rails API and R18n core libraries.