Moved the caching stores from ActionController::Caching::Fragments::* to ActiveSupport::Cache::*. If you're explicitly referring to a store, like ActionController::Caching::Fragments::MemoryStore, you need to update that reference with ActiveSupport::Cache::MemoryStore [DHH] Deprecated ActionController::Base.fragment_cache_store for ActionController::Base.cache_store [DHH] All fragment cache keys are now by default prefixed with the 'views/' namespace [DHH] Added ActiveRecord::Base.cache_key to make it easier to cache Active Records in combination with the new ActiveSupport::Cache::* libraries [DHH] Added ActiveSupport::Gzip.decompress/compress(source) as an easy wrapper for Zlib [Tobias Luetke] Included MemCache-Client to make the improved ActiveSupport::Cache::MemCacheStore work out of the box [Bob Cottrell, Eric Hodel] Added config.cache_store to environment options to control the default cache store (default is FileStore if tmp/cache is present, otherwise MemoryStore is used) [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8546 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 26 insertions, 73 deletions

diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index cfc41cc279..15eb4c943a 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -5,7 +5,7 @@ CACHE_DIR = 'test_cache'
 # Don't change '/../temp/' cavalierly or you might hose something you don't want hosed
 FILE_STORE_PATH = File.join(File.dirname(__FILE__), '/../temp/', CACHE_DIR)
 ActionController::Base.page_cache_directory = FILE_STORE_PATH
-ActionController::Base.fragment_cache_store = :file_store, FILE_STORE_PATH
+ActionController::Base.cache_store = :file_store, FILE_STORE_PATH
 
 class PageCachingTestController < ActionController::Base
   caches_page :ok, :no_content, :found, :not_found
@@ -343,7 +343,7 @@ class ActionCacheTest < Test::Unit::TestCase
     end
 
     def assert_cache_exists(path)
-      full_path = File.join(FILE_STORE_PATH, path + '.cache')
+      full_path = File.join(FILE_STORE_PATH, "views", path + '.cache')
       assert File.exist?(full_path), "#{full_path.inspect} does not exist."
     end
 end
@@ -355,8 +355,8 @@ end
 class FragmentCachingTest < Test::Unit::TestCase
   def setup
     ActionController::Base.perform_caching = true
-    @store = ActionController::Caching::Fragments::UnthreadedMemoryStore.new
-    ActionController::Base.fragment_cache_store = @store
+    @store = ActiveSupport::Cache::MemoryStore.new
+    ActionController::Base.cache_store = @store
     @controller = FragmentCachingTestController.new
     @params = {:controller => 'posts', :action => 'index'}
     @request = ActionController::TestRequest.new
@@ -368,57 +368,57 @@ class FragmentCachingTest < Test::Unit::TestCase
   end
 
   def test_fragement_cache_key
