Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
dc3f25c8
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,发现更多精彩内容 >>
提交
dc3f25c8
编写于
7月 30, 2014
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
turn scope in to a linked list
this makes scope rollback much easier
上级
20a277c9
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
36 addition
and
15 deletion
+36
-15
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+36
-15
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
dc3f25c8
...
...
@@ -771,7 +771,7 @@ module Scoping
# end
def
scope
(
*
args
)
options
=
args
.
extract_options!
.
dup
recover
=
{}
scope
=
{}
options
[
:path
]
=
args
.
flatten
.
join
(
'/'
)
if
args
.
any?
options
[
:constraints
]
||=
{}
...
...
@@ -801,15 +801,15 @@ def scope(*args)
end
if
value
recover
[
option
]
=
@scope
[
option
]
@scope
[
option
]
=
send
(
"merge_
#{
option
}
_scope"
,
@scope
[
option
],
value
)
scope
[
option
]
=
send
(
"merge_
#{
option
}
_scope"
,
@scope
[
option
],
value
)
end
end
@scope
=
@scope
.
new
scope
yield
self
ensure
@scope
.
merge!
(
recover
)
@scope
=
@scope
.
parent
end
# Scopes routes to a specific controller
...
...
@@ -1645,27 +1645,26 @@ def nested_scope? #:nodoc:
def
with_exclusive_scope
begin
old_name_prefix
,
old_path
=
@scope
[
:as
],
@scope
[
:path
]
@scope
[
:as
],
@scope
[
:path
]
=
nil
,
nil
@scope
=
@scope
.
new
(
:as
=>
nil
,
:path
=>
nil
)
with_scope_level
(
:exclusive
)
do
yield
end
ensure
@scope
[
:as
],
@scope
[
:path
]
=
old_name_prefix
,
old_path
@scope
=
@scope
.
parent
end
end
def
with_scope_level
(
kind
)
old
,
@scope
[
:scope_level
]
=
@scope
[
:scope_level
],
kind
@scope
=
@scope
.
new
(
:scope_level
=>
kind
)
yield
ensure
@scope
[
:scope_level
]
=
old
@scope
=
@scope
.
parent
end
def
resource_scope
(
kind
,
resource
)
#:nodoc:
resource
.
shallow
=
@scope
[
:shallow
]
old_resource
,
@scope
[
:scope_level_resource
]
=
@scope
[
:scope_level_resource
],
resource
@scope
=
@scope
.
new
(
:scope_level_resource
=>
resource
)
@nesting
.
push
(
resource
)
with_scope_level
(
kind
)
do
...
...
@@ -1673,7 +1672,7 @@ def resource_scope(kind, resource) #:nodoc:
end
ensure
@nesting
.
pop
@scope
[
:scope_level_resource
]
=
old_resource
@scope
=
@scope
.
parent
end
def
nested_options
#:nodoc:
...
...
@@ -1706,12 +1705,13 @@ def canonical_action?(action, flag) #:nodoc:
end
def
shallow_scope
(
path
,
options
=
{})
#:nodoc:
old_name_prefix
,
old_path
=
@scope
[
:as
],
@scope
[
:path
]
@scope
[
:as
],
@scope
[
:path
]
=
@scope
[
:shallow_prefix
],
@scope
[
:shallow_path
]
scope
=
{
:as
=>
@scope
[
:shallow_prefix
],
:path
=>
@scope
[
:shallow_path
]
}
@scope
=
@scope
.
new
scope
scope
(
path
,
options
)
{
yield
}
ensure
@scope
[
:as
],
@scope
[
:path
]
=
old_name_prefix
,
old_path
@scope
=
@scope
.
parent
end
def
path_for_action
(
action
,
path
)
#:nodoc:
...
...
@@ -1893,9 +1893,30 @@ def concerns(*args)
end
end
class
Scope
# :nodoc:
attr_reader
:parent
def
initialize
(
hash
,
parent
=
{})
@hash
=
hash
@parent
=
parent
end
def
new
(
hash
)
self
.
class
.
new
hash
,
self
end
def
[]
(
key
)
@hash
.
fetch
(
key
)
{
@parent
[
key
]
}
end
def
[]=
(
k
,
v
)
@hash
[
k
]
=
v
end
end
def
initialize
(
set
)
#:nodoc:
@set
=
set
@scope
=
{
:path_names
=>
@set
.
resources_path_names
}
@scope
=
Scope
.
new
({
:path_names
=>
@set
.
resources_path_names
})
@concerns
=
{}
@nesting
=
[]
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录