route_translator 10.0.0 → 12.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +21 -0
  3. data/README.md +2 -3
  4. data/lib/route_translator/extensions/mapper.rb +1 -1
  5. data/lib/route_translator/extensions/route_set.rb +4 -12
  6. data/lib/route_translator/translator/path/segment.rb +2 -2
  7. data/lib/route_translator/translator.rb +4 -2
  8. data/lib/route_translator/version.rb +1 -1
  9. metadata +33 -102
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6ba0fdafb1a82378946c98b7c75a8c659fa83daba8254def31c34a73d8ac243c
4
- data.tar.gz: dd8f448c13448b158d5511e36ebba28bbfd6a2a8eaa2f1f7b387d803d735b654
3
+ metadata.gz: a133d7f79f6b9cd2d4c90befd935682017c4aaae32f51d3783ce9dd5d98ec5b3
4
+ data.tar.gz: 9d19c7e5ef143b1b52531410014f73240a2015f0e59d26934db4da287ae3c67d
5
5
  SHA512:
6
- metadata.gz: 9cb4821500c0ca720fb8dac607c8d349f67e54fa2b9424b5418241e29526bcc6632fd19b8420ab4ff52195eb61cbb0adc6cb9084b43005a17d8f2bc0ab177e47
7
- data.tar.gz: 56ddc940436e550ed783bd0b83ced6418ecb06ff1a5a5332218b1d4f1e02e051c825c7020aa22eca795477d1c7d250bd2a064de94bd61f76e5393d790e73ee58
6
+ metadata.gz: 35a66ef44e1a9a80a91d0ef84d28c200091b6840b5a4f6cad524b85c10910776781987ae1fbc2ccb1f32970e7c7abfdbb22a10ba60605c023abee2a6bbc8c753
7
+ data.tar.gz: 02c6fa219f1c92e95468e4efb241f393fb5abbef057cf92e715fe1d73ad9d5f65b6a3bdc1b8e64ca5b7ed7a0c9ba29f225c27ab24ea5309670f393f0623c89ab
data/CHANGELOG.md CHANGED
@@ -1,5 +1,26 @@
1
1
  # Changelog
2
2
 
