diff options
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 19 | ||||
| -rw-r--r-- | actionpack/test/controller/caching_test.rb | 9 |
2 files changed, 20 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 3e01ee12b2..e90e27c388 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -136,17 +136,20 @@ module ActionController #:nodoc: end # Manually cache the +content+ in the key determined by +options+. If no content is provided, the contents of response.body is used - # If no options are provided, the current +options+ for this action is used. Example: + # If no options are provided, the requested url is used. Example: # cache_page "I'm the cached content", :controller => "lists", :action => "show" - def cache_page(content = nil, options = {}) + def cache_page(content = nil, options = nil) return unless perform_caching && caching_allowed - - if options.is_a?(Hash) - path = url_for(options.merge(:only_path => true, :skip_relative_url_root => true, :format => params[:format])) - else - path = options + + path = case options + when Hash + url_for(options.merge(:only_path => true, :skip_relative_url_root => true, :format => params[:format])) + when String + options + else + request.path end - + self.class.cache_page(content || response.body, path) end diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb index 43babca5ab..6aab2e8dce 100644 --- a/actionpack/test/controller/caching_test.rb +++ b/actionpack/test/controller/caching_test.rb @@ -92,6 +92,15 @@ class PageCachingTest < Test::Unit::TestCase assert !File.exist?("#{FILE_STORE_PATH}/index.html") end + uses_mocha("should_cache_ok_at_custom_path") do + def test_should_cache_ok_at_custom_path + @request.expects(:path).returns("/index.html") + get :ok + assert_response :ok + assert File.exist?("#{FILE_STORE_PATH}/index.html") + end + end + [:ok, :no_content, :found, :not_found].each do |status| [:get, :post, :put, :delete].each do |method| unless method == :get and status == :ok |