Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
16572fd4
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,发现更多精彩内容 >>
提交
16572fd4
编写于
3月 14, 2010
作者:
J
Jeremy Kemper
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
read_ and write_fragment cache preserve html safety yet cache strings only
上级
95bd56e3
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
19 addition
and
6 deletion
+19
-6
actionpack/lib/action_controller/caching/fragments.rb
actionpack/lib/action_controller/caching/fragments.rb
+6
-6
actionpack/test/controller/caching_test.rb
actionpack/test/controller/caching_test.rb
+13
-0
未找到文件。
actionpack/lib/action_controller/caching/fragments.rb
浏览文件 @
16572fd4
...
...
@@ -41,9 +41,7 @@ def fragment_for(buffer, name = {}, options = nil, &block) #:nodoc:
else
pos
=
buffer
.
length
block
.
call
content
=
buffer
[
pos
..-
1
]
content
=
content
.
as_str
if
content
.
respond_to?
(
:as_str
)
write_fragment
(
name
,
content
,
options
)
write_fragment
(
name
,
buffer
[
pos
..-
1
],
options
)
end
else
block
.
call
...
...
@@ -53,9 +51,10 @@ def fragment_for(buffer, name = {}, options = nil, &block) #:nodoc:
# Writes <tt>content</tt> to the location signified by <tt>key</tt> (see <tt>expire_fragment</tt> for acceptable formats)
def
write_fragment
(
key
,
content
,
options
=
nil
)
return
content
unless
cache_configured?
key
=
fragment_cache_key
(
key
)
key
=
fragment_cache_key
(
key
)
instrument_fragment_cache
:write_fragment
,
key
do
content
=
content
.
html_safe
.
as_str
if
content
.
respond_to?
(
:html_safe
)
cache_store
.
write
(
key
,
content
,
options
)
end
content
...
...
@@ -64,10 +63,11 @@ def write_fragment(key, content, options = nil)
# Reads a cached fragment from the location signified by <tt>key</tt> (see <tt>expire_fragment</tt> for acceptable formats)
def
read_fragment
(
key
,
options
=
nil
)
return
unless
cache_configured?
key
=
fragment_cache_key
(
key
)
key
=
fragment_cache_key
(
key
)
instrument_fragment_cache
:read_fragment
,
key
do
cache_store
.
read
(
key
,
options
)
result
=
cache_store
.
read
(
key
,
options
)
result
.
respond_to?
(
:html_safe
)
?
result
.
html_safe
:
result
end
end
...
...
actionpack/test/controller/caching_test.rb
浏览文件 @
16572fd4
...
...
@@ -634,6 +634,19 @@ def test_fragment_for
assert_equal
'generated till now -> fragment content'
,
buffer
end
def
test_html_safety
assert_nil
@store
.
read
(
'views/name'
)
content
=
'value'
.
html_safe
assert_equal
content
,
@controller
.
write_fragment
(
'name'
,
content
)
cached
=
@store
.
read
(
'views/name'
)
assert_equal
content
,
cached
assert_equal
String
,
cached
.
class
html_safe
=
@controller
.
read_fragment
(
'name'
)
assert_equal
content
,
html_safe
assert
html_safe
.
html_safe?
end
end
class
FunctionalCachingController
<
CachingController
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录