Changeset 4656

Timestamp:

08/03/06 23:59:38 (2 years ago)

Author:

marcel

Message:

Make action caching aware of different formats for the same action so that, e.g. foo.xml is cached separately from foo.html. Implicitly set content type when reading in cached content with mime revealing extensions so the entire onous isn't on the webserver. PDI MORE CACHING TESTS [Marcel Molina Jr.]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/caching.rb (modified) (4 diffs)
• trunk/actionpack/test/controller/action_caching_test.rb (added)
• trunk/actionpack/test/controller/base_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make action caching aware of different formats for the same action so that, e.g.  foo.xml is cached separately from foo.html. Implicitly set content type when reading in cached content with mime revealing extensions so the entire onous isn't on the webserver. [Marcel Molina Jr.]
-
-* Restrict Request Method hacking with ?_method to POST requests.  [Rick Olson]

trunk/actionpack/lib/action_controller/caching.rb

@@ -156 +156 @@
-    # "david.somewhere.com/lists/show/1". This allows the cacher to differentiate between "david.somewhere.com/lists/" and
-    # "jamis.somewhere.com/lists/" -- which is a helpful way of assisting the subdomain-as-account-key pattern.
+    #
+    # Different representations of the same resource, e.g. <tt>http://david.somewhere.com/lists</tt> and <tt>http://david.somewhere.com/lists.xml</tt>
+    # are treated like separate requests and are so are cached separately. Keep in mine when expiring an action cache that <tt>:action => 'lists'</tt> is not the same
+    # as <tt>:action => 'list', :format => :xml</tt>.
-    module Actions
-      def self.included(base) #:nodoc:
@@ -173 +177 @@
-        if options[:action].is_a?(Array)
-          options[:action].dup.each do |action|
-url_for(options.merge({ :action => action })).split("://").last
+ActionCachePath.path_for(self, options.merge({ :action => action }))
-          end
-        else
-url_for(options).split("://").last
-
-
-
-
-
+ActionCachePath.path_for(self, options)
+
+
+
+        
+, &block
-          @actions = actions
-        end
@@ -187 +191 @@
-        def before(controller)
-          return unless @actions.include?(controller.action_name.intern)
-
+
+
-            controller.rendered_action_cache = true
+            set_content_type!(action_cache_path)
-            controller.send(:render_text, cache)
-            false
@@ -196 +202 @@
-        def after(controller)
-          return if !@actions.include?(controller.action_name.intern) || controller.rendered_action_cache
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-    end

trunk/actionpack/test/controller/base_test.rb

@@ -24 +24 @@
-end
-class EmptyController < ActionController::Base
-  include ActionController::Caching
-end
-class NonEmptyController < ActionController::Base