route_translator 4.2.4 → 4.2.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +5 -13
  2. data/CHANGELOG.md +5 -0
  3. data/lib/route_translator/translator.rb +6 -6
  4. data/lib/route_translator/version.rb +1 -1
  5. metadata +31 -31
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- NmM1ODU2OGZkMThmMTI3N2ZlMTY0YzZmMzA4MmFkYjIzNDVmMDBkMA==
5
- data.tar.gz: !binary |-
6
- YWMzZWM5ZDIxY2UxYjAzMzY1ZWU4YWJhZGJmZDAxNmUxMTVlYTE1Nw==
2
+ SHA1:
3
+ metadata.gz: 10ceb80395c63ce7a1a2bff26fee839e70b7e6c0
4
+ data.tar.gz: d58781515b4edf999fce7b437e0189f9902607c9
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- NjE5NGZiNTgyODM1ZDg5MjM4OWY5ZjgwNzhhYWU2MzFlMjlkNTJiOTkzYjg4
10
- ZGQzZjk5OTk3MWI4YjVlOTE5MzUyMzllYzhlOTBlMWVhZDBjNDJmMDEzZTVm
11
- YjI2NDk4ZmQxNWFmNDgzMGJlYjhkYzM1OWQzYTlhYWUwOTY3ZGU=
12
- data.tar.gz: !binary |-
13
- NDk2OGU0ODUxZTk5NGU0NzdhZGEyMzJjNWE4NTY5NDM4MmNlOWI5NWRiZmE3
14
- ZmQwZmFlOTY4ZTY4ODk3NWQzN2I3MzU5NTZlOTk0YWQ5YmZhMWExMjI3NWQ1
15
- M2E3NjNlMTI5MDI2MTYyNjZkYzU0MmJhODczNDE3NDQ0MGJlNGI=
6
+ metadata.gz: a3fc636732fc8f7ac6cd1a91664be5a362aa6213a097f1457ca91786f5107525110dd9b0c3ff0971417e7330d14a6df050c7065f98bc04494a24db5ad80ccd7f
7
+ data.tar.gz: 68f23b5611d193b1195118e620e3aab594865906d9c4f6167aa974fa3e4e3cc5272928d2078abdde7a4e2e834c159bde5172b06610cec2af3b725c510063a5b3
data/CHANGELOG.md CHANGED
@@ -1,5 +1,10 @@
1
1
  # Changelog
2
2
 
