Merge branch 'abstract_controller' of git@github.com:wycats/rails into abstract_controller

3 files changed, 115 insertions, 10 deletions

diff --git a/actionpack/test/abstract_controller/layouts_test.rb b/actionpack/test/abstract_controller/layouts_test.rb
index 35329eea83..838a44be12 100644
--- a/actionpack/test/abstract_controller/layouts_test.rb
+++ b/actionpack/test/abstract_controller/layouts_test.rb
@@ -9,8 +9,16 @@ module AbstractControllerTests
       include AbstractController::Layouts
       
       self.view_paths = [ActionView::FixtureTemplate::FixturePath.new(
-        "layouts/hello.html.erb" => "With String <%= yield %>"
+        "layouts/hello.erb"              => "With String <%= yield %>",
+        "layouts/omg.erb"                => "OMGHI2U <%= yield %>",
+        "layouts/with_false_layout.erb"  => "False Layout <%= yield %>"
       )]
+
+      def self.controller_path
+        @controller_path ||= self.name.sub(/Controller$/, '').underscore
+      end
+      
+      def controller_path() self.class.controller_path end
       
       def render_to_string(options)
         options[:_layout] = _default_layout
@@ -34,6 +42,30 @@ module AbstractControllerTests
       end
     end
     
+    class WithSymbol < Base
+      layout :hello
+      
+      def index
+        render :_template => ActionView::TextTemplate.new("Hello symbol!")
+      end
+    private  
+      def hello
+        "omg"
+      end
+    end
+    
+    class WithSymbolReturningString < Base
+      layout :no_hello
+      
+      def index
+        render :_template => ActionView::TextTemplate.new("Hello missing symbol!")
+      end
+    private  
+      def no_hello
+        nil
+      end
+    end
+    
     class WithMissingLayout < Base
       layout "missing"
       
@@ -41,7 +73,14 @@ module AbstractControllerTests
         render :_template => ActionView::TextTemplate.new("Hello missing!")
       end
     end
+    
+    class WithFalseLayout < Base
+      layout false
       
+      def index
+        render :_template => ActionView::TextTemplate.new("Hello false!")
+      end
+    end
     
     class TestBase < ActiveSupport::TestCase
       test "when no layout is specified, and no default is available, render without a layout" do
@@ -50,15 +89,70 @@ module AbstractControllerTests
       end
       
       test "when layout is specified as a string, render with that layout" do
-        result = Blank.process(:index)
+        result = WithString.process(:index)
         assert_equal "With String Hello string!", result.response_obj[:body]
       end
       
       test "when layout is specified as a string, but the layout is missing, raise an exception" do
         assert_raises(ActionView::MissingTemplate) { WithMissingLayout.process(:index) }
       end
+      
+      test "when layout is specified as false, do not use a layout" do
+        result = WithFalseLayout.process(:index)
+        assert_equal "Hello false!", result.response_obj[:body]
+      end
+      
+      test "when layout is specified as nil, do not use a layout" do
+        pending
+      end
+      
+      test "when layout is specified as a symbol, call the requested method and use the layout returned" do
+        result = WithSymbol.process(:index)
+        assert_equal "OMGHI2U Hello symbol!", result.response_obj[:body]
+      end
+      
+      test "when layout is specified as a symbol and the method returns nil, don't use a layout" do
+        pending
+      end
+      
+      test "when the layout is specified as a symbol and the method doesn't exist, raise an exception" do
+        pending
+      end
+      
+      test "when the layout is specified as a symbol and the method returns something besides a string/false/nil, raise an exception" do
+        pending
+      end
+      
+      test "when a child controller does not have a layout, use the parent controller layout" do
+        pending
+      end
+      
+      test "when a child controller has specified a layout, use that layout and not the parent controller layout" do
+        pending
+      end
+      
+      test "when a child controller has an implied layout, use that layout and not the parent controller layout" do
+        pending
+      end
+      
+      test "when a child controller specifies layout nil, do not use the parent layout" do
+        pending
+      end
+      
+      test "when a child controller has an implied layout, use that layout instead of the parent controller layout" do
+        pending
+      end
+      
+      test %(
+        when a grandchild has no layout specified, the child has an implied layout, and the
+        parent has specified a layout, use the child controller layout
+      ) do
+        pending
+      end
+      
+      test "Raise ArgumentError if layout is called with a bad argument" do
+        pending
+      end
     end
-
-
   end
 end
\ No newline at end of file
diff --git a/actionpack/test/new_base/render_text_test.rb b/actionpack/test/new_base/render_text_test.rb
index b80a9b4a79..a20ca5fb8c 100644
--- a/actionpack/test/new_base/render_text_test.rb
+++ b/actionpack/test/new_base/render_text_test.rb
@@ -1,5 +1,8 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
 
+class ApplicationController < ActionController::Base2
+end
+
 module HappyPath
   
   class RenderTextWithoutLayoutsController < ActionController::Base2
@@ -10,11 +13,11 @@ module HappyPath
     end
   end
   
-  class RenderTextWithLayoutsController < ActionController::Base2
+  class RenderTextWithLayoutsController < ::ApplicationController
     self.view_paths = [ActionView::FixtureTemplate::FixturePath.new(
       "layouts/application.html.erb" => "<%= yield %>, I'm here!",
       "layouts/greetings.html.erb"   => "<%= yield %>, I wish thee well."
-    )]
+    )]    
     
     def render_hello_world
       render :text => "hello david"
@@ -136,4 +139,6 @@ module HappyPath
     assert_body "hello world"
     assert_status 200
   end
-end
\ No newline at end of file
+end
+
+ActionController::Base2.app_loaded!
\ No newline at end of file
diff --git a/actionpack/test/new_base/test_helper.rb b/actionpack/test/new_base/test_helper.rb
index 5ed4dd3f12..420abe58f7 100644
--- a/actionpack/test/new_base/test_helper.rb
+++ b/actionpack/test/new_base/test_helper.rb
@@ -38,12 +38,18 @@ module ActionController
     include ActionController::Renderer
     
     def self.inherited(klass)
-      @subclasses ||= []
-      @subclasses << klass.to_s
+      ::ActionController::Base2.subclasses << klass.to_s
+      super
     end
     
     def self.subclasses
-      @subclasses
+      @subclasses ||= []
+    end
+    
+    def self.app_loaded!
+      @subclasses.each do |subclass|
+        subclass.constantize._write_layout_method
+      end
     end
     
     # append_view_path File.join(File.dirname(__FILE__), '..', 'fixtures')