Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
8f2b1a12
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,发现更多精彩内容 >>
提交
8f2b1a12
编写于
5月 16, 2013
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #10652 from md5/concern-multiple-included
Raise an error when multiple included blocks are defined for a Concern
上级
9fef7c8d
2d7a86e1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
0 deletion
+28
-0
activesupport/CHANGELOG.md
activesupport/CHANGELOG.md
+6
-0
activesupport/lib/active_support/concern.rb
activesupport/lib/active_support/concern.rb
+8
-0
activesupport/test/concern_test.rb
activesupport/test/concern_test.rb
+14
-0
未找到文件。
activesupport/CHANGELOG.md
浏览文件 @
8f2b1a12
*
Raise an error when multiple
`included`
blocks are defined for a Concern.
The old behavior would silently discard previously defined blocks, running
only the last one.
*Mike Dillon*
*
Replace
`multi_json`
with
`json`
.
Since Rails requires Ruby 1.9 and since Ruby 1.9 includes `json` in the standard library,
...
...
activesupport/lib/active_support/concern.rb
浏览文件 @
8f2b1a12
...
...
@@ -98,6 +98,12 @@ module ActiveSupport
# include Bar # works, Bar takes care now of its dependencies
# end
module
Concern
class
MultipleIncludedBlocks
<
StandardError
#:nodoc:
def
initialize
super
"Cannot define multiple 'included' blocks for a Concern"
end
end
def
self
.
extended
(
base
)
#:nodoc:
base
.
instance_variable_set
(
"@_dependencies"
,
[])
end
...
...
@@ -117,6 +123,8 @@ def append_features(base)
def
included
(
base
=
nil
,
&
block
)
if
base
.
nil?
raise
MultipleIncludedBlocks
if
instance_variable_defined?
(
"@_included_block"
)
@_included_block
=
block
else
super
...
...
activesupport/test/concern_test.rb
浏览文件 @
8f2b1a12
...
...
@@ -91,4 +91,18 @@ def test_dependencies_with_multiple_modules
@klass
.
send
(
:include
,
Foo
)
assert_equal
[
ConcernTest
::
Foo
,
ConcernTest
::
Bar
,
ConcernTest
::
Baz
],
@klass
.
included_modules
[
0
..
2
]
end
def
test_raise_on_multiple_included_calls
assert_raises
(
ActiveSupport
::
Concern
::
MultipleIncludedBlocks
)
do
Module
.
new
do
extend
ActiveSupport
::
Concern
included
do
end
included
do
end
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录