Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
92d16ec1
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,发现更多精彩内容 >>
提交
92d16ec1
编写于
5月 30, 2014
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
only loop over `options` once (hopefully)
上级
c0fc116f
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
11 addition
and
13 deletion
+11
-13
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+11
-13
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
92d16ec1
...
...
@@ -89,14 +89,15 @@ def initialize(scope, path, options)
constraints
=
constraints
(
options_constraints
,
scope
[
:constraints
]
||
{})
(
scope
[
:constraints
]
||
{}),
path_params
)
normalize_requirements!
(
path_params
,
formatted
,
constraints
)
@conditions
[
:path_info
]
=
path
@conditions
[
:parsed_path_info
]
=
ast
normalize_conditions!
(
path_params
,
path
,
ast
,
via
,
constraint
s
)
add_request_method
(
via
,
@condition
s
)
normalize_defaults!
(
formatted
,
options_constraints
)
end
...
...
@@ -207,15 +208,7 @@ def verify_callable_constraint(callable_constraint)
end
end
def
normalize_conditions!
(
path_params
,
path
,
ast
,
via
,
constraints
)
required_defaults
=
[]
options
.
each
do
|
key
,
required_default
|
unless
path_params
.
include?
(
key
)
||
Regexp
===
required_default
required_defaults
<<
key
end
end
@conditions
[
:required_defaults
]
=
required_defaults
def
add_request_method
(
via
,
conditions
)
unless
via
==
[
:all
]
if
via
.
empty?
msg
=
"You should not use the `match` method in your router without specifying an HTTP method.
\n
"
\
...
...
@@ -226,7 +219,7 @@ def normalize_conditions!(path_params, path, ast, via, constraints)
raise
ArgumentError
,
msg
end
@
conditions
[
:request_method
]
=
via
.
map
{
|
m
|
m
.
to_s
.
dasherize
.
upcase
}
conditions
[
:request_method
]
=
via
.
map
{
|
m
|
m
.
to_s
.
dasherize
.
upcase
}
end
end
...
...
@@ -309,10 +302,15 @@ def blocks(options_constraints, scope_blocks)
end
end
def
constraints
(
option_constraints
,
constraints
)
def
constraints
(
option_constraints
,
constraints
,
path_params
)
required_defaults
=
[]
options
.
each_pair
do
|
key
,
option
|
constraints
[
key
]
=
option
if
Regexp
===
option
unless
path_params
.
include?
(
key
)
||
Regexp
===
option
required_defaults
<<
key
end
end
@conditions
[
:required_defaults
]
=
required_defaults
constraints
.
merge!
(
option_constraints
)
if
option_constraints
.
is_a?
(
Hash
)
constraints
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录