Call to_s on the extension as it may be a symbol. Fixes #10

Author: pixeltrix

CHANGELOG.md

@@ -1,8 +1,16 @@
+*   Call `to_s` on the extension as it may be a symbol
+
+    Fixes #10
+
+    *Andrew White*
+
+## 1.1.1 (January 2, 2014)
+
 *   Fix load order problem with other gems
 
     *Andrew White*
 
-## 1.1.0
+## 1.1.0 (November 1, 2013)
 
 *   Allow to use non-proc object in `cache_path` option. You can pass an object that
     responds to a `call` method.

lib/action_controller/caching/actions.rb

@@ -199,7 +199,7 @@ def initialize(controller, options = {}, infer_extension = true)
 
       private
         def normalize!(path)
-          ext = URI.parser.escape(extension) if extension
+          ext = URI.parser.escape(extension.to_s) if extension
           path << 'index' if path[-1] == ?/
           path << ".#{ext}" if extension and !path.split('?', 2).first.ends_with?(".#{ext}")
           URI.parser.unescape(path)

test/caching_test.rb

@@ -26,12 +26,17 @@ class ActionCachingTestController < CachingController
   # Eliminate uninitialized ivar warning
   before_filter { @title = nil }
 
+  before_filter only: :with_symbol_format do
+    request.params[:format] = :json
+  end
+
   caches_action :index, :redirected, :forbidden, if: Proc.new { |c| c.request.format && !c.request.format.json? }, expires_in: 1.hour
   caches_action :show, cache_path: 'http://test.host/custom/show'
   caches_action :edit, cache_path: Proc.new { |c| c.params[:id] ? "http://test.host/#{c.params[:id]};edit" : 'http://test.host/edit' }
   caches_action :custom_cache_path, cache_path: CachePath.new
   caches_action :with_layout
   caches_action :with_format_and_http_param, cache_path: Proc.new { |c| { key: 'value' } }
+  caches_action :with_symbol_format, cache_path: 'http://test.host/action_caching_test/with_symbol_format'
   caches_action :layout_false, layout: false
   caches_action :with_layout_proc_param, layout: Proc.new { |c| c.params[:layout] }
   caches_action :record_not_found, :four_oh_four, :simple_runtime_error
@@ -65,6 +70,11 @@ def with_format_and_http_param
     render text: @cache_this
   end
 
+  def with_symbol_format
+    @cache_this = MockTime.now.to_f.to_s
+    render json: { timestamp: @cache_this }
+  end
+
   def record_not_found
     raise ActiveRecord::RecordNotFound, 'oops!'
   end
@@ -269,6 +279,13 @@ def test_action_cache_with_format_and_http_param
     assert fragment_exist?('hostname.com/action_caching_test/with_format_and_http_param.json?key=value')
   end
 
+  def test_action_cache_with_symbol_format
+    get :with_symbol_format
+    assert_response :success
+    assert !fragment_exist?('test.host/action_caching_test/with_symbol_format')
+    assert fragment_exist?('test.host/action_caching_test/with_symbol_format.json')
+  end
+
   def test_action_cache_with_store_options
     MockTime.expects(:now).returns(12345).once
     @controller.expects(:read_fragment).with('hostname.com/action_caching_test', expires_in: 1.hour).once