@@ -44,6 +44,8 @@ end module Merb::Cache::ControllerInstanceMethods # Mixed in Merb::Controller. Provides methods related to page caching + DEFAULT_PAGE_EXTENSION = 'html' + # Checks whether a cache entry exists # # ==== Parameter @@ -54,9 +56,11 @@ module Merb::Cache::ControllerInstanceMethods # # ==== Example # cached_page?(:action => 'show', :params => [params[:page]]) + # cached_page?(:action => 'show', :extension => 'js') def cached_page?(options) key = Merb::Controller._cache.key_for(options, controller_name, true) - File.file?(Merb::Controller._cache.config[:cache_html_directory] / "#{key}.html") + extension = options[:extension] || DEFAULT_PAGE_EXTENSION + File.file?(Merb::Controller._cache.config[:cache_html_directory] / "#{key}.#{extension}") end # Expires the page identified by the key computed after the parameters @@ -67,13 +71,15 @@ module Merb::Cache::ControllerInstanceMethods # ==== Examples # expire_page(:action => 'show', :controller => 'news') # expire_page(:action => 'show', :match => true) + # expire_page(:action => 'show', :extension => 'js') def expire_page(options) config_dir = Merb::Controller._cache.config[:cache_html_directory] Merb::Controller._cache.expire_key_for(options, controller_name, true) do |key, match| if match files = Dir.glob(config_dir / "#{key}*") else - files = config_dir / "#{key}.html" + extension = options[:extension] || DEFAULT_PAGE_EXTENSION + files = config_dir / "#{key}.#{extension}" end FileUtils.rm_rf(files) end @@ -106,16 +112,18 @@ module Merb::Cache::ControllerInstanceMethods # If request.path is "/", the name will be "/index.html" # If request.path is "/news/show/1", the name will be "/news/show/1.html" # If request.path is "/news/show/", the name will be "/news/show.html" + # If request.path is "/news/styles.css", the name will be "/news/styles.css" def _cache_page(data = nil) - cache_disable = Merb::Controller._cache.config[:disable] - return if cache_disable == true || cache_disable == Merb.environment + return if Merb::Controller._cache.config[:disable_page_caching] controller = controller_name action = action_name.to_sym pages = Merb::Controller._cache.cached_pages[controller] return unless pages && pages.key?(action) path = request.path.chomp("/") path = "index" if path.empty? - cache_file = Merb::Controller._cache.config[:cache_html_directory] / "#{path}.html" + ext = "." + (params[:format].empty? ? DEFAULT_PAGE_EXTENSION : params[:format]) + ext = nil if File.extname(path) == ext + cache_file = Merb::Controller._cache.config[:cache_html_directory] / "#{path}#{ext}" if data cache_directory = File.dirname(cache_file) FileUtils.mkdir_p(cache_directory) merb-cache/lib/merb-cache/cache-page.rb @@ -40,6 +40,7 @@ class Merb::Cache def start @config = DEFAULT_CONFIG.merge(Merb::Plugins.config[:merb_cache] || {}) if @config[:disable] == true || Merb.environment == @config[:disable] + config[:disable_page_caching] = true config[:store] = "dummy" end @config[:cache_html_directory] ||= Merb.dir_for(:public) / "cache" merb-cache/lib/merb-cache/merb-cache.rb @@ -8,6 +8,7 @@ class CacheController < Merb::Controller cache_page :action5 cache_page :action6, 0.05 # or cache_pages :action5, [:action6, 0.05] + cache_page :action7 def action1 render @@ -33,6 +34,24 @@ class CacheController < Merb::Controller Time.now.to_s end + def action7 + provides :js, :css, :html, :xml, :jpg + case params[:format] + when "css" + "CSS" + when "js" + "JS" + when "html" + "HTML" + when "xml" + "XML" + when "jpg" + "JPG" + else + raise "BAD FORMAT: #{params[:format].inspect}" + end + end + def index "test index" end merb-cache/spec/controller.rb @@ -109,6 +109,38 @@ describe "merb-cache-page" do CACHE.cached_page?(:key => "/cache_controller/action6/id1/id2").should be_false end + it "should respect original content-type" do + c = get("/cache_controller/action7.css") + c.body.should == "CSS" + c = get("/cache_controller/action7.css") + c.params[:format].should == "css" + c.cached_page?(:action => "action7", :extension => 'css').should be_true + + c = get("/cache_controller/action7.js") + c.body.should == "JS" + c = get("/cache_controller/action7.js") + c.params[:format].should == "js" + c.cached_page?(:action => "action7", :extension => 'js').should be_true + + c = get("/cache_controller/action7.xml") + c.body.should == "XML" + c = get("/cache_controller/action7.xml") + c.params[:format].should == "xml" + c.cached_page?(:action => "action7", :extension => 'xml').should be_true + + c = get("/cache_controller/action7.jpg") + c.body.should == "JPG" + c = get("/cache_controller/action7.jpg") + c.params[:format].should == "jpg" + c.cached_page?(:action => "action7", :extension => 'jpg').should be_true + + c = get("/cache_controller/action7.html") + c.body.should == "HTML" + c = get("/cache_controller/action7.html") + c.params[:format].should == "html" + c.cached_page?(:action => "action7").should be_true + end + it "should expire all pages" do CACHE.expire_all_pages CACHE.cached_page?("action6").should be_false merb-cache/spec/merb-cache-page_spec.rb 47d372f6a6f195974792a76554ccab41b324b2a9 booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/8690d673201d6cff9019dc26291af773eafdb4a0 8690d673201d6cff9019dc26291af773eafdb4a0 2008-04-29T05:17:11-07:00 2008-04-29T05:17:11-07:00 Cached page requests now respect the original content-type, fixing #116 39812c00c36a053cb789115923e5ac0cba2366db booss alex.boussinet@gmail.com