r18n-rails 2.1.5 → 2.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c7671766f66e26384fe607a6bffa9fb0cbc986e4
4
- data.tar.gz: fc095a07dc698fc6e8e2c24cf455a8505cc634c9
3
+ metadata.gz: 98e0ae526a2605f8e9639f16128c3e3284b0845e
4
+ data.tar.gz: 5f4b7aca9b579aea6d1bbee1acf08b04bb64c0ca
5
5
  SHA512:
6
- metadata.gz: fa0e187445b4beb3147caa14d2f593e8305ebeca92f0fda2aea2c20b01d6a2096e6c9c7143452570f989b37ae7d3dbdd8f051801396dbfd43de0962d8634176e
7
- data.tar.gz: b56f306aa2fc25a67275dd417a6928d589a2c0bd7611ca1fc6089530d46d4cb2db806ae0fb85569c22e485f68e13b0b060292e701754fd82d6998d197760177d
6
+ metadata.gz: 3fc5d0693ae5d250a139d11bdf9dbc1637269b4f56741762da35e8ebb023a692f110b432ed7d8897559bcf632d92268e377b995de01e2d1ade8cc8c4cd841635
7
+ data.tar.gz: 585f0a5140517de98501d025562815aec480b8736b697cdc8ddd6d4808d96fe7841e3688682b524a2070d9f20cd259621a160c809c5c667a6e0ced1c7c7942d5
data/lib/r18n-rails.rb CHANGED
@@ -31,9 +31,17 @@ R18n.default_places { [Rails.root.join('app/i18n'), R18n::Loader::Rails.new] }
31
31
 
32
32
  ActionController::Base.helper(R18n::Rails::Helpers)
33
33
  ActionController::Base.send(:include, R18n::Rails::Controller)
34
- ActionController::Base.send(:before_filter, :set_r18n)
35
- if Rails.env.development?
36
- ActionController::Base.send(:before_filter, :reload_r18n)
34
+
35
+ if ActionController::Base.respond_to? :before_action
36
+ ActionController::Base.send(:before_action, :set_r18n)
37
+ if Rails.env.development?
38
+ ActionController::Base.send(:before_action, :reload_r18n)
39
+ end
40
+ else
41
+ ActionController::Base.send(:before_filter, :set_r18n)
42
+ if Rails.env.development?
43
+ ActionController::Base.send(:before_filter, :reload_r18n)
44
+ end
37
45
  end
38
46
 
39
47
  ActionMailer::Base.helper(R18n::Rails::Helpers) if defined? ActionMailer
@@ -1,19 +1,19 @@
1
1
  class TestController < ApplicationController
2
2
  layout false
3
3
 
4
- before_filter :reload_r18n, only: :filter
4
+ before_action :reload_r18n, only: :filter
5
5
 
6
6
  def locales
7
- render text: R18n.get.locales.map { |i| i.code }.join(', ')
7
+ render plain: R18n.get.locales.map { |i| i.code }.join(', ')
8
8
  end
9
9
 
10
10
  def translations
11
- render text: "R18n: #{R18n.get.r18n.translations}. " +
12
- "Rails I18n: #{R18n.get.i18n.translations}"
11
+ render plain: "R18n: #{R18n.get.r18n.translations}. " +
12
+ "Rails I18n: #{R18n.get.i18n.translations}"
13
13
  end
14
14
 
15
15
  def available
16
- render text: R18n.get.available_locales.map { |i| i.code }.sort.join(' ')
16
+ render plain: R18n.get.available_locales.map { |i| i.code }.sort.join(' ')
17
17
  end
18
18
 
19
19
  def helpers
@@ -22,24 +22,24 @@ class TestController < ApplicationController
22
22
  end
23
23
 
24
24
  def untranslated
25
- render text: "#{R18n.get.user.not.exists}"
25
+ render plain: "#{R18n.get.user.not.exists}"
26
26
  end
27
27
 
28
28
  def controller
29
- render text: "#{t.user.name} #{r18n.t.user.name} #{t('user.name')}"
29
+ render plain: "#{t.user.name} #{r18n.t.user.name} #{t('user.name')}"
30
30
  end
31
31
 
32
32
  def time
33
- render text: l(Time.at(0).utc) + "\n" +
34
- l(Time.at(0).utc, format: :short)
33
+ render plain: l(Time.at(0).utc) + "\n" +
34
+ l(Time.at(0).utc, format: :short)
35
35
  end
36
36
 
37
37
  def human_time
38
- render text: l(Time.now, :human)
38
+ render plain: l(Time.now, :human)
39
39
  end
