Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
dd1f23df
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,发现更多精彩内容 >>
提交
dd1f23df
编写于
5月 21, 2014
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
middle variable is never used, so rm
上级
c5d64b2b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
16 deletion
+16
-16
actionpack/lib/action_dispatch/journey/router.rb
actionpack/lib/action_dispatch/journey/router.rb
+1
-1
actionpack/lib/action_dispatch/routing/route_set.rb
actionpack/lib/action_dispatch/routing/route_set.rb
+1
-1
actionpack/test/journey/router_test.rb
actionpack/test/journey/router_test.rb
+14
-14
未找到文件。
actionpack/lib/action_dispatch/journey/router.rb
浏览文件 @
dd1f23df
...
...
@@ -90,7 +90,7 @@ def recognize(req)
req
.
env
[
'PATH_INFO'
]
=
match
.
post_match
.
sub
(
/^([^\/])/
,
'/\1'
)
end
yield
(
route
,
nil
,
parameters
)
yield
(
route
,
parameters
)
end
end
...
...
actionpack/lib/action_dispatch/routing/route_set.rb
浏览文件 @
dd1f23df
...
...
@@ -699,7 +699,7 @@ def recognize_path(path, environment = {})
end
req
=
@request_class
.
new
(
env
)
@router
.
recognize
(
req
)
do
|
route
,
_matches
,
params
|
@router
.
recognize
(
req
)
do
|
route
,
params
|
params
.
merge!
(
extras
)
params
.
each
do
|
key
,
value
|
if
value
.
is_a?
(
String
)
...
...
actionpack/test/journey/router_test.rb
浏览文件 @
dd1f23df
...
...
@@ -48,7 +48,7 @@ def test_dashes
env
=
rails_env
'PATH_INFO'
=>
'/foo-bar-baz'
called
=
false
router
.
recognize
(
env
)
do
|
r
,
_
,
params
|
router
.
recognize
(
env
)
do
|
r
,
params
|
called
=
true
end
assert
called
...
...
@@ -65,7 +65,7 @@ def test_unicode
env
=
rails_env
'PATH_INFO'
=>
'/%E3%81%BB%E3%81%92'
called
=
false
router
.
recognize
(
env
)
do
|
r
,
_
,
params
|
router
.
recognize
(
env
)
do
|
r
,
params
|
called
=
true
end
assert
called
...
...
@@ -83,7 +83,7 @@ def test_request_class_and_requirements_success
routes
.
add_route
nil
,
path
,
requirements
,
{
:id
=>
nil
},
{}
env
=
rails_env
'PATH_INFO'
=>
'/foo/10'
router
.
recognize
(
env
)
do
|
r
,
_
,
params
|
router
.
recognize
(
env
)
do
|
r
,
params
|
assert_equal
({
:id
=>
'10'
},
params
)
end
...
...
@@ -103,7 +103,7 @@ def test_request_class_and_requirements_fail
router
.
routes
.
add_route
nil
,
path
,
requirements
,
{
:id
=>
nil
},
{}
env
=
rails_env
'PATH_INFO'
=>
'/foo/10'
router
.
recognize
(
env
)
do
|
r
,
_
,
params
|
router
.
recognize
(
env
)
do
|
r
,
params
|
flunk
'route should not be found'
end
...
...
@@ -128,7 +128,7 @@ def test_request_class_overrides_path_info
env
=
rails_env
'PATH_INFO'
=>
'/foo'
,
'custom.path_info'
=>
'/bar'
recognized
=
false
router
.
recognize
(
env
)
do
|
r
,
_
,
params
|
router
.
recognize
(
env
)
do
|
r
,
params
|
recognized
=
true
end
...
...
@@ -144,7 +144,7 @@ def test_regexp_first_precedence
env
=
rails_env
'PATH_INFO'
=>
'/whois/example.com'
list
=
[]
@router
.
recognize
(
env
)
do
|
r
,
_
,
params
|
@router
.
recognize
(
env
)
do
|
r
,
params
|
list
<<
r
end
assert_equal
2
,
list
.
length
...
...
@@ -230,12 +230,12 @@ def test_defaults_merge_correctly
@router
.
routes
.
add_route
nil
,
path
,
{},
{
:id
=>
nil
},
{}
env
=
rails_env
'PATH_INFO'
=>
'/foo/10'
@router
.
recognize
(
env
)
do
|
r
,
_
,
params
|
@router
.
recognize
(
env
)
do
|
r
,
params
|
assert_equal
({
:id
=>
'10'
},
params
)
end
env
=
rails_env
'PATH_INFO'
=>
'/foo'
@router
.
recognize
(
env
)
do
|
r
,
_
,
params
|
@router
.
recognize
(
env
)
do
|
r
,
params
|
assert_equal
({
:id
=>
nil
},
params
)
end
end
...
...
@@ -431,7 +431,7 @@ def test_generate_with_name
env
=
rails_env
'PATH_INFO'
=>
request_path
called
=
false
@router
.
recognize
(
env
)
do
|
r
,
_
,
params
|
@router
.
recognize
(
env
)
do
|
r
,
params
|
assert_equal
route
,
r
assert_equal
(
expected
,
params
)
called
=
true
...
...
@@ -453,7 +453,7 @@ def test_generate_with_name
env
=
rails_env
'PATH_INFO'
=>
request_path
called
=
false
@router
.
recognize
(
env
)
do
|
r
,
_
,
params
|
@router
.
recognize
(
env
)
do
|
r
,
params
|
assert_equal
route
,
r
assert_equal
(
expected
,
params
)
called
=
true
...
...
@@ -481,7 +481,7 @@ def test_namespaced_controller
:id
=>
'10'
}
@router
.
recognize
(
env
)
do
|
r
,
_
,
params
|
@router
.
recognize
(
env
)
do
|
r
,
params
|
assert_equal
route
,
r
assert_equal
(
expected
,
params
)
called
=
true
...
...
@@ -497,7 +497,7 @@ def test_recognize_literal
env
=
rails_env
'PATH_INFO'
=>
'/books/list.rss'
expected
=
{
:controller
=>
'books'
,
:action
=>
'list'
,
:format
=>
'rss'
}
called
=
false
@router
.
recognize
(
env
)
do
|
r
,
_
,
params
|
@router
.
recognize
(
env
)
do
|
r
,
params
|
assert_equal
route
,
r
assert_equal
(
expected
,
params
)
called
=
true
...
...
@@ -518,7 +518,7 @@ def test_recognize_head_request_as_get_route
"REQUEST_METHOD"
=>
"HEAD"
called
=
false
@router
.
recognize
(
env
)
do
|
r
,
_
,
params
|
@router
.
recognize
(
env
)
do
|
r
,
params
|
called
=
true
end
...
...
@@ -542,7 +542,7 @@ def test_recognize_cares_about_verbs
"REQUEST_METHOD"
=>
"POST"
called
=
false
@router
.
recognize
(
env
)
do
|
r
,
_
,
params
|
@router
.
recognize
(
env
)
do
|
r
,
params
|
assert_equal
post
,
r
called
=
true
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录