Changeset 5289

Timestamp:

10/12/06 23:29:04 (2 years ago)

Author:

marcel

Message:

Make page caching respect the format of the resource that is being requested even if the current route is the default route so that, e.g. posts.rss is not transformed by url_for to '/' and subsequently cached as '/index.html' when it should be cached as '/posts.rss'.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/caching.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/caching_test.rb (moved) (moved from trunk/actionpack/test/controller/action_caching_test.rb) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make page caching respect the format of the resource that is being requested even if the current route is the default route so that, e.g. posts.rss is not transformed by url_for to '/' and subsequently cached as '/index.html' when it should be cached as '/posts.rss'.  [Marcel Molina Jr.]
-
-* Use String#chars in TextHelper::excerpt. Closes #6386 [Manfred Stienstra]

trunk/actionpack/lib/action_controller/caching.rb

@@ -119 +119 @@
-        if options[:action].is_a?(Array)
-          options[:action].dup.each do |action|
-{ :only_path => true, :skip_relative_url_root => true, :action => action }
+:only_path => true, :skip_relative_url_root => true, :action => action
-          end
-        else
-{ :only_path => true, :skip_relative_url_root => true }
+:only_path => true, :skip_relative_url_root => true
-        end
-      end
@@ -131 +131 @@
-      def cache_page(content = nil, options = {})
-        return unless perform_caching && caching_allowed
-{ :only_path => true, :skip_relative_url_root => true }
+:only_path => true, :skip_relative_url_root => true, :format => params[:format]
-      end
-

trunk/actionpack/test/controller/caching_test.rb

@@ -7 +7 @@
-ActionController::Base.perform_caching = true
-ActionController::Base.fragment_cache_store = :file_store, FILE_STORE_PATH
+
+class PageCachingTest < Test::Unit::TestCase
+  def setup
+    ActionController::Routing::Routes.draw do |map|
+      map.main '', :controller => 'posts'
+      map.resources :posts
+      map.connect ':controller/:action/:id'
+    end
+    
+    @request = ActionController::TestRequest.new
+    @params = {:controller => 'posts', :action => 'index', :only_path => true, :skip_relative_url_root => true}
+    @rewriter = ActionController::UrlRewriter.new(@request, @params)
+  end 
+
+  def test_page_caching_resources_saves_to_correct_path_with_extension_even_if_default_route
+    @params[:format] = 'rss'
+    assert_equal '/posts.rss', @rewriter.rewrite(@params)
+    @params[:format] = nil
+    assert_equal '/', @rewriter.rewrite(@params)
+  end
+end
-
-class ActionCachingTestController < ActionController::Base