Changeset 5838

Timestamp:

01/04/07 21:43:24 (2 years ago)

Author:

rick

Message:

rollback [5833] and [5835]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/caching.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/session_management.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
-* 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]

trunk/actionpack/lib/action_controller/caching.rb

@@ -308 +308 @@
-        base.class_eval do
-          @@fragment_cache_store = MemoryStore.new
-writ
-
-
-@@fragment_cache_store = if @@fragment_cache_store.is_a?(Array
-  store, *parameters = *([ @@fragment_cache_store ].flatten
+read
+
+=(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_
+
-            end
-          end

trunk/actionpack/lib/action_controller/session_management.rb

@@ -19 +19 @@
-      # :mem_cache_store, or :memory_store) or use your own class.
-      def session_store=(store)
-
+
+
-      end
-
-      # Returns the session store class currently used.
-      def session_store
-
-
+
-      end
-