use tilt_options and path as cache key for templates

Kush Kella · Kush Kella · commit c0eb0e3174c5 · 2016-06-08T09:49:15.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,14 @@
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
   - ruby-head
   - jruby-19mode
   - jruby-head
-  - rbx-2.2.10
+  - rbx-2
 
 matrix:
   allow_failures:
     - rvm: jruby-19mode
     - rvm: jruby-head
     - rvm: ruby-head
+    - rvm: rbx-2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 #### Next
 
+* Fix template caching for multiple formats. [#43](https://github.com/ruby-grape/grape-rabl/pull/43) [@kushkella](https://github.com/kushkella)
 * Your contribution here.
 
 #### v0.4.1
diff --git a/lib/grape-rabl/formatter.rb b/lib/grape-rabl/formatter.rb
@@ -67,7 +67,7 @@ def set_view_root
 
       def tilt_template(template)
         if Grape::Rabl.configuration.cache_template_loading
-          Grape::Rabl::Formatter.tilt_cache.fetch(template) { ::Tilt.new(view_path(template), tilt_options) }
+          Grape::Rabl::Formatter.tilt_cache.fetch(tilt_cache_key(template)) { ::Tilt.new(view_path(template), tilt_options) }
         else
           ::Tilt.new(view_path(template), tilt_options)
         end
@@ -80,11 +80,15 @@ def tilt_options
       def layout_template
         layout_path = view_path(env['api.tilt.layout'] || 'layouts/application')
         if Grape::Rabl.configuration.cache_template_loading
-          Grape::Rabl::Formatter.tilt_cache.fetch(layout_path) { ::Tilt.new(layout_path, tilt_options) if File.exist?(layout_path) }
+          Grape::Rabl::Formatter.tilt_cache.fetch(tilt_cache_key(layout_path)) { ::Tilt.new(layout_path, tilt_options) if File.exist?(layout_path) }
         else
           ::Tilt.new(layout_path, tilt_options) if File.exist?(layout_path)
         end
       end
+
+      def tilt_cache_key(path)
+        Digest::MD5.hexdigest("#{path}#{tilt_options}")
+      end
     end
   end
 end
diff --git a/spec/grape_rabl_spec.rb b/spec/grape_rabl_spec.rb
@@ -6,8 +6,9 @@
   end
 
   before do
-    subject.format :json
+    subject.default_format :json
     subject.formatter :json, Grape::Formatter::Rabl
+    subject.formatter :xml, Grape::Formatter::Rabl
     subject.helpers MyHelper
   end
 
@@ -166,7 +167,27 @@ def app
         old_response.should == new_response
       end
 
-      it 'should serve new template if cache_template_loading' do
+      it 'should maintain different cached templates for different formats' do
+        Grape::Rabl.configure do |config|
+          config.cache_template_loading = true
+        end
+        get '/home'
+        last_response.status.should be == 200
+        json_response = last_response.body
+        get '/home.xml'
+        last_response.status.should be == 200
+        xml_response = last_response.body
+        json_response.should_not be == xml_response
+        open(@template, 'a') { |f| f << 'node(:test) { "test" }' }
+        get '/home.xml'
+        last_response.status.should be == 200
+        last_response.body.should be == xml_response
+        get '/home.json'
+        last_response.status.should be == 200
+        last_response.body.should be == json_response
+      end
+
+      it 'should serve new template unless cache_template_loading' do
         get '/home'
         last_response.status.should be == 200
         old_response = last_response.body