3
+ ## 12.1.0 / 2021-12-20
4
+
5
+ * [FEATURE] Add Rails 7.0 compatibility
6
+ * [ENHANCEMENT] Update development dependencies
7
+
8
+ ## 12.0.0 / 2021-11-28
9
+
10
+ * [BUGFIX] Fix disable_fallback behavior ([#241](https://github.com/enriclluelles/route_translator/issues/241))
11
+ * [ENHANCEMENT] Update development dependencies
12
+
13
+ ## 11.0.1 / 2021-11-15
14
+
15
+ * [ENHANCEMENT] Require MFA to publish gems
16
+ * [ENHANCEMENT] Update development dependencies
17
+
18
+ ## 11.0.0 / 2021-09-26
19
+
20
+ * [FEATURE] Drop Ruby 2.4 support
21
+ * [FEATURE] Drop Rails 5.0 and 5.1 support
22
+ * [ENHANCEMENT] Update development dependencies
23
+
3
24
  ## 10.0.0 / 2021-01-16
4
25
 
5
26
  * [BUGFIX] Verify host path consistency by default ([#91](https://github.com/enriclluelles/route_translator/issues/91), [#171](https://github.com/enriclluelles/route_translator/issues/171))
data/README.md CHANGED
@@ -1,8 +1,7 @@
1
1
  # RouteTranslator
2
2
 
3
3
  [![Gem Version](https://badge.fury.io/rb/route_translator.svg)](https://badge.fury.io/rb/route_translator)
4
- [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=route_translator&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=route_translator&package-manager=bundler&version-scheme=semver)
5
- [![Build Status](https://travis-ci.org/enriclluelles/route_translator.svg?branch=master)](https://travis-ci.org/enriclluelles/route_translator)
4
+ [![Build Status](https://github.com/enriclluelles/route_translator/actions/workflows/ruby.yml/badge.svg)](https://github.com/enriclluelles/route_translator/actions)
6
5
  [![Maintainability](https://api.codeclimate.com/v1/badges/1c369ce6147724b353fc/maintainability)](https://codeclimate.com/github/enriclluelles/route_translator/maintainability)
7
6
  [![Coverage Status](https://coveralls.io/repos/github/enriclluelles/route_translator/badge.svg?branch=master)](https://coveralls.io/github/enriclluelles/route_translator?branch=master)
8
7
 
@@ -10,7 +9,7 @@ RouteTranslator is a gem to allow you to manage the translations of your app rou
10
9
 
11
10
  It started as a fork of the awesome [translate_routes](https://github.com/raul/translate_routes) plugin by [Raúl Murciano](https://github.com/raul).
12
11
 
13
- Right now it works with Rails 5.x and Rails 6.x
12
+ Right now it works with Rails 5.2 and Rails 6.x
14
13
 
15
14
 
16
15
 
data/lib/route_translator/extensions/mapper.rb CHANGED
@@ -38,7 +38,7 @@ module ActionDispatch
38
38
  ast = Journey::Parser.parse path
39
39
 
40
40
  mapping = Mapping.build(@scope, @set, ast, controller, default_action, to, via, formatted, options_constraints, anchor, options)
41
- @set.add_localized_route(mapping, ast, as, anchor, @scope, path, controller, default_action, to, via, formatted, options_constraints, options)
41
+ @set.add_localized_route(mapping, as, anchor, @scope, path, controller, default_action, to, via, formatted, options_constraints, options)
42
42
  end
43
43
  # rubocop:enable Lint/UnderscorePrefixedVariableName, Metrics/PerceivedComplexity
44
44
 
data/lib/route_translator/extensions/route_set.rb CHANGED
@@ -5,20 +5,20 @@ require 'action_dispatch'
5
5
  module ActionDispatch
6
6
  module Routing
7
7
  class RouteSet
8
- def add_localized_route(mapping, path_ast, name, anchor, scope, path, controller, default_action, to, via, formatted, options_constraints, options)
8
+ def add_localized_route(mapping, name, anchor, scope, path, controller, default_action, to, via, formatted, options_constraints, options)
9
9
  route = RouteTranslator::Route.new(self, path, name, options_constraints, options, mapping)
10
10
 
11
11
  RouteTranslator::Translator.translations_for(route) do |locale, translated_name, translated_path, translated_options_constraints, translated_options|
12
12
  translated_path_ast = ::ActionDispatch::Journey::Parser.parse(translated_path)
13
13
  translated_mapping = translate_mapping(locale, self, translated_options, translated_path_ast, scope, controller, default_action, to, formatted, via, translated_options_constraints, anchor)
14
14
 
15
- add_route_to_set translated_mapping, translated_path_ast, translated_name, anchor
15
+ add_route translated_mapping, translated_name
16
16
  end
17
17
 
18
18
  if RouteTranslator.config.generate_unnamed_unlocalized_routes
19
- add_route_to_set mapping, path_ast, nil, anchor
19
+ add_route mapping, nil
20
20
  elsif RouteTranslator.config.generate_unlocalized_routes
21
- add_route_to_set mapping, path_ast, name, anchor
21
+ add_route mapping, name
22
22
  end
23
23
  end
24
24
 
@@ -39,14 +39,6 @@ module ActionDispatch
39
39
 
40
40
  ::ActionDispatch::Routing::Mapper::Mapping.build scope_params, route_set, translated_path_ast, controller, default_action, to, via, formatted, translated_options_constraints, anchor, translated_options
41
41
  end
42
-
43
- def add_route_to_set(mapping, path_ast, name, anchor)
44
- if method(:add_route).arity == 4
45
- add_route mapping, path_ast, name, anchor
46
- else
47
- add_route mapping, name
48
- end
49
- end
50
42
  end
51
43
  end
52
44
  end
data/lib/route_translator/translator/path/segment.rb CHANGED
@@ -9,7 +9,7 @@ module RouteTranslator
9
9
 
10
10
  def fallback_options(str, locale)
11
11
  if RouteTranslator.config.disable_fallback && locale.to_s != I18n.default_locale.to_s
12
- { scope: :routes, fallback: true }
12
+ { scope: :routes, fallback: false }
13
13
  else
14
14
  { scope: :routes, default: str }
15
15
  end
@@ -25,7 +25,7 @@ module RouteTranslator
25
25
  opts = { locale: locale, scope: scope }
26
26
 
27
27
  if I18n.t(str, **opts.merge(exception_handler: handler)).is_a?(I18n::MissingTranslation)
28
- I18n.t str, **opts.merge(fallback_options(str, locale))
28
+ I18n.t! str, **opts.merge(fallback_options(str, locale))
29
29
  else
30
30
  I18n.t str, **opts
31
31
  end
data/lib/route_translator/translator.rb CHANGED
@@ -10,8 +10,10 @@ module RouteTranslator
10
10
  private
11
11
 
12
12
  def locale_from_args(args)
13
- args_hash = args.detect { |arg| arg.is_a?(Hash) }
14
- args_hash[:locale] if RouteTranslator.config.host_locales.present? && args_hash
13
+ return if RouteTranslator.config.host_locales.blank?
14
+
15
+ args_hash = args.find { |arg| arg.is_a?(Hash) }
16
+ args_hash&.fetch(:locale, nil)
15
17
  end
16
18
 
17
19
  def translate_name(name, locale, named_routes_names)
data/lib/route_translator/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module RouteTranslator
4
- VERSION = '10.0.0'
4
+ VERSION = '12.1.0'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: route_translator
3
3
  version: !ruby/object:Gem::Version
4
- version: 10.0.0
4
+ version: 12.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Geremia Taglialatela
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2021-01-16 00:00:00.000000000 Z
13
+ date: 2021-12-20 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: actionpack
@@ -18,40 +18,40 @@ dependencies:
18
18
  requirements:
19
19
  - - ">="
20
20
  - !ruby/object:Gem::Version
21
- version: 5.0.0.1
21
+ version: '5.2'
22
22
  - - "<"
23
23
  - !ruby/object:Gem::Version
24
- version: '6.2'
24
+ version: '7.1'
25
25
  type: :runtime
26
26
  prerelease: false
27
27
  version_requirements: !ruby/object:Gem::Requirement
28
28
  requirements:
29
29
  - - ">="
30
30
  - !ruby/object:Gem::Version
31
- version: 5.0.0.1
31
+ version: '5.2'
32
32
  - - "<"
33
33
  - !ruby/object:Gem::Version
34
- version: '6.2'
34
+ version: '7.1'
35
35
  - !ruby/object:Gem::Dependency
36
36
  name: activesupport
37
37
  requirement: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - ">="
40
40
  - !ruby/object:Gem::Version
41
- version: 5.0.0.1
41
+ version: '5.2'
42
42
  - - "<"
43
43
  - !ruby/object:Gem::Version
44
- version: '6.2'
44
+ version: '7.1'
45
45
  type: :runtime
46
46
  prerelease: false
47
47
  version_requirements: !ruby/object:Gem::Requirement
48
48
  requirements:
49
49
  - - ">="
50
50
  - !ruby/object:Gem::Version
51
- version: 5.0.0.1
51
+ version: '5.2'
52
52
  - - "<"
53
53
  - !ruby/object:Gem::Version
54
- version: '6.2'
54
+ version: '7.1'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: addressable
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '2.3'
75
+ version: '2.4'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '2.3'
82
+ version: '2.4'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: byebug
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -100,54 +100,40 @@ dependencies:
100
100
  - - "<"
101
101
  - !ruby/object:Gem::Version
102
102
  version: '12'
103
- - !ruby/object:Gem::Dependency
104
- name: coveralls_reborn
105
- requirement: !ruby/object:Gem::Requirement
106
- requirements:
107
- - - "~>"
108
- - !ruby/object:Gem::Version
109
- version: 0.20.0
110
- type: :development
111
- prerelease: false
112
- version_requirements: !ruby/object:Gem::Requirement
113
- requirements:
114
- - - "~>"
115
- - !ruby/object:Gem::Version
116
- version: 0.20.0
117
103
  - !ruby/object:Gem::Dependency
118
104
  name: minitest
119
105
  requirement: !ruby/object:Gem::Requirement
120
106
  requirements:
121
107
  - - "~>"
122
108
  - !ruby/object:Gem::Version
123
- version: '5.14'
109
+ version: '5.15'
124
110
  type: :development
125
111
  prerelease: false
126
112
  version_requirements: !ruby/object:Gem::Requirement
127
113
  requirements:
128
114
  - - "~>"
129
115
  - !ruby/object:Gem::Version
130
- version: '5.14'
116
+ version: '5.15'
131
117
  - !ruby/object:Gem::Dependency
132
118
  name: rails
133
119
  requirement: !ruby/object:Gem::Requirement
134
120
  requirements:
135
121
  - - ">="
136
122
  - !ruby/object:Gem::Version
137
- version: 5.0.0.1
123
+ version: '5.2'
138
124
  - - "<"
139
125
  - !ruby/object:Gem::Version
140
- version: '6.2'
126
+ version: '7.1'
141
127
  type: :development
142
128
  prerelease: false
143
129
  version_requirements: !ruby/object:Gem::Requirement
144
130
  requirements:
145
131
  - - ">="
146
132
  - !ruby/object:Gem::Version
147
- version: 5.0.0.1
133
+ version: '5.2'
148
134
  - - "<"
149
135
  - !ruby/object:Gem::Version
150
- version: '6.2'
136
+ version: '7.1'
151
137
  - !ruby/object:Gem::Dependency
152
138
  name: rake
153
139
  requirement: !ruby/object:Gem::Requirement
@@ -163,95 +149,39 @@ dependencies:
163
149
  - !ruby/object:Gem::Version
164
150
  version: '13.0'
165
151
  - !ruby/object:Gem::Dependency
166
- name: rubocop
167
- requirement: !ruby/object:Gem::Requirement
168
- requirements:
169
- - - "~>"
170
- - !ruby/object:Gem::Version
171
- version: '1.8'
172
- type: :development
173
- prerelease: false
174
- version_requirements: !ruby/object:Gem::Requirement
175
- requirements:
176
- - - "~>"
177
- - !ruby/object:Gem::Version
178
- version: '1.8'
179
- - !ruby/object:Gem::Dependency
180
- name: rubocop-minitest
152
+ name: simplecov
181
153
  requirement: !ruby/object:Gem::Requirement
182
154
  requirements:
183
- - - "~>"
184
- - !ruby/object:Gem::Version
185
- version: 0.10.3
186
- type: :development
187
- prerelease: false
188
- version_requirements: !ruby/object:Gem::Requirement
189
- requirements:
190
- - - "~>"
155
+ - - ">="
191
156
  - !ruby/object:Gem::Version
192
- version: 0.10.3
193
- - !ruby/object:Gem::Dependency
194
- name: rubocop-performance
195
- requirement: !ruby/object:Gem::Requirement
196
- requirements:
197
- - - "~>"
157
+ version: 0.18.5
158
+ - - "<"
198
159
  - !ruby/object:Gem::Version
199
- version: '1.9'
160
+ version: '0.22'
200
161
  type: :development
201
162
  prerelease: false
202
163
  version_requirements: !ruby/object:Gem::Requirement
203
164
  requirements:
204
- - - "~>"
205
- - !ruby/object:Gem::Version
206
- version: '1.9'
207
- - !ruby/object:Gem::Dependency
208
- name: rubocop-rails
209
- requirement: !ruby/object:Gem::Requirement
210
- requirements:
211
- - - "~>"
165
+ - - ">="
212
166
  - !ruby/object:Gem::Version
213
- version: '2.9'
214
- type: :development
215
- prerelease: false
216
- version_requirements: !ruby/object:Gem::Requirement
217
- requirements:
218
- - - "~>"
167
+ version: 0.18.5
168
+ - - "<"
219
169
  - !ruby/object:Gem::Version
220
- version: '2.9'
170
+ version: '0.22'
221
171
  - !ruby/object:Gem::Dependency
222
- name: rubocop-rake
172
+ name: simplecov-lcov
223
173
  requirement: !ruby/object:Gem::Requirement
224
174
  requirements:
225
175
  - - "~>"
226
176
  - !ruby/object:Gem::Version
227
- version: 0.5.1
177
+ version: 0.8.0
228
178
  type: :development
229
179
  prerelease: false
230
180
  version_requirements: !ruby/object:Gem::Requirement
231
181
  requirements:
232
182
  - - "~>"
233
183
  - !ruby/object:Gem::Version
234
- version: 0.5.1
235
- - !ruby/object:Gem::Dependency
236
- name: simplecov
237
- requirement: !ruby/object:Gem::Requirement
238
- requirements:
239
- - - ">="
240
- - !ruby/object:Gem::Version
241
- version: 0.18.5
242
- - - "<"
243
- - !ruby/object:Gem::Version
244
- version: '0.22'
245
- type: :development
246
- prerelease: false
247
- version_requirements: !ruby/object:Gem::Requirement
248
- requirements:
249
- - - ">="
250
- - !ruby/object:Gem::Version
251
- version: 0.18.5
252
- - - "<"
253
- - !ruby/object:Gem::Version
254
- version: '0.22'
184
+ version: 0.8.0
255
185
  description: Translates the Rails routes of your application into the languages defined
256
186
  in your locale files
257
187
  email:
@@ -281,6 +211,7 @@ homepage: https://github.com/enriclluelles/route_translator
281
211
  licenses:
282
212
  - MIT
283
213
  metadata:
214
+ rubygems_mfa_required: 'true'
284
215
  bug_tracker_uri: https://github.com/enriclluelles/route_translator/issues
285
216
  changelog_uri: https://github.com/enriclluelles/route_translator/blob/master/CHANGELOG.md
286
217
  source_code_uri: https://github.com/enriclluelles/route_translator
@@ -292,14 +223,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
292
223
  requirements:
293
224
  - - ">="
294
225
  - !ruby/object:Gem::Version
295
- version: '2.4'
226
+ version: '2.5'
296
227
  required_rubygems_version: !ruby/object:Gem::Requirement
297
228
  requirements:
298
229
  - - ">="
299
230
  - !ruby/object:Gem::Version
300
231
  version: '0'
301
232
  requirements: []
302
- rubygems_version: 3.2.3
233
+ rubygems_version: 3.1.6
303
234
  signing_key:
304
235
  specification_version: 4
305
236
  summary: Translate your Rails routes in a simple manner