Changeset 2230

Timestamp:

09/13/05 08:31:32 (3 years ago)

Author:

david

Message:

Added easy assignment of fragment cache store through use of symbols for included stores (old way still works too)

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/caching.rb (modified) (5 diffs)
• trunk/actionpack/lib/action_controller/cgi_process.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/session_management.rb (modified) (4 diffs)
• trunk/actionpack/lib/action_controller/session.rb (deleted)
• trunk/actionpack/test/controller/fragment_store_setting_test.rb (added)
• trunk/actionpack/test/controller/session_management_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added easy assignment of fragment cache store through use of symbols for included stores (old way still works too)
+
+  Before:
+    ActionController::Base.fragment_cache_store = 
+      ActionController::Base::Caching::Fragments::FileStore.new("/path/to/cache/directory")
+
+  After:
+    ActionController::Base.fragment_cache_store = :file_store, "/path/to/cache/directory"
-
-* Added ActionController::Base.session_store=, session_store, and session_options to make it easier to tweak the session options (instead of going straight to ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS)

trunk/actionpack/lib/action_controller.rb

@@ -39 +39 @@
-require 'action_controller/layout'
-require 'action_controller/flash'
-require 'action_controller/session'
-require 'action_controller/dependencies'
-require 'action_controller/pagination'
@@ -68 +67 @@
-  include ActionController::Helpers
-  include ActionController::Cookies
-  include ActionController::Session
-  include ActionController::Caching
-  include ActionController::Components

trunk/actionpack/lib/action_controller/caching.rb

@@ -241 +241 @@
-    # Configuration examples (MemoryStore is the default):
-    #
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    module Fragments
-      def self.append_features(base) #:nodoc:
@@ -257 +251 @@
-        base.class_eval do
-          @@fragment_cache_store = MemoryStore.new
-
+
+
+
+
+
+
+
+
+
+
+
+
-        end
-      end
@@ -350 +355 @@
-
-      class DRbStore < MemoryStore #:nodoc:
+        attr_reader :address
+
-        def initialize(address = 'druby://localhost:9192')
+          @address = address
-          @data, @mutex = DRbObject.new(nil, address), Mutex.new
-        end    
@@ -356 +364 @@
-
-      class MemCacheStore < MemoryStore #:nodoc:
+        attr_reader :address
+
-        def initialize(address = 'localhost')
+          @address = address
-          @data, @mutex = MemCache.new(address), Mutex.new
-        end    
@@ -362 +373 @@
-
-      class FileStore #:nodoc:
+        attr_reader :cache_path
+        
-        def initialize(cache_path)
-          @cache_path = cache_path

trunk/actionpack/lib/action_controller/cgi_process.rb

@@ -2 +2 @@
-require 'action_controller/cgi_ext/cookie_performance_fix'
-require 'action_controller/cgi_ext/raw_post_data_fix'
-require 'action_controller/session/drb_store'
-require 'action_controller/session/mem_cache_store'
-if Object.const_defined?(:ActiveRecord)
-  require 'action_controller/session/active_record_store'
-end
-
-module ActionController #:nodoc:

trunk/actionpack/lib/action_controller/session_management.rb

@@ +1 @@
+require 'action_controller/session/drb_store'
+require 'action_controller/session/mem_cache_store'
+if Object.const_defined?(:ActiveRecord)
+  require 'action_controller/session/active_record_store'
+end
+
-module ActionController #:nodoc:
-  module SessionManagement #:nodoc:
@@ -4 +10 @@
-      super
-      base.extend(ClassMethods)
-
-
-
-
+
+
+
-    end
-
@@ -16 +21 @@
-      def session_store=(store)
-        ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] =
-
+ == :drb_store ? "DRbStore" : store
-      end
-
@@ -101 +106 @@
-      process_without_session_management_support(request, response, method, *arguments)
-    end
+  
+    private
+      def clear_persistant_model_associations #:doc:
+        session = @session.instance_variable_get("@data")
+        session.each { |key, obj| obj.clear_association_cache if obj.respond_to?(:clear_association_cache) } if session
+      end
-  end
-end

trunk/actionpack/test/controller/session_management_test.rb

@@ -82 +82 @@
-    assert_equal false, @request.session_options
-  end
+  
+  def test_session_store_setting
+    ActionController::Base.session_store = :drb_store
+    assert_equal CGI::Session::DRbStore, ActionController::Base.session_store
+
+    if Object.const_defined?(:ActiveRecord)
+      ActionController::Base.session_store = :active_record_store
+      assert_equal CGI::Session::ActiveRecordStore, ActionController::Base.session_store
+    end
+  end
-end