test/app/views/welcome/with_cached_block.html.erb @@ -49,7 +49,10 @@ module SimplesIdeias::Cached::ActionPack # check if layout is meant to be cached cache_layout = !!options.delete(:layout) - if requested_page = Cache.read(key) + # should I cache everything? + perform_caching = ::ActionController::Base.perform_caching + + if perform_caching && requested_page = Cache.read(key) render :text => requested_page, :layout => !cache_layout else yield if block_given? @@ -61,7 +64,7 @@ module SimplesIdeias::Cached::ActionPack render :text => contents, :layout => !cache_layout end - Cache.write(key, contents, options) if ::ActionController::Base.perform_caching + Cache.write(key, contents, options) if perform_caching end end end lib/action_pack.rb @@ -1,4 +1,4 @@ -log/* +log/*.log tmp/* db/*.sqlite3 vendor/plugins/* \ No newline at end of file test/.gitignore @@ -1,5 +1,3 @@ -# ActionController::Base.perform_caching = true - class WelcomeController < ApplicationController def without_layout cached_render :expires_in => 15.minutes @@ -8,4 +6,7 @@ class WelcomeController < ApplicationController def with_layout cached_render :expires_in => 15.minutes, :layout => true end + + def with_cached_block + end end test/app/controllers/welcome_controller.rb @@ -11,7 +11,7 @@ config.whiny_nils = true # Show full error reports and disable caching config.action_controller.consider_all_requests_local = true config.action_view.debug_rjs = true -config.action_controller.perform_caching = false +config.action_controller.perform_caching = true # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = false \ No newline at end of file test/config/environments/development.rb @@ -3,6 +3,38 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe WelcomeController do integrate_views + before(:each) do + # expire each key before running tests + %w(render/welcome/without_layout render/welcome/with_layout block/date).each do |key| + Cache.delete(key) + end + end + + describe "with blocks" do + before(:each) do + @now = Time.now + @after = 15.minutes.from_now + + Time.stub!(:now).and_return(@now) + ActionController::Base.perform_caching = true + + get :with_cached_block + end + + it "should cache block only" do + @response.body.should have_tag('h1', @now.to_s(:db)) + @response.body.should have_tag('h2', @now.to_s(:db)) + @response.body.should have_tag('h3', @now.to_s(:db)) + + Time.stub!(:now).and_return(@after) + get :with_cached_block + + @response.body.should have_tag('h1', @after.to_s(:db)) + @response.body.should have_tag('h2', @after.to_s(:db)) + @response.body.should have_tag('h3', @now.to_s(:db)) + end + end + describe "with layouts" do before(:each) do @now = Time.now @@ -80,8 +112,10 @@ describe WelcomeController do it "should not cache view" do @response.body.should have_tag('h2', @now.to_s(:db)) + Time.stub!(:now).and_return(@after) get :without_layout + @response.body.should have_tag('h2', @after.to_s(:db)) end end test/spec/controllers/welcome_controller_spec.rb test/log/development.log eb856bc0bdfb9d3f3da4d767539af408b1b89f43 Nando Vieira fnando.vieira@gmail.com http://github.com/fnando/has_cache/commit/8a13d170a7bd299fcd351d768a9b861765b7d059 8a13d170a7bd299fcd351d768a9b861765b7d059 2008-10-29T03:15:33-07:00 2008-10-29T03:15:33-07:00 Added specs for cached_block 8d41f0a8736feef2b8104951be0bc51fc4eb145c Nando Vieira fnando.vieira@gmail.com