Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
79a0c8cf
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,发现更多精彩内容 >>
提交
79a0c8cf
编写于
8月 10, 2012
作者:
B
Bogdan Gusiev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
RouteSet: refactor internals
No need to build valid_conditions array. We can get all the data in place.
上级
2da242f6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
10 deletion
+7
-10
actionpack/lib/action_dispatch/routing/route_set.rb
actionpack/lib/action_dispatch/routing/route_set.rb
+7
-10
未找到文件。
actionpack/lib/action_dispatch/routing/route_set.rb
浏览文件 @
79a0c8cf
...
...
@@ -226,7 +226,7 @@ def optimized_helper(route)
attr_accessor
:formatter
,
:set
,
:named_routes
,
:default_scope
,
:router
attr_accessor
:disable_clear_and_finalize
,
:resources_path_names
attr_accessor
:default_url_options
,
:request_class
,
:valid_conditions
attr_accessor
:default_url_options
,
:request_class
alias
:routes
:set
...
...
@@ -238,13 +238,7 @@ def initialize(request_class = ActionDispatch::Request)
self
.
named_routes
=
NamedRouteCollection
.
new
self
.
resources_path_names
=
self
.
class
.
default_resources_path_names
.
dup
self
.
default_url_options
=
{}
self
.
request_class
=
request_class
@valid_conditions
=
{
:controller
=>
true
,
:action
=>
true
}
request_class
.
public_instance_methods
.
each
{
|
m
|
@valid_conditions
[
m
]
=
true
}
@valid_conditions
.
delete
(
:id
)
@append
=
[]
@prepend
=
[]
...
...
@@ -375,7 +369,7 @@ def add_route(app, conditions = {}, requirements = {}, defaults = {}, name = nil
raise
ArgumentError
,
"Invalid route name: '
#{
name
}
'"
unless
name
.
blank?
||
name
.
to_s
.
match
(
/^[_a-z]\w*$/i
)
path
=
build_path
(
conditions
.
delete
(
:path_info
),
requirements
,
SEPARATORS
,
anchor
)
conditions
=
build_conditions
(
conditions
,
valid_conditions
,
path
.
names
.
map
{
|
x
|
x
.
to_sym
})
conditions
=
build_conditions
(
conditions
,
path
.
names
.
map
{
|
x
|
x
.
to_sym
})
route
=
@set
.
add_route
(
app
,
path
,
conditions
,
defaults
,
name
)
named_routes
[
name
]
=
route
if
name
&&
!
named_routes
[
name
]
...
...
@@ -412,7 +406,7 @@ def build_path(path, requirements, separators, anchor)
end
private
:build_path
def
build_conditions
(
current_conditions
,
req_predicates
,
path_values
)
def
build_conditions
(
current_conditions
,
path_values
)
conditions
=
current_conditions
.
dup
verbs
=
conditions
[
:request_method
]
||
[]
...
...
@@ -424,7 +418,10 @@ def build_conditions(current_conditions, req_predicates, path_values)
unless
verbs
.
empty?
conditions
[
:request_method
]
=
%r[^
#{
verbs
.
join
(
'|'
)
}
$]
end
conditions
.
delete_if
{
|
k
,
v
|
!
(
req_predicates
.
include?
(
k
)
||
path_values
.
include?
(
k
))
}
conditions
.
keep_if
do
|
k
,
v
|
k
==
:action
||
k
==
:controller
||
@request_class
.
public_method_defined?
(
k
)
||
path_values
.
include?
(
k
)
end
conditions
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录