Browse files

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

…o abstract_controller
  • Loading branch information...
2 parents 4d3cd9b + 1d3e2c2 commit 9c8eaf8e254cf8ccaa6ecae3fdf1f468fbb60db8 @wycats wycats committed Apr 6, 2009
View
42 actionpack/lib/action_controller/abstract/layouts.rb
@@ -6,14 +6,43 @@ def self.included(base)
end
module ClassMethods
- def _layout() end
+ def layout(layout)
+ unless [String, Symbol, FalseClass, NilClass].include?(layout.class)
+ raise ArgumentError, "Layouts must be specified as a String, Symbol, false, or nil"
+ end
+
+ @layout = layout || false # Converts nil to false
+ end
+
+ def _write_layout_method
+ case @layout
+ when String
+ self.class_eval %{def _layout() #{@layout.inspect} end}
+ when Symbol
+ self.class_eval %{def _layout() #{@layout} end}
+ when false
+ self.class_eval %{def _layout() end}
+ else
+ self.class_eval %{
+ def _layout
+ if view_paths.find_by_parts?("#{controller_path}", formats, "layouts")
+ "#{controller_path}"
+ else
+ super
+ end
+ end
+ }
+ end
+ end
end
def _render_template(template, options)
_action_view._render_template_with_layout(template, options[:_layout])
end
private
+
+ def _layout() end # This will be overwritten
def _layout_for_option(name)
case name
@@ -28,16 +57,7 @@ def _layout_for_name(name)
end
def _default_layout(require_layout = false)
- # begin
- # _layout_for_name(controller_path)
- # rescue ActionView::MissingTemplate
- # begin
- # _layout_for_name("application")
- # rescue ActionView::MissingTemplate => e
- # raise e if require_layout
- # end
- # end
- _layout_for_option(self.class._layout)
+ _layout_for_option(_layout)
end
end
end
View
9 actionpack/lib/action_view/paths.rb
@@ -46,6 +46,15 @@ def find_by_parts(path, extension = nil, prefix = nil, partial = false)
extension ||= []
raise ActionView::MissingTemplate.new(self, "#{prefix}/#{path}.{#{extension.join(",")}}")
end
+
+ def find_by_parts?(path, extension = nil, prefix = nil, partial = false)
+ template_path = path.sub(/^\//, '')
+
+ each do |load_path|
+ return true if template = load_path.find_by_parts(template_path, extension, prefix, partial)
+ end
+ false
+ end
def find_template(original_template_path, format = nil)
return original_template_path if original_template_path.respond_to?(:render)
View
102 actionpack/test/abstract_controller/layouts_test.rb
@@ -9,8 +9,16 @@ class Base < AbstractController::Base
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,14 +42,45 @@ def index
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"
def index
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 @@ class TestBase < ActiveSupport::TestCase
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
View
11 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 @@ def render_hello_world
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 @@ class TestTextRenderWithLayoutNil < SimpleRouteCase
assert_body "hello world"
assert_status 200
end
-end
+end
+
+ActionController::Base2.app_loaded!
View
12 actionpack/test/new_base/test_helper.rb
@@ -38,12 +38,18 @@ class Base2 < AbstractBase
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')

0 comments on commit 9c8eaf8

Please sign in to comment.