Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
475c9658
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,发现更多精彩内容 >>
提交
475c9658
编写于
3月 04, 2014
作者:
G
Guillermo Iguaran
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14269 from arthurnn/expanded_key_array
Cache key should be different when is Array.
上级
705915ab
7d982474
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
4 deletion
+14
-4
activesupport/CHANGELOG.md
activesupport/CHANGELOG.md
+5
-0
activesupport/lib/active_support/cache.rb
activesupport/lib/active_support/cache.rb
+4
-3
activesupport/test/caching_test.rb
activesupport/test/caching_test.rb
+5
-1
未找到文件。
activesupport/CHANGELOG.md
浏览文件 @
475c9658
*
Cache key should add a trailing slash when the key is an array,
so
`cache.fetch('foo')`
and
`cache.fetch(['foo'])`
wont conflict.
*arthurnn*
*
Change the signature of
`fetch_multi`
to return a hash rather than an
array. This makes it consistent with the output of
`read_multi`
.
...
...
activesupport/lib/active_support/cache.rb
浏览文件 @
475c9658
...
...
@@ -511,7 +511,7 @@ def merged_options(call_options) # :nodoc:
# called. If the key is a Hash, then keys will be sorted alphabetically.
def
expanded_key
(
key
)
# :nodoc:
return
key
.
cache_key
.
to_s
if
key
.
respond_to?
(
:cache_key
)
trailing_slash
=
false
case
key
when
Array
if
key
.
size
>
1
...
...
@@ -519,11 +519,12 @@ def expanded_key(key) # :nodoc:
else
key
=
key
.
first
end
trailing_slash
=
true
when
Hash
key
=
key
.
sort_by
{
|
k
,
_
|
k
.
to_s
}.
collect
{
|
k
,
v
|
"
#{
k
}
=
#{
v
}
"
}
end
key
.
to_param
key
=
key
.
to_param
trailing_slash
?
"
#{
key
}
/"
:
key
end
# Prefix a key with the namespace. Namespace and key will be delimited
...
...
activesupport/test/caching_test.rb
浏览文件 @
475c9658
...
...
@@ -257,6 +257,10 @@ def test_fetch_with_cached_nil
assert_nil
@cache
.
fetch
(
'foo'
)
{
'baz'
}
end
def
test_fetch_with_array_and_without
assert_not_equal
@cache
.
fetch
(
'foo'
)
{
'barz'
},
@cache
.
fetch
([
'foo'
])
{
'barr'
}
end
def
test_should_read_and_write_hash
assert
@cache
.
write
(
'foo'
,
{
:a
=>
"b"
})
assert_equal
({
:a
=>
"b"
},
@cache
.
read
(
'foo'
))
...
...
@@ -349,7 +353,7 @@ def obj.to_param
def
test_array_as_cache_key
@cache
.
write
([
:fu
,
"foo"
],
"bar"
)
assert_equal
"bar"
,
@cache
.
read
(
"fu/foo"
)
assert_equal
"bar"
,
@cache
.
read
(
"fu/foo
/
"
)
end
def
test_hash_as_cache_key
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录