3
+ ## 4.2.5 (2016-02-11)
4
+
5
+ * Fix: Generate correct route when a segment is preceded by a dot (#132)
6
+ * Improve TestCase helpers test
7
+
3
8
  ## 4.2.4 (2016-02-04)
4
9
 
5
10
  * Change how helpers are loaded in TestCase
data/lib/route_translator/translator.rb CHANGED
@@ -84,16 +84,16 @@ module RouteTranslator
84
84
  def self.translate_path(path, locale)
85
85
  new_path = path.dup
86
86
  final_optional_segments = new_path.slice!(%r{(\([^\/]+\))$})
87
- translated_segments = new_path.split(%r{\/|\.}).map { |seg| translate_path_segment(seg, locale) }.select { |seg| !seg.blank? }
87
+ translated_segments = new_path.split('/').map do |seg|
88
+ seg.split('.').map { |phrase| translate_path_segment(phrase, locale) }.join('.')
89
+ end
90
+ translated_segments.reject!(&:empty?)
88
91
 
89
92
  if display_locale?(locale) && !locale_param_present?(new_path)
90
93
  translated_segments.unshift(locale.to_s.downcase)
91
94
  end
92
95
 
93
- joined_segments = translated_segments.inject do |memo, segment|
94
- separator = segment == ':format' ? '.' : '/'
95
- memo << separator << segment
96
- end
96
+ joined_segments = translated_segments.join('/')
97
97
 
98
98
  "/#{joined_segments}#{final_optional_segments}".gsub(%r{\/\(\/}, '(/')
99
99
  end
@@ -120,7 +120,7 @@ module RouteTranslator
120
120
  # segment is blank, begins with a ":" (param key) or "*" (wildcard),
121
121
  # the segment is returned untouched
122
122
  def self.translate_path_segment(segment, locale)
123
- return segment if segment.blank?
123
+ return segment if segment.empty?
124
124
  named_param, hyphenized = segment.split('-'.freeze, 2) if segment.starts_with?(':'.freeze)
125
125
  return "#{named_param}-#{translate_path_segment(hyphenized.dup, locale)}" if hyphenized
126
126
  return segment if segment.starts_with?('('.freeze) || segment.starts_with?('*'.freeze) || segment.include?(':'.freeze)
data/lib/route_translator/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module RouteTranslator
3
- VERSION = '4.2.4'.freeze
3
+ VERSION = '4.2.5'.freeze
4
4
  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: 4.2.4
4
+ version: 4.2.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Raul Murciano
@@ -9,142 +9,142 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-02-04 00:00:00.000000000 Z
12
+ date: 2016-02-11 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ! '>='
18
+ - - ">="
19
19
  - !ruby/object:Gem::Version
20
20
  version: '3.2'
21
- - - <
21
+ - - "<"
22
22
  - !ruby/object:Gem::Version
23
23
  version: '5.0'
24
24
  type: :runtime
25
25
  prerelease: false
26
26
  version_requirements: !ruby/object:Gem::Requirement
27
27
  requirements:
28
- - - ! '>='
28
+ - - ">="
29
29
  - !ruby/object:Gem::Version
30
30
  version: '3.2'
31
- - - <
31
+ - - "<"
32
32
  - !ruby/object:Gem::Version
33
33
  version: '5.0'
34
34
  - !ruby/object:Gem::Dependency
35
35
  name: actionpack
36
36
  requirement: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ! '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '3.2'
41
- - - <
41
+ - - "<"
42
42
  - !ruby/object:Gem::Version
43
43
  version: '5.0'
44
44
  type: :runtime
45
45
  prerelease: false
46
46
  version_requirements: !ruby/object:Gem::Requirement
47
47
  requirements:
48
- - - ! '>='
48
+ - - ">="
49
49
  - !ruby/object:Gem::Version
50
50
  version: '3.2'
51
- - - <
51
+ - - "<"
52
52
  - !ruby/object:Gem::Version
53
53
  version: '5.0'
54
54
  - !ruby/object:Gem::Dependency
55
55
  name: appraisal
56
56
  requirement: !ruby/object:Gem::Requirement
57
57
  requirements:
58
- - - ~>
58
+ - - "~>"
59
59
  - !ruby/object:Gem::Version
60
60
  version: '2.1'
61
61
  type: :development
62
62
  prerelease: false
63
63
  version_requirements: !ruby/object:Gem::Requirement
64
64
  requirements:
65
- - - ~>
65
+ - - "~>"
66
66
  - !ruby/object:Gem::Version
67
67
  version: '2.1'
68
68
  - !ruby/object:Gem::Dependency
69
69
  name: coveralls
70
70
  requirement: !ruby/object:Gem::Requirement
71
71
  requirements:
72
- - - ~>
72
+ - - "~>"
73
73
  - !ruby/object:Gem::Version
74
74
  version: 0.8.10
75
75
  type: :development
76
76
  prerelease: false
77
77
  version_requirements: !ruby/object:Gem::Requirement
78
78
  requirements:
79
- - - ~>
79
+ - - "~>"
80
80
  - !ruby/object:Gem::Version
81
81
  version: 0.8.10
82
82
  - !ruby/object:Gem::Dependency
83
83
  name: minitest
84
84
  requirement: !ruby/object:Gem::Requirement
85
85
  requirements:
86
- - - ! '>='
86
+ - - ">="
87
87
  - !ruby/object:Gem::Version
88
88
  version: 4.7.5
89
- - - <
89
+ - - "<"
90
90
  - !ruby/object:Gem::Version
91
91
  version: 6.0.0
92
92
  type: :development
93
93
  prerelease: false
94
94
  version_requirements: !ruby/object:Gem::Requirement
95
95
  requirements:
96
- - - ! '>='
96
+ - - ">="
97
97
  - !ruby/object:Gem::Version
98
98
  version: 4.7.5
99
- - - <
99
+ - - "<"
100
100
  - !ruby/object:Gem::Version
101
101
  version: 6.0.0
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rails
104
104
  requirement: !ruby/object:Gem::Requirement
105
105
  requirements:
106
- - - ! '>='
106
+ - - ">="
107
107
  - !ruby/object:Gem::Version
108
108
  version: '3.2'
109
- - - <
109
+ - - "<"
110
110
  - !ruby/object:Gem::Version
111
111
  version: '5.0'
112
112
  type: :development
113
113
  prerelease: false
114
114
  version_requirements: !ruby/object:Gem::Requirement
115
115
  requirements:
116
- - - ! '>='
116
+ - - ">="
117
117
  - !ruby/object:Gem::Version
118
118
  version: '3.2'
119
- - - <
119
+ - - "<"
120
120
  - !ruby/object:Gem::Version
121
121
  version: '5.0'
122
122
  - !ruby/object:Gem::Dependency
123
123
  name: rubocop
124
124
  requirement: !ruby/object:Gem::Requirement
125
125
  requirements:
126
- - - ~>
126
+ - - "~>"
127
127
  - !ruby/object:Gem::Version
128
- version: 0.37.0
128
+ version: 0.37.2
129
129
  type: :development
130
130
  prerelease: false
131
131
  version_requirements: !ruby/object:Gem::Requirement
132
132
  requirements:
133
- - - ~>
133
+ - - "~>"
134
134
  - !ruby/object:Gem::Version
135
- version: 0.37.0
135
+ version: 0.37.2
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: simplecov
138
138
  requirement: !ruby/object:Gem::Requirement
139
139
  requirements:
140
- - - ~>
140
+ - - "~>"
141
141
  - !ruby/object:Gem::Version
142
142
  version: 0.11.2
143
143
  type: :development
144
144
  prerelease: false
145
145
  version_requirements: !ruby/object:Gem::Requirement
146
146
  requirements:
147
- - - ~>
147
+ - - "~>"
148
148
  - !ruby/object:Gem::Version
149
149
  version: 0.11.2
150
150
  description: Translates the Rails routes of your application into the languages defined
@@ -175,17 +175,17 @@ require_paths:
175
175
  - lib
176
176
  required_ruby_version: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ! '>='
178
+ - - ">="
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  required_rubygems_version: !ruby/object:Gem::Requirement
182
182
  requirements:
183
- - - ! '>='
183
+ - - ">="
184
184
  - !ruby/object:Gem::Version
185
185
  version: '0'
186
186
  requirements: []
187
187
  rubyforge_project:
188
- rubygems_version: 2.4.2
188
+ rubygems_version: 2.5.1
189
189
  signing_key:
190
190
  specification_version: 4
191
191
  summary: Translate your Rails routes in a simple manner