Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
8c7e8976
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,发现更多精彩内容 >>
提交
8c7e8976
编写于
4月 16, 2010
作者:
D
Diego Carrion
提交者:
Jeremy Kemper
4月 17, 2010
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
added shorthand support for routes like /projects/status(.:format)
Signed-off-by:
N
Jeremy Kemper
<
jeremy@bitsweat.net
>
上级
afcd2522
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
3 deletion
+14
-3
actionpack/CHANGELOG
actionpack/CHANGELOG
+2
-0
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+3
-3
actionpack/test/dispatch/routing_test.rb
actionpack/test/dispatch/routing_test.rb
+9
-0
未找到文件。
actionpack/CHANGELOG
浏览文件 @
8c7e8976
*
Rails
3.0.0
[
beta
4
/
release
candidate
]
(
unreleased
)*
*
Add
support
for
shorthand
routes
like
/
projects
/
status
(.:
format
)
#
4423
[
Diego
Carrion
]
*
Changed
translate
helper
so
that
it
doesn
’
t
mark
every
translation
as
safe
HTML
.
Only
keys
with
a
"_html"
suffix
and
keys
named
"html"
are
considered
to
be
safe
HTML
.
All
other
translations
are
left
untouched
.
[
Craig
Davey
]
...
...
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
8c7e8976
...
...
@@ -66,8 +66,8 @@ def extract_path_and_options(args)
path
=
normalize_path
(
path
)
if
using_match_shorthand?
(
path
,
options
)
options
[
:to
]
||=
path
[
1
..-
1
].
sub
(
%r{/([^/]*)$}
,
'#\1'
)
options
[
:as
]
||=
path
[
1
..-
1
].
gsub
(
"/"
,
"_"
)
options
[
:to
]
||=
path
[
1
..-
1
].
sub
(
%r{/([^/]*)$}
,
'#\1'
)
.
sub
(
%r{
\(
.*
\)
}
,
''
)
options
[
:as
]
||=
path
[
1
..-
1
].
gsub
(
"/"
,
"_"
)
.
sub
(
%r{
\(
.*
\)
}
,
''
)
end
[
path
,
options
]
...
...
@@ -80,7 +80,7 @@ def using_to_shorthand?(args, options)
# match "account/overview"
def
using_match_shorthand?
(
path
,
options
)
path
&&
options
.
except
(
:via
,
:anchor
,
:to
,
:as
).
empty?
&&
path
=~
%r{^/[
\w
\/
]+
$}
path
&&
options
.
except
(
:via
,
:anchor
,
:to
,
:as
).
empty?
&&
path
=~
%r{^/[
\w
+/?]+(
\(
.*
\)
)*
$}
end
def
normalize_path
(
path
)
...
...
actionpack/test/dispatch/routing_test.rb
浏览文件 @
8c7e8976
...
...
@@ -54,6 +54,8 @@ def self.matches?(request)
match
"/local/:action"
,
:controller
=>
"local"
match
"/projects/status(.:format)"
constraints
(
:ip
=>
/192\.168\.1\.\d\d\d/
)
do
get
'admin'
=>
"queenbee#index"
end
...
...
@@ -426,6 +428,13 @@ def test_local
end
end
def
test_projects_status
with_test_routes
do
assert_equal
'/projects/status'
,
url_for
(
:controller
=>
'projects'
,
:action
=>
'status'
,
:only_path
=>
true
)
assert_equal
'/projects/status.json'
,
url_for
(
:controller
=>
'projects'
,
:action
=>
'status'
,
:format
=>
'json'
,
:only_path
=>
true
)
end
end
def
test_projects
with_test_routes
do
get
'/projects'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录