Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
2ffa126f
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2ffa126f
编写于
5月 27, 2014
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
PARAMETERS_KEY is only used in the request, so move the constant there
上级
cfdab77d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
9 deletion
+9
-9
actionpack/lib/action_dispatch/http/parameters.rb
actionpack/lib/action_dispatch/http/parameters.rb
+4
-2
actionpack/lib/action_dispatch/routing/route_set.rb
actionpack/lib/action_dispatch/routing/route_set.rb
+0
-2
actionpack/test/controller/routing_test.rb
actionpack/test/controller/routing_test.rb
+5
-5
未找到文件。
actionpack/lib/action_dispatch/http/parameters.rb
浏览文件 @
2ffa126f
...
...
@@ -4,6 +4,8 @@
module
ActionDispatch
module
Http
module
Parameters
PARAMETERS_KEY
=
'action_dispatch.request.path_parameters'
def
initialize
(
env
)
super
@symbolized_path_params
=
nil
...
...
@@ -25,7 +27,7 @@ def parameters
def
path_parameters
=
(
parameters
)
#:nodoc:
@env
.
delete
(
'action_dispatch.request.parameters'
)
@env
[
Routing
::
RouteSet
::
PARAMETERS_KEY
]
=
parameters
@env
[
PARAMETERS_KEY
]
=
parameters
end
# The same as <tt>path_parameters</tt> with explicitly symbolized keys.
...
...
@@ -40,7 +42,7 @@ def symbolized_path_parameters
#
# See <tt>symbolized_path_parameters</tt> for symbolized keys.
def
path_parameters
@env
[
Routing
::
RouteSet
::
PARAMETERS_KEY
]
||=
{}
@env
[
PARAMETERS_KEY
]
||=
{}
end
private
...
...
actionpack/lib/action_dispatch/routing/route_set.rb
浏览文件 @
2ffa126f
...
...
@@ -19,8 +19,6 @@ class RouteSet #:nodoc:
# alias inspect to to_s.
alias
inspect
to_s
PARAMETERS_KEY
=
'action_dispatch.request.path_parameters'
class
Dispatcher
<
Routing
::
Endpoint
#:nodoc:
def
initialize
(
defaults
)
@defaults
=
defaults
...
...
actionpack/test/controller/routing_test.rb
浏览文件 @
2ffa126f
...
...
@@ -87,7 +87,7 @@ def setup
def
test_symbols_with_dashes
rs
.
draw
do
get
'/:artist/:song-omg'
,
:to
=>
lambda
{
|
env
|
resp
=
ActiveSupport
::
JSON
.
encode
env
[
ActionDispatch
::
Routing
::
RouteSet
::
PARAMETERS_KEY
]
resp
=
ActiveSupport
::
JSON
.
encode
ActionDispatch
::
Request
.
new
(
env
).
path_parameters
[
200
,
{},
[
resp
]]
}
end
...
...
@@ -99,7 +99,7 @@ def test_symbols_with_dashes
def
test_id_with_dash
rs
.
draw
do
get
'/journey/:id'
,
:to
=>
lambda
{
|
env
|
resp
=
ActiveSupport
::
JSON
.
encode
env
[
ActionDispatch
::
Routing
::
RouteSet
::
PARAMETERS_KEY
]
resp
=
ActiveSupport
::
JSON
.
encode
ActionDispatch
::
Request
.
new
(
env
).
path_parameters
[
200
,
{},
[
resp
]]
}
end
...
...
@@ -111,7 +111,7 @@ def test_id_with_dash
def
test_dash_with_custom_regexp
rs
.
draw
do
get
'/:artist/:song-omg'
,
:constraints
=>
{
:song
=>
/\d+/
},
:to
=>
lambda
{
|
env
|
resp
=
ActiveSupport
::
JSON
.
encode
env
[
ActionDispatch
::
Routing
::
RouteSet
::
PARAMETERS_KEY
]
resp
=
ActiveSupport
::
JSON
.
encode
ActionDispatch
::
Request
.
new
(
env
).
path_parameters
[
200
,
{},
[
resp
]]
}
end
...
...
@@ -124,7 +124,7 @@ def test_dash_with_custom_regexp
def
test_pre_dash
rs
.
draw
do
get
'/:artist/omg-:song'
,
:to
=>
lambda
{
|
env
|
resp
=
ActiveSupport
::
JSON
.
encode
env
[
ActionDispatch
::
Routing
::
RouteSet
::
PARAMETERS_KEY
]
resp
=
ActiveSupport
::
JSON
.
encode
ActionDispatch
::
Request
.
new
(
env
).
path_parameters
[
200
,
{},
[
resp
]]
}
end
...
...
@@ -136,7 +136,7 @@ def test_pre_dash
def
test_pre_dash_with_custom_regexp
rs
.
draw
do
get
'/:artist/omg-:song'
,
:constraints
=>
{
:song
=>
/\d+/
},
:to
=>
lambda
{
|
env
|
resp
=
ActiveSupport
::
JSON
.
encode
env
[
ActionDispatch
::
Routing
::
RouteSet
::
PARAMETERS_KEY
]
resp
=
ActiveSupport
::
JSON
.
encode
ActionDispatch
::
Request
.
new
(
env
).
path_parameters
[
200
,
{},
[
resp
]]
}
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录