rails-translate-routes 0.1.1 → 0.1.2

Sign up to get free protection for your applications and to get access to all the features.
data/README.rdoc CHANGED
@@ -214,6 +214,8 @@ Thanks to:
214
214
  * Jean-Loup Fenaux (https://github.com/jlfenaux)
215
215
  * Cyril Mouge (https://github.com/shingara)
216
216
  * Nicolas Arbogast (https://github.com/NicoArbogast)
217
+ * Stephan van Eijkelenburg (https://github.com/stephanvane)
218
+ * Víctor Martín (https://github.com/eltercero)
217
219
 
218
220
  * Main development of forked gem:
219
221
  * Raul Murciano (http://github.com/raul)
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.1
1
+ 0.1.2
@@ -274,7 +274,11 @@ class RailsTranslateRoutes
274
274
  if Rails.version >= '3.2'
275
275
  conditions = { :path_info => translate_path(route.path.spec.to_s, locale) }
276
276
  conditions[:request_method] = parse_request_methods route.verb if route.verb != //
277
- conditions[:subdomain] = route.constraints[:subdomain] if route.constraints
277
+ if route.constraints
278
+ route.constraints.each do |k,v|
279
+ conditions[k] = v unless k == :request_method
280
+ end
281
+ end
278
282
  defaults = route.defaults.merge LOCALE_PARAM_KEY => locale.dup
279
283
  else
280
284
  conditions = { :path_info => translate_path(route.path, locale) }
@@ -322,7 +326,7 @@ class RailsTranslateRoutes
322
326
  path_without_optional_segments = final_optional_segments ? path.gsub(final_optional_segments,'') : path
323
327
  path_segments = path_without_optional_segments.split("/")
324
328
  new_path = path_segments.map{ |seg| translate_path_segment(seg, locale) }.join('/')
325
- new_path = "/#{locale.downcase}#{new_path}" if add_prefix?(locale)
329
+ new_path = "/#{locale}#{new_path}" if add_prefix?(locale)
326
330
  new_path = '/' if new_path.blank?
327
331
  final_optional_segments ? new_path + final_optional_segments : new_path
328
332
  end
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "rails-translate-routes"
8
- s.version = "0.1.1"
8
+ s.version = "0.1.2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Francesc Pla"]
12
- s.date = "2012-06-20"
12
+ s.date = "2012-06-29"
13
13
  s.description = "Simple gem to translate routes in Rails 3.x based on translate_routes"
14
14
  s.email = "francesc@francesc.net"
15
15
  s.extra_rdoc_files = [
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rails-translate-routes
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-06-20 00:00:00.000000000 Z
12
+ date: 2012-06-29 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
16
- requirement: &70158312886580 !ruby/object:Gem::Requirement
16
+ requirement: &70170729745220 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.1'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70158312886580
24
+ version_requirements: *70170729745220
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: bundler
27
- requirement: &70158312885360 !ruby/object:Gem::Requirement
27
+ requirement: &70170729744620 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.0.0
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70158312885360
35
+ version_requirements: *70170729744620
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: jeweler
38
- requirement: &70158312884340 !ruby/object:Gem::Requirement
38
+ requirement: &70170729744140 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 1.6.4
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70158312884340
46
+ version_requirements: *70170729744140
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: sqlite3
49
- requirement: &70158312882840 !ruby/object:Gem::Requirement
49
+ requirement: &70170729760020 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70158312882840
57
+ version_requirements: *70170729760020
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: minitest
60
- requirement: &70158312881380 !ruby/object:Gem::Requirement
60
+ requirement: &70170729759500 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70158312881380
68
+ version_requirements: *70170729759500
69
69
  description: Simple gem to translate routes in Rails 3.x based on translate_routes
70
70
  email: francesc@francesc.net
71
71
  executables: []
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
101
101
  version: '0'
102
102
  segments:
103
103
  - 0
104
- hash: -1846561656422203416
104
+ hash: 1600099645769242098
105
105
  required_rubygems_version: !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements: