Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
6be8251e
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,发现更多精彩内容 >>
提交
6be8251e
编写于
8月 21, 2008
作者:
J
Joshua Peek
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Simplified and renamed CallbackChain union method to replace_or_append!
上级
f388725b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
13 deletion
+18
-13
actionpack/lib/action_controller/dispatcher.rb
actionpack/lib/action_controller/dispatcher.rb
+1
-1
activesupport/lib/active_support/callbacks.rb
activesupport/lib/active_support/callbacks.rb
+13
-8
activesupport/test/callbacks_test.rb
activesupport/test/callbacks_test.rb
+4
-4
未找到文件。
actionpack/lib/action_controller/dispatcher.rb
浏览文件 @
6be8251e
...
...
@@ -44,7 +44,7 @@ def dispatch(cgi = nil, session_options = CgiRequest::DEFAULT_SESSION_OPTIONS, o
def
to_prepare
(
identifier
=
nil
,
&
block
)
@prepare_dispatch_callbacks
||=
ActiveSupport
::
Callbacks
::
CallbackChain
.
new
callback
=
ActiveSupport
::
Callbacks
::
Callback
.
new
(
:prepare_dispatch
,
block
,
:identifier
=>
identifier
)
@prepare_dispatch_callbacks
|
callback
@prepare_dispatch_callbacks
.
replace_or_append!
(
callback
)
end
# If the block raises, send status code as a last-ditch response.
...
...
activesupport/lib/active_support/callbacks.rb
浏览文件 @
6be8251e
...
...
@@ -96,15 +96,12 @@ def run(object, options = {}, &terminator)
end
end
def
|
(
chain
)
if
chain
.
is_a?
(
CallbackChain
)
chain
.
each
{
|
callback
|
self
|
callback
}
# TODO: Decompose into more Array like behavior
def
replace_or_append!
(
chain
)
if
index
=
index
(
chain
)
self
[
index
]
=
chain
else
if
(
found_callback
=
find
(
chain
))
&&
(
index
=
index
(
chain
))
self
[
index
]
=
chain
else
self
<<
chain
end
self
<<
chain
end
self
end
...
...
@@ -157,6 +154,14 @@ def dup
self
.
class
.
new
(
@kind
,
@method
,
@options
.
dup
)
end
def
hash
if
@identifier
@identifier
.
hash
else
@method
.
hash
end
end
def
call
(
*
args
,
&
block
)
evaluate_method
(
method
,
*
args
,
&
block
)
if
should_run_callback?
(
*
args
)
rescue
LocalJumpError
...
...
activesupport/test/callbacks_test.rb
浏览文件 @
6be8251e
...
...
@@ -134,10 +134,10 @@ def test_find
assert_equal
:bacon
,
@chain
.
find
(
:bacon
).
method
end
def
test_
union
assert_equal
[
:bacon
,
:lettuce
,
:tomato
],
(
@chain
|
Callback
.
new
(
:make
,
:bacon
)).
map
(
&
:method
)
assert_equal
[
:bacon
,
:lettuce
,
:tomato
,
:turkey
],
(
@chain
|
CallbackChain
.
build
(
:make
,
:bacon
,
:lettuce
,
:tomato
,
:turkey
)).
map
(
&
:method
)
assert_equal
[
:bacon
,
:lettuce
,
:tomato
,
:turkey
,
:mayo
],
(
@chain
|
Callback
.
new
(
:make
,
:mayo
)).
map
(
&
:method
)
def
test_
replace_or_append
assert_equal
[
:bacon
,
:lettuce
,
:tomato
],
(
@chain
.
replace_or_append!
(
Callback
.
new
(
:make
,
:bacon
)
)).
map
(
&
:method
)
assert_equal
[
:bacon
,
:lettuce
,
:tomato
,
:turkey
],
(
@chain
.
replace_or_append!
(
Callback
.
new
(
:make
,
:turkey
)
)).
map
(
&
:method
)
assert_equal
[
:bacon
,
:lettuce
,
:tomato
,
:turkey
,
:mayo
],
(
@chain
.
replace_or_append!
(
Callback
.
new
(
:make
,
:mayo
)
)).
map
(
&
:method
)
end
def
test_delete
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录