Fixed bug with template caching.

chrismoos · Jun 23, 2010 · 0e01dcd · 0e01dcd
1 parent 0bc6958
commit 0e01dcd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/lib/fastr/template.rb b/lib/fastr/template.rb
@@ -60,6 +60,9 @@ def self.register_extensions(engine, extensions)
     end
 
     def render(kind, tpl, opts={})
+      # Read the cache template settings for this application, unless it is passed in
+      opts[:cache_template] = self.app.settings.cache_templates unless opts[:cache_template]
+
       case kind.to_sym
       when :template then
         render_template(tpl, opts)
@@ -87,7 +90,7 @@ def render_template_to_string(tpl_path, opts={})
       end
 
       @vars = opts[:vars] || {}
-      engine.result(tpl_path, binding())
+      engine.result(tpl_path, binding(), opts[:cache_template])
     end
 
     def render_text(text, opts={})

diff --git a/lib/fastr/template/erubis.rb b/lib/fastr/template/erubis.rb
@@ -4,9 +4,9 @@ module Fastr
   module Template
     class Erubis
 
-      def self.result(tpl_path, _binding)
+      def self.result(tpl_path, _binding, cache_template)
         eruby = Fastr::Template::TEMPLATE_CACHE[tpl_path]
-        unless eruby
+        unless eruby and cache_template
           eruby = ::Erubis::Eruby.new(File.read("app/views/#{tpl_path}"))
           Fastr::Template::TEMPLATE_CACHE[tpl_path] = eruby
         end

diff --git a/lib/fastr/template/haml.rb b/lib/fastr/template/haml.rb
@@ -6,7 +6,7 @@ class Haml
 
       def self.result(tpl_path, _binding)
         engine = Fastr::Template::TEMPLATE_CACHE[tpl_path]
-        unless engine
+        unless engine and cache_template
           engine = ::Haml::Engine.new(File.read("app/views/#{tpl_path}"))
           Fastr::Template::TEMPLATE_CACHE[tpl_path] = engine
         end