sinatra-named_routes 0.1.0 → 0.1.1
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.
@@ -1,4 +1,5 @@
|
|
1
1
|
require 'tree'
|
2
|
+
require 'cgi'
|
2
3
|
|
3
4
|
module Sinatra
|
4
5
|
module NamedRoutes
|
@@ -41,9 +42,9 @@ module Sinatra
|
|
41
42
|
options.each do |k, v|
|
42
43
|
regex = /(:#{k})/
|
43
44
|
if path =~ regex
|
44
|
-
path.gsub!(regex, v.to_s)
|
45
|
+
path.gsub!(regex, CGI.escape(v.to_s))
|
45
46
|
else
|
46
|
-
query << "#{k}=#{v}"
|
47
|
+
query << "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"
|
47
48
|
end
|
48
49
|
end
|
49
50
|
|
@@ -30,4 +30,10 @@ describe Sinatra::NamedRoutes::Router do
|
|
30
30
|
subject.set('/two', :name)
|
31
31
|
}.must_raise Sinatra::NamedRoutes::Exceptions::RouteNameTaken
|
32
32
|
end
|
33
|
+
|
34
|
+
it 'should escape route parameters' do
|
35
|
+
subject.set('/admin/:id', :admin)
|
36
|
+
subject.get(:admin, {:id => 'a/b'}).must_equal '/admin/a%2Fb'
|
37
|
+
end
|
38
|
+
|
33
39
|
end
|
@@ -79,6 +79,14 @@ describe 'NamedRoutes' do
|
|
79
79
|
|
80
80
|
end
|
81
81
|
|
82
|
+
it 'should escape unsafe characters correctly' do
|
83
|
+
mock_app{ get(named(:some_name, '/some_path/:id')) { url_for(:some_name, {:id => '/', 'k!ey' => 'v&lue'}) }}
|
84
|
+
get "/some_path/foo"
|
85
|
+
|
86
|
+
last_response.status.must_equal 200
|
87
|
+
last_response.body.must_equal "/some_path/%2F?k%21ey=v%26lue"
|
88
|
+
end
|
89
|
+
|
82
90
|
end
|
83
91
|
|
84
92
|
describe 'with namespaces' do
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sinatra-named_routes
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.1
|
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:
|
12
|
+
date: 2013-05-19 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: sinatra
|
16
|
-
requirement:
|
16
|
+
requirement: !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,15 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements:
|
24
|
+
version_requirements: !ruby/object:Gem::Requirement
|
25
|
+
none: false
|
26
|
+
requirements:
|
27
|
+
- - ! '>='
|
28
|
+
- !ruby/object:Gem::Version
|
29
|
+
version: '0'
|
25
30
|
- !ruby/object:Gem::Dependency
|
26
31
|
name: tree
|
27
|
-
requirement:
|
32
|
+
requirement: !ruby/object:Gem::Requirement
|
28
33
|
none: false
|
29
34
|
requirements:
|
30
35
|
- - ! '>='
|
@@ -32,10 +37,15 @@ dependencies:
|
|
32
37
|
version: '0'
|
33
38
|
type: :runtime
|
34
39
|
prerelease: false
|
35
|
-
version_requirements:
|
40
|
+
version_requirements: !ruby/object:Gem::Requirement
|
41
|
+
none: false
|
42
|
+
requirements:
|
43
|
+
- - ! '>='
|
44
|
+
- !ruby/object:Gem::Version
|
45
|
+
version: '0'
|
36
46
|
- !ruby/object:Gem::Dependency
|
37
47
|
name: sinatra-contrib
|
38
|
-
requirement:
|
48
|
+
requirement: !ruby/object:Gem::Requirement
|
39
49
|
none: false
|
40
50
|
requirements:
|
41
51
|
- - ! '>='
|
@@ -43,10 +53,15 @@ dependencies:
|
|
43
53
|
version: '0'
|
44
54
|
type: :development
|
45
55
|
prerelease: false
|
46
|
-
version_requirements:
|
56
|
+
version_requirements: !ruby/object:Gem::Requirement
|
57
|
+
none: false
|
58
|
+
requirements:
|
59
|
+
- - ! '>='
|
60
|
+
- !ruby/object:Gem::Version
|
61
|
+
version: '0'
|
47
62
|
- !ruby/object:Gem::Dependency
|
48
63
|
name: rake
|
49
|
-
requirement:
|
64
|
+
requirement: !ruby/object:Gem::Requirement
|
50
65
|
none: false
|
51
66
|
requirements:
|
52
67
|
- - ! '>='
|
@@ -54,18 +69,28 @@ dependencies:
|
|
54
69
|
version: '0'
|
55
70
|
type: :development
|
56
71
|
prerelease: false
|
57
|
-
version_requirements:
|
72
|
+
version_requirements: !ruby/object:Gem::Requirement
|
73
|
+
none: false
|
74
|
+
requirements:
|
75
|
+
- - ! '>='
|
76
|
+
- !ruby/object:Gem::Version
|
77
|
+
version: '0'
|
58
78
|
- !ruby/object:Gem::Dependency
|
59
79
|
name: minitest
|
60
|
-
requirement:
|
80
|
+
requirement: !ruby/object:Gem::Requirement
|
61
81
|
none: false
|
62
82
|
requirements:
|
63
|
-
- - =
|
83
|
+
- - '='
|
64
84
|
- !ruby/object:Gem::Version
|
65
85
|
version: 3.2.0
|
66
86
|
type: :development
|
67
87
|
prerelease: false
|
68
|
-
version_requirements:
|
88
|
+
version_requirements: !ruby/object:Gem::Requirement
|
89
|
+
none: false
|
90
|
+
requirements:
|
91
|
+
- - '='
|
92
|
+
- !ruby/object:Gem::Version
|
93
|
+
version: 3.2.0
|
69
94
|
description: Sinatra extension that allows you to use name your routes
|
70
95
|
email:
|
71
96
|
- federomero@gmail.com
|
@@ -96,24 +121,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
96
121
|
- - ! '>='
|
97
122
|
- !ruby/object:Gem::Version
|
98
123
|
version: '0'
|
99
|
-
segments:
|
100
|
-
- 0
|
101
|
-
hash: -3106058868979547746
|
102
124
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
103
125
|
none: false
|
104
126
|
requirements:
|
105
127
|
- - ! '>='
|
106
128
|
- !ruby/object:Gem::Version
|
107
129
|
version: '0'
|
108
|
-
segments:
|
109
|
-
- 0
|
110
|
-
hash: -3106058868979547746
|
111
130
|
requirements: []
|
112
131
|
rubyforge_project:
|
113
|
-
rubygems_version: 1.8.
|
132
|
+
rubygems_version: 1.8.23
|
114
133
|
signing_key:
|
115
134
|
specification_version: 3
|
116
135
|
summary: Sinatra named routes
|
117
136
|
test_files:
|
118
137
|
- spec/sinatra/named_routes/router_spec.rb
|
119
138
|
- spec/sinatra/named_routes_spec.rb
|
139
|
+
has_rdoc:
|