lib/layout/base.rb in layout-0.1.0 vs lib/layout/base.rb in layout-0.2.0

@@ -13,31 +13,44 @@
         end
 
         # Set current action's layout.
         # Works in the same old fashion, but you can have multiple calls to it.
         #
-        #   set_layout "application"
-        #   set_layout "site", :only => %w[show edit]
-        #   set_layout "site", :except => %w[remove index]
+        #   set_layout :application
+        #   set_layout :site, :only => %w[show edit]
+        #   set_layout :site, :except => %w[remove index]
         #
         def self.set_layout(name, options = {})
-          self.layout_options << [name, options]
+          self.layout_options << [name.to_s, options]
+          layout :choose_layout
         end
-
-        before_filter :choose_layout
       end
     end
 
     module InstanceMethods
       private
       def choose_layout
+        layout_name = nil
+
         self.class.layout_options.each do |name, options|
-          if options[:only] && validates_action_for_layout(true, options[:only])
-            self.class.layout(name)
-          elsif options[:except] && validates_action_for_layout(false, options[:except])
-            self.class.layout(name)
-          end
+          matched = options[:only] && validates_action_for_layout(true, options[:only]) ||
+                    options[:except] && validates_action_for_layout(false, options[:except])
+
+          next unless matched
+
+          layout_name = name
+          break
         end
+
+        if layout_name && lookup_context.find_all(layout_name.to_s, "layouts").first
+          return layout_name
+        end
+
+        self.class.ancestors
+          .take_while {|item| item.name != "ActionController::Base" }
+          .select {|item| item.instance_of?(Class) }
+          .map(&:controller_name)
+          .find {|name| lookup_context.find_all(name, "layouts").first } || "application"
       end
 
       def validates_action_for_layout(compares_to, actions)
         [actions].flatten.collect(&:to_sym).include?(action_name.to_sym) == compares_to
       end
\ No newline at end of file