Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
3420849f
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,发现更多精彩内容 >>
提交
3420849f
编写于
8月 11, 2015
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
only do is_a? checks on `options_constraints` once
we don't need to do it so many times.
上级
ea4da199
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
16 deletion
+9
-16
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+9
-16
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
3420849f
...
...
@@ -76,7 +76,7 @@ def self.build(scope, set, path, as, controller, default_action, to, options)
defaults
=
(
scope
[
:defaults
]
||
{}).
dup
scope_constraints
=
scope
[
:constraints
]
||
{}
new
set
,
path
,
defaults
,
as
,
controller
,
default_action
,
scope
[
:module
],
to
,
formatted
,
scope_constraints
,
scope
[
:blocks
],
options
new
set
,
path
,
defaults
,
as
,
controller
,
default_action
,
scope
[
:module
],
to
,
formatted
,
scope_constraints
,
scope
[
:blocks
]
||
[]
,
options
end
def
initialize
(
set
,
path
,
defaults
,
as
,
controller
,
default_action
,
modyoule
,
to
,
formatted
,
scope_constraints
,
blocks
,
options
)
...
...
@@ -91,7 +91,7 @@ def initialize(set, path, defaults, as, controller, default_action, modyoule, to
@anchor
=
options
.
delete
:anchor
via
=
Array
(
options
.
delete
(
:via
)
{
[]
})
options_constraints
=
options
.
delete
:constraints
options_constraints
=
options
.
delete
(
:constraints
)
||
{}
path
=
normalize_path!
path
,
formatted
ast
=
path_ast
path
...
...
@@ -103,8 +103,6 @@ def initialize(set, path, defaults, as, controller, default_action, modyoule, to
split_constraints
path_params
,
scope_constraints
.
merge
(
constraints
)
@blocks
=
blocks
(
options_constraints
,
blocks
)
if
options_constraints
.
is_a?
(
Hash
)
split_constraints
path_params
,
options_constraints
options_constraints
.
each
do
|
key
,
default
|
...
...
@@ -112,6 +110,9 @@ def initialize(set, path, defaults, as, controller, default_action, modyoule, to
@defaults
[
key
]
||=
default
end
end
@blocks
=
blocks
else
@blocks
=
blocks
(
options_constraints
)
end
normalize_format!
(
formatted
)
...
...
@@ -218,12 +219,6 @@ def normalize_defaults!(options)
end
end
def
verify_callable_constraint
(
callable_constraint
)
unless
callable_constraint
.
respond_to?
(
:call
)
||
callable_constraint
.
respond_to?
(
:matches?
)
raise
ArgumentError
,
"Invalid constraint:
#{
callable_constraint
.
inspect
}
must respond to :call or :matches?"
end
end
def
add_request_method
(
via
,
conditions
)
return
if
via
==
[
:all
]
...
...
@@ -303,13 +298,11 @@ def translate_controller(controller)
yield
end
def
blocks
(
options_constraints
,
scope_blocks
)
if
options_constraints
&&
!
options_constraints
.
is_a?
(
Hash
)
verify_callable_constraint
(
options_constraints
)
[
options_constraints
]
else
scope_blocks
||
[]
def
blocks
(
callable_constraint
)
unless
callable_constraint
.
respond_to?
(
:call
)
||
callable_constraint
.
respond_to?
(
:matches?
)
raise
ArgumentError
,
"Invalid constraint:
#{
callable_constraint
.
inspect
}
must respond to :call or :matches?"
end
[
callable_constraint
]
end
def
constraints
(
options
,
path_params
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录