@@ -1,5 +1,7 @@ *SVN* +* Add conditional options to caches_page method. [Paul Horsfall] + * Move missing template logic to ActionView. [Pratik] * Introduce ActionView::InlineTemplate class. [Pratik] actionpack/CHANGELOG @@ -78,10 +78,18 @@ module ActionController #:nodoc: # Caches the +actions+ using the page-caching approach that'll store the cache in a path within the page_cache_directory that # matches the triggering url. + # + # Usage: + # + # # cache the index action + # caches_page :index + # + # # cache the index action except for JSON requests + # caches_page :index, :if => Proc.new { |c| !c.request.format.json? } def caches_page(*actions) return unless perform_caching - actions = actions.map(&:to_s) - after_filter { |c| c.cache_page if actions.include?(c.action_name) } + options = actions.extract_options! + after_filter({:only => actions}.merge(options)) { |c| c.cache_page } end private actionpack/lib/action_controller/caching/pages.rb @@ -8,7 +8,8 @@ ActionController::Base.page_cache_directory = FILE_STORE_PATH ActionController::Base.cache_store = :file_store, FILE_STORE_PATH class PageCachingTestController < ActionController::Base - caches_page :ok, :no_content, :found, :not_found + caches_page :ok, :no_content, :if => Proc.new { |c| !c.request.format.json? } + caches_page :found, :not_found def ok head :ok @@ -127,6 +128,12 @@ class PageCachingTest < Test::Unit::TestCase end end end + + def test_page_caching_conditional_options + @request.env['HTTP_ACCEPT'] = 'application/json' + get :ok + assert_page_not_cached :ok + end private def assert_page_cached(action, message = "#{action} should have been cached") actionpack/test/controller/caching_test.rb 3f8d3cd04ff0bd7cbf70c11d49a3dc009dfa98a0 Paul Horsfall phorsfall horsfallp@gmail.com http://github.com/rails/rails/commit/14a40804a29a57ad05ca6bffbe1e5334089593a9 14a40804a29a57ad05ca6bffbe1e5334089593a9 2008-04-19T14:21:34-07:00 2008-04-19T14:19:47-07:00 Add conditional options to caches_page method [#25 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> 80e2d5f38334327a70a368cc2e57fc8c2e8f7c1c Joshua Peek josh josh@joshpeek.com