Skip to content
Browse files

Allow ActionController::Base.session_store and #fragment_cache_store …

…to lazily load the session class to allow for custom session store plugins. [Rick Olson]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5835 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 05aa57b commit 1023bc6e8622e2d5c2683764d25f543d5e79a926 @technoweenie technoweenie committed Jan 4, 2007
Showing with 6 additions and 6 deletions.
  1. +1 −1 actionpack/CHANGELOG
  2. +5 −5 actionpack/lib/action_controller/caching.rb
View
2 actionpack/CHANGELOG
@@ -1,6 +1,6 @@
*SVN*
-* Allow ActionController::Base.session_store to lazily load the session class to allow for custom session store plugins. [Rick Olson]
+* Allow ActionController::Base.session_store and #fragment_cache_store to lazily load the session class to allow for custom session store plugins. [Rick Olson]
* Make sure html_document is reset between integration test requests. [ctm]
View
10 actionpack/lib/action_controller/caching.rb
@@ -307,16 +307,16 @@ module Fragments
def self.included(base) #:nodoc:
base.class_eval do
@@fragment_cache_store = MemoryStore.new
- cattr_reader :fragment_cache_store
+ cattr_writer :fragment_cache_store
- def self.fragment_cache_store=(store_option)
- store, *parameters = *([ store_option ].flatten)
- @@fragment_cache_store = if store.is_a?(Symbol)
+ def self.fragment_cache_store
+ @@fragment_cache_store = if @@fragment_cache_store.is_a?(Array)
+ store, *parameters = *([ @@fragment_cache_store ].flatten)
store_class_name = (store == :drb_store ? "DRbStore" : store.to_s.camelize)
store_class = ActionController::Caching::Fragments.const_get(store_class_name)
store_class.new(*parameters)
else
- store
+ @@fragment_cache_store
end
end
end

0 comments on commit 1023bc6

Please sign in to comment.
Something went wrong with that request. Please try again.