Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
e9852c92
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,发现更多精彩内容 >>
提交
e9852c92
编写于
8月 08, 2016
作者:
Y
Yves Senn
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #25681 from willnet/fix-thread_mattr_accessor
Fix `thread_mattr_accessor` share variable superclass with subclass
上级
628474f2
3529e58e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
48 addition
and
4 deletion
+48
-4
activesupport/CHANGELOG.md
activesupport/CHANGELOG.md
+28
-0
activesupport/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb
...support/core_ext/module/attribute_accessors_per_thread.rb
+4
-4
activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb
...est/core_ext/module/attribute_accessor_per_thread_test.rb
+16
-0
未找到文件。
activesupport/CHANGELOG.md
浏览文件 @
e9852c92
*
Fix
`thread_mattr_accessor`
subclass no longer overwrites parent.
Assigning a value to a subclass using `thread_mattr_accessor` no
longer changes the value of the parent class. This brings the
behavior inline with the documentation.
Given:
class Account
thread_mattr_accessor :user
end
class Customer < Account
end
Account.user = "DHH"
Customer.user = "Rafael"
Before:
Account.user # => "Rafael"
After:
Account.user # => "DHH"
*Shinichi Maeshima*
*
Since weeks are no longer converted to days, add
`:weeks`
to the list of
parts that
`ActiveSupport::TimeWithZone`
will recognize as possibly being
of variable duration to take account of DST transitions.
...
...
activesupport/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb
浏览文件 @
e9852c92
...
...
@@ -41,14 +41,14 @@ def thread_mattr_reader(*syms)
raise
NameError
.
new
(
"invalid attribute name:
#{
sym
}
"
)
unless
/^[_A-Za-z]\w*$/
.
match?
(
sym
)
class_eval
(
<<-
EOS
,
__FILE__
,
__LINE__
+
1
)
def self.
#{
sym
}
Thread.current[
:"attr_
#{
name
}
_
#{
sym
}
"]
Thread.current[
"attr_"+ name + "
_
#{
sym
}
"]
end
EOS
unless
options
[
:instance_reader
]
==
false
||
options
[
:instance_accessor
]
==
false
class_eval
(
<<-
EOS
,
__FILE__
,
__LINE__
+
1
)
def
#{
sym
}
Thread.current[
:"attr_
#{
name
}
_
#{
sym
}
"]
Thread.current[
"attr_"+ self.class.name + "
_
#{
sym
}
"]
end
EOS
end
...
...
@@ -80,14 +80,14 @@ def thread_mattr_writer(*syms)
raise
NameError
.
new
(
"invalid attribute name:
#{
sym
}
"
)
unless
/^[_A-Za-z]\w*$/
.
match?
(
sym
)
class_eval
(
<<-
EOS
,
__FILE__
,
__LINE__
+
1
)
def self.
#{
sym
}
=(obj)
Thread.current[
:"attr_
#{
name
}
_
#{
sym
}
"] = obj
Thread.current[
"attr_"+ name + "
_
#{
sym
}
"] = obj
end
EOS
unless
options
[
:instance_writer
]
==
false
||
options
[
:instance_accessor
]
==
false
class_eval
(
<<-
EOS
,
__FILE__
,
__LINE__
+
1
)
def
#{
sym
}
=(obj)
Thread.current[
:"attr_
#{
name
}
_
#{
sym
}
"] = obj
Thread.current[
"attr_"+ self.class.name + "
_
#{
sym
}
"] = obj
end
EOS
end
...
...
activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb
浏览文件 @
e9852c92
...
...
@@ -8,6 +8,12 @@ def setup
thread_mattr_accessor
:bar
,
instance_writer:
false
thread_mattr_reader
:shaq
,
instance_reader:
false
thread_mattr_accessor
:camp
,
instance_accessor:
false
def
self
.
name
;
"MyClass"
end
end
@subclass
=
Class
.
new
(
@class
)
do
def
self
.
name
;
"SubMyClass"
end
end
@object
=
@class
.
new
...
...
@@ -112,4 +118,14 @@ def test_should_return_same_value_by_class_or_instance_accessor
assert_equal
@class
.
foo
,
@object
.
foo
end
def
test_should_not_affect_superclass_if_subclass_set_value
@class
.
foo
=
"super"
assert_equal
@class
.
foo
,
"super"
assert_nil
@subclass
.
foo
@subclass
.
foo
=
"sub"
assert_equal
@class
.
foo
,
"super"
assert_equal
@subclass
.
foo
,
"sub"
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录