1 files changed, 36 insertions, 16 deletions

diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb
index 35d5e85ed9..3d6810bda9 100644
--- a/actionpack/lib/action_controller/abstract/layouts.rb
+++ b/actionpack/lib/action_controller/abstract/layouts.rb
@@ -4,11 +4,19 @@ module AbstractController
 
     depends_on Renderer
 
+    included do
+      extlib_inheritable_accessor :_layout_conditions
+      self._layout_conditions = {}
+    end
+
     module ClassMethods
-      def layout(layout)
+      def layout(layout, conditions = {})
         unless [String, Symbol, FalseClass, NilClass].include?(layout.class)
           raise ArgumentError, "Layouts must be specified as a String, Symbol, false, or nil"
         end
+
+        conditions.each {|k, v| conditions[k] = Array(v).map {|a| a.to_s} }
+        self._layout_conditions = conditions
         
         @_layout = layout || false # Converts nil to false
         _write_layout_method
@@ -31,15 +39,15 @@ module AbstractController
       def _write_layout_method
         case @_layout
         when String
-          self.class_eval %{def _layout() #{@_layout.inspect} end}
+          self.class_eval %{def _layout(details) #{@_layout.inspect} end}
         when Symbol
-          self.class_eval %{def _layout() #{@_layout} end}
+          self.class_eval %{def _layout(details) #{@_layout} end}
         when false
-          self.class_eval %{def _layout() end}
+          self.class_eval %{def _layout(details) end}
         else
           self.class_eval %{
-            def _layout
-              if view_paths.find_by_parts?("#{_implied_layout_name}", {:formats => formats}, "layouts")
+            def _layout(details)
+              if view_paths.find_by_parts?("#{_implied_layout_name}", details, "layouts")
                 "#{_implied_layout_name}"
               else
                 super
@@ -49,38 +57,50 @@ module AbstractController
         end
       end
     end
-    
-    def _render_template(template, options)
-      _action_view._render_template_from_controller(template, options[:_layout], options, options[:_partial])
-    end
         
   private
   
-    def _layout() end # This will be overwritten
+    def _layout(details) end # This will be overwritten
     
     # :api: plugin
     # ====
     # Override this to mutate the inbound layout name
-    def _layout_for_name(name)
+    def _layout_for_name(name, details = {:formats => formats})
       unless [String, FalseClass, NilClass].include?(name.class)
         raise ArgumentError, "String, false, or nil expected; you passed #{name.inspect}"
       end
       
-      name && view_paths.find_by_parts(name, {:formats => formats}, "layouts")
+      name && view_paths.find_by_parts(name, details, _layout_prefix(name))
+    end
+
+    # TODO: Decide if this is the best hook point for the feature
+    def _layout_prefix(name)
+      "layouts"
     end
     
-    def _default_layout(require_layout = false)
-      if require_layout && !_layout
+    def _default_layout(require_layout = false, details = {:formats => formats})
+      if require_layout && _action_has_layout? && !_layout(details)
         raise ArgumentError,
           "There was no default layout for #{self.class} in #{view_paths.inspect}"
       end
 
       begin
-        layout = _layout_for_name(_layout)
+        _layout_for_name(_layout(details), details) if _action_has_layout?
       rescue NameError => e
         raise NoMethodError, 
           "You specified #{@_layout.inspect} as the layout, but no such method was found"
       end
     end
+
+    def _action_has_layout?
+      conditions = _layout_conditions
+      if only = conditions[:only]
+        only.include?(action_name)
+      elsif except = conditions[:except]
+        !except.include?(action_name)
+      else
+        true
+      end
+    end
   end
 end
\ No newline at end of file