-    assert_equal 'what a key', @controller.fragment_cache_key('what a key')
-    assert_equal( "test.host/fragment_caching_test/some_action",
+    assert_equal 'views/what a key', @controller.fragment_cache_key('what a key')
+    assert_equal( "views/test.host/fragment_caching_test/some_action",
                   @controller.fragment_cache_key(:controller => 'fragment_caching_test',:action => 'some_action'))
   end
 
   def test_read_fragment__with_caching_enabled
-    @store.write('name', 'value')
+    @store.write('views/name', 'value')
     assert_equal 'value', @controller.read_fragment('name')
   end
 
   def test_read_fragment__with_caching_disabled
     ActionController::Base.perform_caching = false
-    @store.write('name', 'value')
+    @store.write('views/name', 'value')
     assert_nil @controller.read_fragment('name')
   end
 
   def test_write_fragment__with_caching_enabled
-    assert_nil @store.read('name')
+    assert_nil @store.read('views/name')
     assert_equal 'value', @controller.write_fragment('name', 'value')
-    assert_equal 'value', @store.read('name')
+    assert_equal 'value', @store.read('views/name')
   end
 
   def test_write_fragment__with_caching_disabled
-    assert_nil @store.read('name')
+    assert_nil @store.read('views/name')
     ActionController::Base.perform_caching = false
     assert_equal nil, @controller.write_fragment('name', 'value')
-    assert_nil @store.read('name')
+    assert_nil @store.read('views/name')
   end
 
   def test_expire_fragment__with_simple_key
-    @store.write('name', 'value')
+    @store.write('views/name', 'value')
     @controller.expire_fragment 'name'
-    assert_nil @store.read('name')
+    assert_nil @store.read('views/name')
   end
 
   def test_expire_fragment__with__regexp
-    @store.write('name', 'value')
-    @store.write('another_name', 'another_value')
-    @store.write('primalgrasp', 'will not expire ;-)')
+    @store.write('views/name', 'value')
+    @store.write('views/another_name', 'another_value')
+    @store.write('views/primalgrasp', 'will not expire ;-)')
 
     @controller.expire_fragment /name/
 
-    assert_nil @store.read('name')
-    assert_nil @store.read('another_name')
-    assert_equal 'will not expire ;-)', @store.read('primalgrasp')
+    assert_nil @store.read('views/name')
+    assert_nil @store.read('views/another_name')
+    assert_equal 'will not expire ;-)', @store.read('views/primalgrasp')
   end
 
   def test_fragment_for__with_disabled_caching
     ActionController::Base.perform_caching = false
 
-    @store.write('expensive', 'fragment content')
+    @store.write('views/expensive', 'fragment content')
     fragment_computed = false
 
     buffer = 'generated till now -> '
@@ -430,7 +430,7 @@ class FragmentCachingTest < Test::Unit::TestCase
 
 
   def test_fragment_for
-    @store.write('expensive', 'fragment content')
+    @store.write('views/expensive', 'fragment content')
     fragment_computed = false
 
     buffer = 'generated till now -> '
@@ -441,7 +441,7 @@ class FragmentCachingTest < Test::Unit::TestCase
   end
 
   def test_cache_erb_fragment
-    @store.write('expensive', 'fragment content')
+    @store.write('views/expensive', 'fragment content')
     _erbout = 'generated till now -> '
 
     assert_equal( 'generated till now -> fragment content',
@@ -449,7 +449,7 @@ class FragmentCachingTest < Test::Unit::TestCase
   end
 
   def test_cache_rxml_fragment
-    @store.write('expensive', 'fragment content')
+    @store.write('views/expensive', 'fragment content')
     xml = 'generated till now -> '
     class << xml; def target!; to_s; end; end
 
@@ -458,7 +458,7 @@ class FragmentCachingTest < Test::Unit::TestCase
   end
 
   def test_cache_rjs_fragment
-    @store.write('expensive', 'fragment content')
+    @store.write('views/expensive', 'fragment content')
     page = 'generated till now -> '
 
     assert_equal( 'generated till now -> fragment content',
@@ -466,7 +466,7 @@ class FragmentCachingTest < Test::Unit::TestCase
   end
 
   def test_cache_rjs_fragment_debug_mode_does_not_interfere
-    @store.write('expensive', 'fragment content')
+    @store.write('views/expensive', 'fragment content')
     page = 'generated till now -> '
 
     begin
diff --git a/actionpack/test/controller/fragment_store_setting_test.rb b/actionpack/test/controller/fragment_store_setting_test.rb
index 3df6fd0be2..e69de29bb2 100644
--- a/actionpack/test/controller/fragment_store_setting_test.rb
+++ b/actionpack/test/controller/fragment_store_setting_test.rb
@@ -1,47 +0,0 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
-
-MemCache = Struct.new(:MemCache, :address) unless Object.const_defined?(:MemCache)
-
-class FragmentCacheStoreSettingTest < Test::Unit::TestCase
-  def teardown
-    ActionController::Base.fragment_cache_store = ActionController::Caching::Fragments::MemoryStore.new
-  end
-  
-  def test_file_fragment_cache_store
-    ActionController::Base.fragment_cache_store = :file_store, "/path/to/cache/directory"
-    assert_kind_of(
-      ActionController::Caching::Fragments::FileStore,
-      ActionController::Base.fragment_cache_store
-    )
-    assert_equal "/path/to/cache/directory", ActionController::Base.fragment_cache_store.cache_path
-  end
-  
-  def test_drb_fragment_cache_store
-    ActionController::Base.fragment_cache_store = :drb_store, "druby://localhost:9192"
-    assert_kind_of(
-      ActionController::Caching::Fragments::DRbStore,
-      ActionController::Base.fragment_cache_store
-    )
-    assert_equal "druby://localhost:9192", ActionController::Base.fragment_cache_store.address
-  end
-
-  if defined? CGI::Session::MemCacheStore
-    def test_mem_cache_fragment_cache_store
-      ActionController::Base.fragment_cache_store = :mem_cache_store, "localhost"
-      assert_kind_of(
-        ActionController::Caching::Fragments::MemCacheStore,
-        ActionController::Base.fragment_cache_store
-      )
-      assert_equal %w(localhost), ActionController::Base.fragment_cache_store.addresses
-    end
-  end
-
-  def test_object_assigned_fragment_cache_store
-    ActionController::Base.fragment_cache_store = ActionController::Caching::Fragments::FileStore.new("/path/to/cache/directory")
-    assert_kind_of(
-      ActionController::Caching::Fragments::FileStore,
-      ActionController::Base.fragment_cache_store
-    )
-    assert_equal "/path/to/cache/directory", ActionController::Base.fragment_cache_store.cache_path
-  end
-end