0
@@ -90,7 +90,7 @@
0
   # structure for your app.
0
   #
0
   # ==== Parameters
0
-  # action<~to_s>:: The controller action.
0
+  # context<~to_s>:: The controller context (the action or template name).
0
   # type<~to_s>:: The content type. Defaults to nil.
0
   # controller<~to_s>::
0
   #   The name of the controller. Defaults to controller_name.
0
@@ -99,7 +99,7 @@
0
   # ==== Returns
0
   # String:: 
0
   #   Indicating where to look for the template for the current controller,
0
-  #   action, and content-type.
0
+  #   context, and content-type.
0
   #
0
   # ==== Notes
0
   # The type is irrelevant for controller-types that don't support
0
@@ -115,8 +115,8 @@
0
   # of controller/action.mime.type
0
   #---
0
   # @public
0
-  def _template_location(action, type = nil, controller = controller_name)
0
-    "#{controller}/#{action}"
0
+  def _template_location(context, type = nil, controller = controller_name)
0
+    controller ? "#{controller}/#{context}" : context
0
   end
0
 
0
   # ==== Returns

0
@@ -58,7 +58,7 @@
0
   #       "team@cowboys.com", 
0
   #       "Exception occured at #{Time.now}", 
0
   #       params[:exception])
0
-  #     render :inline => 'Something is wrong, but the team are on it!'
0
+  #     render  'Something is wrong, but the team are on it!'
0
   #   end
0
   #
0
   # Note: The special param[:exception] is available in all Exception actions 
0
@@ -100,6 +100,11 @@
0
       # ==== Returns
0
       # String:: The snake cased name of the error without the namespace.
0
       def name; self.class.name; end
0
+
0
+      # === Returns
0
+      # Integer:: The status-code of the error.
0
+      def status; self.class.status; end
0
+      alias :to_i :status
0
 
0
       class << self
0
 

0
@@ -128,12 +128,12 @@
0
 
0
   end # class << self
0
 
0
-  # The location to look for a template for a particular controller, action,
0
+  # The location to look for a template for a particular controller, context,
0
   # and mime-type. This is overridden from AbstractController, which defines a
0
   # version of this that does not involve mime-types.
0
   #
0
   # ==== Parameters
0
-  # action<~to_s>:: The name of the action that will be rendered.
0
+  # context<~to_s>:: The name of the action or template basename that will be rendered.
0
   # type<~to_s>::
0
   #    The mime-type of the template that will be rendered. Defaults to nil.
0
   # controller<~to_s>::
0
@@ -146,8 +146,8 @@
0
   #
0
   #---
0
   # @public
0
-  def _template_location(action, type = nil, controller = controller_name)
0
-    "#{controller}/#{action}.#{type}"
0
+  def _template_location(context, type = nil, controller = controller_name)
0
+    controller ? "#{controller}/#{context}.#{type}" : "#{context}.#{type}"
0
   end
0
 
0
   # Build a new controller.

0
@@ -336,24 +336,30 @@
0
   # and template location of the first match.
0
   #
0
   # ==== Parameters
0
-  # thing<Object>:: The controller action.
0
+  # context<Object>:: The controller action or template basename.
0
   # content_type<~to_s>:: The content type. Defaults to nil.
0
   # controller<~to_s>:: The name of the controller. Defaults to nil.
0
   #
0
   # ==== Options (opts)
0
   # :template<String>::
0
   #   The location of the template to use. Defaults to whatever matches this
0
-  #   thing, content_type and controller.
0
+  #   context, content_type and controller.
0
   #
0
   # ==== Returns
0
   # Array[Symbol, String]::
0
   #   A pair consisting of the template method and location.
0
-  def _template_for(thing, content_type, controller=nil, opts={})
0
+  def _template_for(context, content_type, controller=nil, opts={})
0
     template_method = nil
0
     template_location = nil
0
     
0
     self.class._template_roots.reverse_each do |root, template_location| 
0
-      template_location = root / (opts[:template] || self.send(template_location, thing, content_type, controller))
0
+      if opts[:template] # use the given template as the location context
0
+        template_location = root / self.send(template_location, opts[:template], content_type, nil)
0
+        template_method = Merb::Template.template_for(template_location)
0
+        break if template_method && self.respond_to?(template_method)
0
+      end
0
+      
0
+      template_location = root / (opts[:template] || self.send(template_location, context, content_type, controller))
0
       template_method = Merb::Template.template_for(template_location)
0
       break if template_method && self.respond_to?(template_method)
0
     end

0
@@ -4,8 +4,8 @@
0
     class HelperTesting < Merb::AbstractController
0
       self._template_root = File.dirname(__FILE__) / "views"
0
       
0
-      def _template_location(action, type = nil, controller = controller_name)
0
-        "helpers/#{File.basename(controller)}/#{action}"
0
+      def _template_location(context, type = nil, controller = controller_name)
0
+        "helpers/#{File.basename(controller)}/#{context}"
0
       end
0
     end
0
     

0
@@ -7,8 +7,8 @@
0
     class RenderIt < Merb::AbstractController
0
       self._template_root = File.dirname(__FILE__) / "views"
0
 
0
-      def _template_location(action, type = nil, controller = controller_name)
0
-        "partial/#{File.basename(controller)}/#{action}"
0
+      def _template_location(context, type = nil, controller = controller_name)
0
+        "partial/#{File.basename(controller)}/#{context}"
0
       end
0
     end
0
 

0
@@ -71,8 +71,8 @@
0
     end
0
     
0
     class RenderTemplateCustomLocation < RenderTemplate      
0
-      def _template_location(action, type = nil, controller = controller_name)  
0
-        "wonderful/#{action}"
0
+      def _template_location(context, type = nil, controller = controller_name)  
0
+        "wonderful/#{context}"
0
       end
0
     end
0
     
0
@@ -87,8 +87,8 @@
0
     class RenderTemplateMultipleRootsAndCustomLocation < RenderTemplate
0
       self._template_roots = [[File.dirname(__FILE__) / "alt_views", :_custom_template_location]]
0
       
0
-      def _custom_template_location(action, type = nil, controller = controller_name)
0
-        "#{self.class.name.split('::')[-1].to_const_path}/#{action}"
0
+      def _custom_template_location(context, type = nil, controller = controller_name)
0
+        "#{self.class.name.split('::')[-1].to_const_path}/#{context}"
0
       end
0
     end
0
     

0
@@ -12,8 +12,8 @@
0
   
0
   private
0
   
0
-  def _template_location(action, type = nil, controller = controller_name)  
0
-    "wonderful/#{action}"
0
+  def _template_location(context, type = nil, controller = controller_name)  
0
+    "wonderful/#{context}"
0
   end
0
   
0
 end