@@ -1,7 +1,5 @@ *1.13.0 RC2* -* 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] * Set session to an empty hash if :new_session => false and no session cookie or param is present. CGI::Session was raising an unrescued ArgumentError. [Josh Susser] actionpack/CHANGELOG @@ -307,16 +307,16 @@ module ActionController #:nodoc: def self.included(base) #:nodoc: base.class_eval do @@fragment_cache_store = MemoryStore.new - cattr_writer :fragment_cache_store + cattr_reader :fragment_cache_store - def self.fragment_cache_store - @@fragment_cache_store = if @@fragment_cache_store.is_a?(Array) - store, *parameters = *([ @@fragment_cache_store ].flatten) + def self.fragment_cache_store=(store_option) + store, *parameters = *([ store_option ].flatten) + @@fragment_cache_store = if store.is_a?(Symbol) 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 - @@fragment_cache_store + store end end end actionpack/lib/action_controller/caching.rb @@ -18,13 +18,13 @@ module ActionController #:nodoc: # file system, but you can also specify one of the other included stores (:active_record_store, :drb_store, # :mem_cache_store, or :memory_store) or use your own class. def session_store=(store) - ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] = store + ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] = + store.is_a?(Symbol) ? CGI::Session.const_get(store == :drb_store ? "DRbStore" : store.to_s.camelize) : store end # Returns the session store class currently used. def session_store - store = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] - self.session_store = store.is_a?(Symbol) ? CGI::Session.const_get(store == :drb_store ? "DRbStore" : store.to_s.camelize) : store + ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] end # Returns the hash used to configure the session. Example use: actionpack/lib/action_controller/session_management.rb 21e4825596db063349f1b3637c5ced1f5cef4ae4 Rick Olson technoweenie@gmail.com http://github.com/rubyruy/rails/commit/e9a7b233f6b44abd9e50fb6e734f897ba9b3333a e9a7b233f6b44abd9e50fb6e734f897ba9b3333a 2007-01-04T13:42:32-08:00 2007-01-04T13:42:32-08:00 rollback [5833] and [5835] git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5837 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 8b18ee546f3d2d10d1a623eea0804a2df21dc25e Rick Olson technoweenie@gmail.com