merb-core 1.0.7 → 1.0.7.1

data/lib/merb-core/controller/mixins/render.rb

@@ -412,31 +412,35 @@ module Merb::RenderMixin
   #
   # :api: private
   def _template_for(context, content_type, controller=nil, template=nil, locals=[])
-    self.class._templates_for[[context, content_type, controller, template, locals]] ||= begin
-    
-      template_method, template_location = nil, nil
+    tmp = self.class._templates_for[[context, content_type, controller, template, locals]]
+    return tmp if tmp
 
-      # absolute path to a template (:template => "/foo/bar")
-      if template.is_a?(String) && template =~ %r{^/}
-        template_location = self._absolute_template_location(template, content_type)
-        return [_template_method_for(template_location, locals), template_location]
-      end
+    template_method, template_location = nil, nil
+
+    # absolute path to a template (:template => "/foo/bar")
+    if template.is_a?(String) && template =~ %r{^/}
+      template_location = self._absolute_template_location(template, content_type)
+      return [_template_method_for(template_location, locals), template_location]
+    end
 
-      self.class._template_roots.reverse_each do |root, template_meth|
-        # :template => "foo/bar.html" where root / "foo/bar.html.*" exists
-        if template
-          template_location = root / self.send(template_meth, template, content_type, nil)
-        # :layout => "foo" where root / "layouts" / "#{controller}.html.*" exists        
-        else
-          template_location = root / self.send(template_meth, context, content_type, controller)
-        end
-      
-        break if template_method = _template_method_for(template_location.to_s, locals)
+    self.class._template_roots.reverse_each do |root, template_meth|
+      # :template => "foo/bar.html" where root / "foo/bar.html.*" exists
+      if template
+        template_location = root / self.send(template_meth, template, content_type, nil)
+      # :layout => "foo" where root / "layouts" / "#{controller}.html.*" exists        
+      else
+        template_location = root / self.send(template_meth, context, content_type, controller)
       end
+    
+      break if template_method = _template_method_for(template_location.to_s, locals)
+    end
 
-      # template_location is a Pathname
-      [template_method, template_location.to_s]
+    # template_location is a Pathname
+    ret = [template_method, template_location.to_s]
+    unless Merb::Config[:reload_templates]
+      self.class._templates_for[[context, content_type, controller, template, locals]] = ret
     end
+    ret
   end
   
   # Return the template method for a location, and check to make sure the current controller

data/lib/merb-core/version.rb

@@ -1,4 +1,4 @@
 module Merb
-  VERSION = '1.0.7' unless defined?(Merb::VERSION)
+  VERSION = '1.0.7.1' unless defined?(Merb::VERSION)
   DM_VERSION = '0.9.8' unless defined?(Merb::DM_VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.0.7.1
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-28 00:00:00 -08:00
+date: 2008-12-31 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency