Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
7595c595
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,发现更多精彩内容 >>
提交
7595c595
编写于
1月 07, 2016
作者:
S
Sean Griffin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #18909 from davidcornu/fix-hash-with-indifferent-access-default
Match HashWithIndifferentAccess#default & Hash#default
上级
b4f28dbb
38a99023
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
24 addition
and
8 deletion
+24
-8
activesupport/CHANGELOG.md
activesupport/CHANGELOG.md
+4
-0
activesupport/lib/active_support/hash_with_indifferent_access.rb
...upport/lib/active_support/hash_with_indifferent_access.rb
+18
-6
activesupport/test/core_ext/hash_ext_test.rb
activesupport/test/core_ext/hash_ext_test.rb
+2
-2
未找到文件。
activesupport/CHANGELOG.md
浏览文件 @
7595c595
*
Match
`HashWithIndifferentAccess#default`
's behaviour with
`Hash#default`
*David Cornu*
*
Adds
`:exception_object`
key to
`ActiveSupport::Notifications::Instrumenter`
payload when an exception is raised.
Adds new key/value pair to payload when an exception is raised: e.g. `:exception_object => #<RuntimeError: FAIL>`.
...
...
activesupport/lib/active_support/hash_with_indifferent_access.rb
浏览文件 @
7595c595
...
...
@@ -68,12 +68,10 @@ def initialize(constructor = {})
end
end
def
default
(
key
=
nil
)
if
key
.
is_a?
(
Symbol
)
&&
include
?(
key
=
key
.
to_s
)
self
[
key
]
else
super
end
def
default
(
*
args
)
key
=
args
.
first
args
[
0
]
=
key
.
to_s
if
key
.
is_a?
(
Symbol
)
super
(
*
args
)
end
def
self
.
new_from_hash_copying_default
(
hash
)
...
...
@@ -159,6 +157,20 @@ def key?(key)
alias_method
:has_key?
,
:key?
alias_method
:member?
,
:key?
# Same as <tt>Hash#[]</tt> where the key passed as argument can be
# either a string or a symbol:
#
# counters = ActiveSupport::HashWithIndifferentAccess.new
# counters[:foo] = 1
#
# counters['foo'] # => 1
# counters[:foo] # => 1
# counters[:zoo] # => nil
def
[]
(
key
)
super
(
convert_key
(
key
))
end
# Same as <tt>Hash#fetch</tt> where the key passed as argument can be
# either a string or a symbol:
#
...
...
activesupport/test/core_ext/hash_ext_test.rb
浏览文件 @
7595c595
...
...
@@ -1587,9 +1587,9 @@ def test_should_use_default_proc_for_unknown_key
assert_equal
3
,
hash_wia
[
:new_key
]
end
def
test_should_
use_default_proc
_if_no_key_is_supplied
def
test_should_
return_nil
_if_no_key_is_supplied
hash_wia
=
HashWithIndifferentAccess
.
new
{
1
+
2
}
assert_equal
3
,
hash_wia
.
default
assert_equal
nil
,
hash_wia
.
default
end
def
test_should_use_default_value_for_unknown_key
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录