Changeset 6453

Timestamp:

03/22/07 10:12:34 (2 years ago)

Author:

rick

Message:

Allow configuration of the default action cache path for #caches_action calls. [Rick Olson]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/caching.rb (modified) (5 diffs)
• trunk/actionpack/test/controller/caching_test.rb (modified) (4 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Allow configuration of the default action cache path for #caches_action calls.  [Rick Olson]
+
+  class ListsController < ApplicationController
+    caches_action :index, :cache_path => Proc.new { |controller| 
+      controller.params[:user_id] ? 
+        controller.send(:user_lists_url, c.params[:user_id]) :
+        controller.send(:lists_url) }
+  end
-
-* Performance: patch cgi/session/pstore to require digest/md5 once rather than per #initialize.  #7583 [Stefan Kaes]

trunk/actionpack/lib/action_controller/caching.rb

@@ -162 +162 @@
-    # are treated like separate requests and so are cached separately. Keep in mind when expiring an action cache that <tt>:action => 'lists'</tt> is not the same
-    # as <tt>:action => 'list', :format => :xml</tt>.
+    #
+    # You can set modify the default action cache path by passing a :cache_path option.  This will be passed directly to ActionCachePath.path_for.  This is handy
+    # for actions with multiple possible routes that should be cached differently.  If a block is given, it is called with the current controller instance.
+    #
+    #   class ListsController < ApplicationController
+    #     before_filter :authenticate, :except => :public
+    #     caches_page   :public
+    #     caches_action :show, :cache_path => { :project => 1 }
+    #     caches_action :show, :cache_path => Proc.new { |controller| 
+    #       controller.params[:user_id] ? 
+    #         controller.send(:user_list_url, c.params[:user_id], c.params[:id]) :
+    #         controller.send(:list_url, c.params[:id]) }
+    #   end
-    module Actions
-      def self.included(base) #:nodoc:
@@ -189 +202 @@
-        def initialize(*actions, &block)
-          @actions = actions
+          @options = @actions.last.is_a?(Hash) ? @actions.pop : {}
-        end
-
-        def before(controller)
-          return unless @actions.include?(controller.action_name.intern)
-
+, path_options_for(controller)
-          if cache = controller.read_fragment(action_cache_path.path)
-            controller.rendered_action_cache = true
@@ -204 +218 @@
-        def after(controller)
-          return if !@actions.include?(controller.action_name.intern) || controller.rendered_action_cache
-
+, path_options_for(controller)
-        end
-        
@@ -214 +228 @@
-              action_cache_path.controller.response.content_type = content_type.to_s
-            end
+          end
+          
+          def path_options_for(controller)
+            (@options[:cache_path].respond_to?(:call) ? @options[:cache_path].call(controller) : @options[:cache_path]) || {}
-          end
-          
@@ -599 +617 @@
-        end
-
+        protected
+          # gets the action cache path for the given options.
+          def action_path_for(options)
+            ActionController::Caching::Actions::ActionCachePath.path_for(controller, options)
+          end
+
-        private
-          def callback(timing)

trunk/actionpack/test/controller/caching_test.rb

@@ -99 +99 @@
-class ActionCachingTestController < ActionController::Base
-  caches_action :index
+  caches_action :show, :cache_path => 'http://test.host/custom/show'
+  caches_action :edit, :cache_path => Proc.new { |c| c.params[:id] ? "http://test.host/#{c.params[:id]};edit" : "http://test.host/edit" }
-
-  def index
@@ -104 +106 @@
-    render :text => @cache_this
-  end
+  
+  alias_method :show, :index
+  alias_method :edit, :index
-
-  def expire
@@ -149 +154 @@
-    cached_time = content_to_cache
-    assert_equal cached_time, @response.body
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-
@@ -229 +255 @@
-      @request.host = 'hostname.com'
-    end
-
+
+
+
+
+
+