Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
8b39dfd6
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,发现更多精彩内容 >>
提交
8b39dfd6
编写于
9月 19, 2014
作者:
M
Matthew Draper
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #16964 from Agis-/issue-16956
Make delegation work with the reserved words passed to `:to`
上级
c2dfc316
1a787ebb
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
26 addition
and
1 deletion
+26
-1
activesupport/CHANGELOG.md
activesupport/CHANGELOG.md
+6
-0
activesupport/lib/active_support/core_ext/module/delegation.rb
...esupport/lib/active_support/core_ext/module/delegation.rb
+9
-1
activesupport/test/core_ext/module_test.rb
activesupport/test/core_ext/module_test.rb
+11
-0
未找到文件。
activesupport/CHANGELOG.md
浏览文件 @
8b39dfd6
*
Delegation now works with ruby reserved words passed to
`:to`
option.
Fixes #16956.
*Agis Anastasopoulos*
*
Added method
`#eql?`
to
`ActiveSupport::Duration`
, in addition to
`#==`
.
Currently, the following returns `false`, contrary to expectation:
...
...
activesupport/lib/active_support/core_ext/module/delegation.rb
浏览文件 @
8b39dfd6
require
'set'
class
Module
# Error generated by +delegate+ when a method is called on +nil+ and +allow_nil+
# option is not used.
class
DelegationError
<
NoMethodError
;
end
RUBY_RESERVED_WORDS
=
Set
.
new
(
%w(alias and BEGIN begin break case class def defined? do else elsif END
end ensure false for if in module next nil not or redo rescue retry
return self super then true undef unless until when while yield)
).
freeze
# Provides a +delegate+ class method to easily expose contained objects'
# public methods as your own.
#
...
...
@@ -163,7 +171,7 @@ def delegate(*methods)
line
=
line
.
to_i
to
=
to
.
to_s
to
=
'self.class'
if
to
==
'class'
to
=
"self.
#{
to
}
"
if
RUBY_RESERVED_WORDS
.
include?
(
to
)
methods
.
each
do
|
method
|
# Attribute writer methods only accept one argument. Makes sure []=
...
...
activesupport/test/core_ext/module_test.rb
浏览文件 @
8b39dfd6
...
...
@@ -56,8 +56,14 @@ def self.table_name
delegate
:name
,
:to
=>
:client
,
:prefix
=>
nil
end
Event
=
Struct
.
new
(
:case
)
do
delegate
:foo
,
:to
=>
:case
end
Tester
=
Struct
.
new
(
:client
)
do
delegate
:name
,
:to
=>
:client
,
:prefix
=>
false
def
foo
;
1
;
end
end
Product
=
Struct
.
new
(
:name
)
do
...
...
@@ -495,4 +501,9 @@ def duck; 'duck' end
assert_equal
'duck_with_orange'
,
@instance
.
duck
assert
FooClassWithBarMethod
.
public_method_defined?
(
:duck
)
end
def
test_delegate_with_case
event
=
Event
.
new
(
Tester
.
new
)
assert_equal
1
,
event
.
foo
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录