40
40
 
41
41
  def filter
42
- render text: t.ruby
42
+ render plain: t.ruby
43
43
  end
44
44
 
45
45
  def format
data/spec/rails_spec.rb CHANGED
@@ -10,13 +10,13 @@ describe TestController, type: :controller do
10
10
  end
11
11
 
12
12
  it "gets locale from param" do
13
- get :locales, locale: 'ru'
13
+ get :locales, params: { locale: 'ru' }
14
14
  expect(response).to be_success
15
15
  expect(response.body).to eq 'ru, en'
16
16
  end
17
17
 
18
18
  it "gets locale from session" do
19
- get :locales, {}, { locale: 'ru' }
19
+ get :locales, session: { locale: 'ru' }
20
20
  expect(response).to be_success
21
21
  expect(response.body).to eq 'ru, en'
22
22
  end
@@ -29,7 +29,7 @@ describe TestController, type: :controller do
29
29
  end
30
30
 
31
31
  it "loads translations" do
32
- get :translations, locale: 'en'
32
+ get :translations, params: { locale: 'en' }
33
33
  expect(response).to be_success
34
34
  expect(response.body).to eq 'R18n: supported. Rails I18n: supported'
35
35
  end
@@ -41,7 +41,7 @@ describe TestController, type: :controller do
41
41
  end
42
42
 
43
43
  it "adds helpers" do
44
- get :helpers, locale: 'en'
44
+ get :helpers, params: { locale: 'en' }
45
45
  expect(response).to be_success
46
46
  expect(response.body).to eq "Name\nName\nName\nName\n"
47
47
  end
@@ -54,19 +54,19 @@ describe TestController, type: :controller do
54
54
  end
55
55
 
56
56
  it "adds methods to controller" do
57
- get :controller, locale: 'en'
57
+ get :controller, params: { locale: 'en' }
58
58
  expect(response).to be_success
59
59
  expect(response.body).to eq "Name Name Name"
60
60
  end
61
61
 
62
62
  it "localizes time by Rails I18n" do
63
- get :time, locale: 'en'
63
+ get :time, params: { locale: 'en' }
64
64
  expect(response).to be_success
65
65
  expect(response.body).to eq "Thu, 01 Jan 1970 00:00:00 +0000\n01 Jan 00:00"
66
66
  end
67
67
 
68
68
  it "localizes time by R18n" do
69
- get :human_time, locale: 'en'
69
+ get :human_time, params: { locale: 'en' }
70
70
  expect(response).to be_success
71
71
  expect(response.body).to eq 'now'
72
72
  end
@@ -116,20 +116,20 @@ describe TestController, type: :controller do
116
116
  end
117
117
 
118
118
  it "reloads filters from app directory" do
119
- get :filter, locale: 'en'
119
+ get :filter, params: { locale: 'en' }
120
120
  expect(response).to be_success
121
121
  expect(response.body).to eq 'Rails'
122
122
  expect(R18n::Rails::Filters.loaded).to eq [:rails_custom_filter]
123
123
 
124
124
  R18n::Filters.defined[:rails_custom_filter].block = proc { 'No' }
125
- get :filter, locale: 'en'
125
+ get :filter, params: { locale: 'en' }
126
126
 
127
127
  expect(response).to be_success
128
128
  expect(response.body).to eq 'Rails'
129
129
  end
130
130
 
131
131
  it "escapes html inside R18n" do
132
- get :safe, locale: 'en'
132
+ get :safe, params: { locale: 'en' }
133
133
  expect(response).to be_success
134
134
  expect(response.body).to eq(
135
135
  "<b> user.<span style=\"color: red\">[no_tr]</span>\n")
@@ -154,7 +154,7 @@ describe TestController, type: :controller do
154
154
  request.env['HTTP_ACCEPT_LANGUAGE'] = 'ru,fr;q=0.9'
155
155
  expect(R18n.cache.keys.length).to eq 1
156
156
 
157
- get :translations, locale: 'en'
157
+ get :translations, params: { locale: 'en' }
158
158
  expect(R18n.cache.keys.length).to eq 2
159
159
  end
160
160
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: r18n-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.5
4
+ version: 2.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrey Sitnik
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-02-02 00:00:00.000000000 Z
11
+ date: 2017-05-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: r18n-rails-api
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 2.1.5
19
+ version: 2.1.6
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 2.1.5
26
+ version: 2.1.6
27
27
  description: |2
28
28
  Out-of-box R18n support for Ruby on Rails.
29
29
  It is just a wrapper for R18n Rails API and R18n core libraries.