@@ -36,6 +36,7 @@ class MephistoController < ApplicationController def dispatch_comments show_404 and return unless find_article if request.get? || params[:comment].blank? + @skip_caching = true redirect_to site.permalink_for(@article) and return end @@ -97,6 +98,7 @@ class MephistoController < ApplicationController 'next_page' => paged_search_url_for(@article_pages.current.next), 'search_string' => params[:q], 'search_count' => search_count) + @skip_caching = true end def dispatch_tags app/controllers/mephisto_controller.rb @@ -3,6 +3,7 @@ module Mephisto # :nodoc: def self.included(base) base.helper_method :cached_references base.extend ClassMethods + base.alias_method_chain :caching_allowed, :skipping base.send :attr_writer, :cached_references end @@ -24,7 +25,11 @@ module Mephisto # :nodoc: def cached_references @cached_references ||= [] end - + + def caching_allowed_with_skipping + caching_allowed_without_skipping && !@skip_caching + end + # Saves a CachedPage for the current request with the current references. This is called in an after filter if #caches_page_with_references # is used. def cache_page_with_references lib/mephisto/caching_methods.rb @@ -80,6 +80,37 @@ class CachingTest < ActionController::IntegrationTest assert_cached contents(:welcome).full_permalink end + def test_should_not_cache_comment_post + visitor = visit + assert_expires_pages "#{contents(:welcome).full_permalink}/comments" do + visitor.comment_on contents(:welcome), :author => 'bob', :body => 'what a wonderful post.' + end + end + + def test_should_not_cache_comment_post_on_article_with_closed_comments + visitor = visit + contents(:welcome).update_attribute :comment_age, -1 + assert_expires_pages "#{contents(:welcome).full_permalink}/comments" do + visitor.comment_on contents(:welcome), :author => 'bob', :body => 'what a wonderful post.' + end + end + + def test_should_not_cache_comment_post_on_article_with_invalid_comment + visitor = visit + assert_expires_pages "#{contents(:welcome).full_permalink}/comments" do + assert_no_difference Comment, :count do + visitor.comment_on contents(:welcome), {} + end + end + end + + def test_should_not_cache_comments_page_on_get + visitor = visit + assert_expires_pages "#{contents(:welcome).full_permalink}/comments" do + visitor.get "#{contents(:welcome).full_permalink}/comments" + end + end + def test_should_expire_cache_on_new_comment_if_approved visitor = visit assert_caches_page contents(:welcome).full_permalink do @@ -250,6 +281,15 @@ class CachingTest < ActionController::IntegrationTest end end + def test_should_not_cache_searches + visitor = visit + assert_expires_page "/search" do + visitor.get '/search' + visitor.get '/search', :q => 'foo' + visitor.post '/search', :q => 'foo' + end + end + protected def visit_sections_and_feeds_with(visitor) assert_difference CachedPage, :count, 4 do test/integration/caching_test.rb e525dff691c364199af3c814623e3f1557cfd73e technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 http://github.com/francois/mephisto/commit/b00a97637b0a8357dc55eef9b625da5eb023ef4e b00a97637b0a8357dc55eef9b625da5eb023ef4e 2006-09-20T18:48:14-07:00 2006-09-20T18:48:14-07:00 caching tests, dont cache GET requests to /path/to/article/comments or searches git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@2227 567b1171-46fb-0310-a4c9-b4bef9110e78 1e6355aa7df5039bc5da6859f87978c53f6c80c6 technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78