From 16572fd46e189d80c6be7d499e687fe129053a2c Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 14 Mar 2010 18:55:13 -0700
Subject: [PATCH] read_ and write_fragment cache preserve html safety yet cache
 strings only

---
 .../lib/action_controller/caching/fragments.rb      | 12 ++++++------
 actionpack/test/controller/caching_test.rb          | 13 +++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb
index bb5ff95a67..841e64ecaf 100644
--- a/actionpack/lib/action_controller/caching/fragments.rb
+++ b/actionpack/lib/action_controller/caching/fragments.rb
@@ -41,9 +41,7 @@ module ActionController #: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 @@ module ActionController #: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 @@ module ActionController #:nodoc:
       # 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
 
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index a3c8fdbb6e..a792752ef4 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -634,6 +634,19 @@ class FragmentCachingTest < ActionController::TestCase
     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