Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
c44f8d25
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,发现更多精彩内容 >>
提交
c44f8d25
编写于
10月 16, 2013
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12540 from wyaeld/bug/fix-recursive-digest
Ensure ActionView::Digestor.cache is correctly cleaned up
上级
4fdde75b
0cdce7f9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
37 addition
and
6 deletion
+37
-6
actionview/CHANGELOG.md
actionview/CHANGELOG.md
+5
-0
actionview/lib/action_view/digestor.rb
actionview/lib/action_view/digestor.rb
+6
-6
actionview/test/template/digestor_test.rb
actionview/test/template/digestor_test.rb
+26
-0
未找到文件。
actionview/CHANGELOG.md
浏览文件 @
c44f8d25
*
Ensure ActionView::Digestor.cache is correctly cleaned up when
combining recursive templates with ActionView::Resolver.caching = false
*wyaeld*
*
Fix
`collection_check_boxes`
generated hidden input to use the name attribute provided
in the options hash.
...
...
actionview/lib/action_view/digestor.rb
浏览文件 @
c44f8d25
...
...
@@ -35,13 +35,13 @@ def compute_and_store_digest(cache_key, name, format, finder, options) # called
Digestor
end
digest
=
klass
.
new
(
name
,
format
,
finder
,
options
).
digest
# Store the actual digest if config.cache_template_loading is true
klass
.
new
(
name
,
format
,
finder
,
options
).
digest
.
tap
do
|
digest
|
@@cache
[
cache_key
]
=
digest
if
ActionView
::
Resolver
.
caching?
end
rescue
Exception
@@cache
.
delete_pair
(
cache_key
,
false
)
if
pre_stored
# something went wrong, make sure not to corrupt the @@cache
raise
@@cache
[
cache_key
]
=
stored_digest
=
digest
if
ActionView
::
Resolver
.
caching?
digest
ensure
# something went wrong or ActionView::Resolver.caching? is false, make sure not to corrupt the @@cache
@@cache
.
delete_pair
(
cache_key
,
false
)
if
pre_stored
&&
!
stored_digest
end
end
...
...
actionview/test/template/digestor_test.rb
浏览文件 @
c44f8d25
...
...
@@ -217,6 +217,32 @@ def test_cache_template_loading
ActionView
::
Resolver
.
caching
=
resolver_before
end
def
test_digest_cache_cleanup_with_recursion
first_digest
=
digest
(
"level/_recursion"
)
second_digest
=
digest
(
"level/_recursion"
)
assert
first_digest
# If the cache is cleaned up correctly, subsequent digests should return the same
assert_equal
first_digest
,
second_digest
end
def
test_digest_cache_cleanup_with_recursion_and_template_caching_off
resolver_before
=
ActionView
::
Resolver
.
caching
ActionView
::
Resolver
.
caching
=
false
first_digest
=
digest
(
"level/_recursion"
)
second_digest
=
digest
(
"level/_recursion"
)
assert
first_digest
# If the cache is cleaned up correctly, subsequent digests should return the same
assert_equal
first_digest
,
second_digest
ActionView
::
Resolver
.
caching
=
resolver_before
end
private
def
assert_logged
(
message
)
old_logger
=
ActionView
::
Base
.
logger
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录