aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/abstract_controller/view_paths.rb6
-rw-r--r--actionpack/lib/action_view/base.rb2
-rw-r--r--actionpack/lib/action_view/lookup_context.rb2
-rw-r--r--actionpack/lib/action_view/render/layouts.rb4
-rw-r--r--actionpack/lib/action_view/render/partials.rb2
-rw-r--r--actionpack/lib/action_view/render/rendering.rb9
-rw-r--r--actionpack/test/abstract/layouts_test.rb156
7 files changed, 63 insertions, 118 deletions
diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb
index c2a9f6336d..b331eb51b6 100644
--- a/actionpack/lib/abstract_controller/view_paths.rb
+++ b/actionpack/lib/abstract_controller/view_paths.rb
@@ -7,7 +7,7 @@ module AbstractController
self._view_paths = ActionView::PathSet.new
end
- delegate :template_exists?, :view_paths, :formats, :formats=,
+ delegate :find_template, :template_exists?, :view_paths, :formats, :formats=,
:locale, :locale=, :to => :lookup_context
# LookupContext is the object responsible to hold all information required to lookup
@@ -29,10 +29,6 @@ module AbstractController
lookup_context.view_paths.unshift(*path)
end
- def template_exists?(*args)
- lookup_context.exists?(*args)
- end
-
module ClassMethods
# Append a path to the list of view paths for this controller.
#
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index ffe3060404..f1b1c22075 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -194,7 +194,7 @@ module ActionView #:nodoc:
attr_accessor :base_path, :assigns, :template_extension, :lookup_context
attr_internal :captures, :request, :layout, :controller, :template, :config
- delegate :find, :exists?, :formats, :formats=, :locale, :locale=,
+ delegate :find_template, :template_exists?, :formats, :formats=, :locale, :locale=,
:view_paths, :view_paths=, :with_fallbacks, :update_details, :to => :lookup_context
delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers,
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 27ee8b23c9..22ab076b59 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -70,6 +70,7 @@ module ActionView
def find(name, prefix = nil, partial = false)
@view_paths.find(name, prefix, partial, details, details_key)
end
+ alias :find_template :find
def find_all(name, prefix = nil, partial = false)
@view_paths.find_all(name, prefix, partial, details, details_key)
@@ -78,6 +79,7 @@ module ActionView
def exists?(name, prefix = nil, partial = false)
@view_paths.exists?(name, prefix, partial, details, details_key)
end
+ alias :template_exists? :exists?
# Add fallbacks to the view paths. Useful in cases you are rendering a :file.
def with_fallbacks
diff --git a/actionpack/lib/action_view/render/layouts.rb b/actionpack/lib/action_view/render/layouts.rb
index 8688de3d18..91a92a833a 100644
--- a/actionpack/lib/action_view/render/layouts.rb
+++ b/actionpack/lib/action_view/render/layouts.rb
@@ -49,10 +49,10 @@ module ActionView
def _find_layout(layout) #:nodoc:
begin
layout =~ /^\// ?
- with_fallbacks { find(layout) } : find(layout)
+ with_fallbacks { find_template(layout) } : find_template(layout)
rescue ActionView::MissingTemplate => e
update_details(:formats => nil) do
- raise unless exists?(layout)
+ raise unless template_exists?(layout)
end
end
end
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 950c9d2cd8..0fe2d560f7 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -294,7 +294,7 @@ module ActionView
def find_template(path=@path)
return path unless path.is_a?(String)
prefix = @view.controller_path unless path.include?(?/)
- @view.find(path, prefix, true)
+ @view.find_template(path, prefix, true)
end
def partial_path(object = @object)
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 47ea70f5ad..d9ac1f6290 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -59,13 +59,12 @@ module ActionView
handler = Template.handler_class_for_extension(options[:type] || "erb")
Template.new(options[:inline], "inline template", handler, {})
elsif options.key?(:text)
- Template::Text.new(options[:text], self.formats.try(:first))
- elsif options.key?(:_template)
- options[:_template]
+ Template::Text.new(options[:text], formats.try(:first))
elsif options.key?(:file)
- with_fallbacks { find(options[:file], options[:prefix]) }
+ with_fallbacks { find_template(options[:file], options[:prefix]) }
elsif options.key?(:template)
- find(options[:template], options[:prefix])
+ options[:template].respond_to?(:render) ?
+ options[:template] : find_template(options[:template], options[:prefix])
end
end
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index 65a50807fd..f580ad40f7 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -8,210 +8,158 @@ module AbstractControllerTests
include AbstractController::Rendering
include AbstractController::Layouts
- def _prefix
- "template"
- end
-
self.view_paths = [ActionView::FixtureResolver.new(
- "abstract_controller_tests/layouts/with_string_implied_child.erb" =>
- "With Implied <%= yield %>",
"layouts/hello.erb" => "With String <%= yield %>",
"layouts/hello_override.erb" => "With Override <%= yield %>",
"layouts/overwrite.erb" => "Overwrite <%= yield %>",
- "layouts/with_false_layout.erb" => "False Layout <%= yield %>"
+ "layouts/with_false_layout.erb" => "False Layout <%= yield %>",
+ "abstract_controller_tests/layouts/with_string_implied_child.erb" =>
+ "With Implied <%= yield %>"
)]
end
-
+
class Blank < Base
- self.view_paths = ActionView::FixtureResolver.new("template/index.erb" => "Hello blank!")
+ self.view_paths = []
def index
- render
+ render :template => ActionView::Template::Text.new("Hello blank!")
end
end
-
+
class WithString < Base
layout "hello"
- append_view_path ActionView::FixtureResolver.new(
- "template/index.erb" => "Hello string!",
- "template/overwrite_default.erb" => "Hello string!",
- "template/overwrite_false.erb" => "Hello string!",
- "template/overwrite_string.erb" => "Hello string!"
- )
-
def index
- render
+ render :template => ActionView::Template::Text.new("Hello string!")
end
def overwrite_default
- render :layout => :default
+ render :template => ActionView::Template::Text.new("Hello string!"), :layout => :default
end
def overwrite_false
- render :layout => false
+ render :template => ActionView::Template::Text.new("Hello string!"), :layout => false
end
def overwrite_string
- render :layout => "overwrite"
+ render :template => ActionView::Template::Text.new("Hello string!"), :layout => "overwrite"
end
def overwrite_skip
render :text => "Hello text!"
end
end
-
+
class WithStringChild < WithString
end
-
+
class WithStringOverriddenChild < WithString
layout "hello_override"
end
-
+
class WithNilChild < WithString
layout nil
- end
-
+ end
+
class WithStringImpliedChild < WithString
end
-
+
class WithChildOfImplied < WithStringImpliedChild
end
class WithProc < Base
layout proc { |c| "overwrite" }
- append_view_path ActionView::FixtureResolver.new(
- "template/index.erb" => "Hello proc!"
- )
-
def index
- render
+ render :template => ActionView::Template::Text.new("Hello proc!")
end
end
class WithSymbol < Base
layout :hello
- append_view_path ActionView::FixtureResolver.new(
- "template/index.erb" => "Hello symbol!"
- )
-
def index
- render
+ render :template => ActionView::Template::Text.new("Hello symbol!")
end
-
private
-
def hello
"overwrite"
end
end
-
+
class WithSymbolReturningString < Base
layout :no_hello
- append_view_path ActionView::FixtureResolver.new(
- "template/index.erb" => "Hello missing symbol!"
- )
-
def index
- render
+ render :template => ActionView::Template::Text.new("Hello missing symbol!")
end
-
private
-
def no_hello
nil
end
end
-
+
class WithSymbolReturningNil < Base
layout :nilz
- append_view_path ActionView::FixtureResolver.new(
- "template/index.erb" => "Hello nilz!"
- )
-
def index
- render
- end
-
- def nilz
+ render :template => ActionView::Template::Text.new("Hello nilz!")
end
+
+ def nilz() end
end
-
+
class WithSymbolReturningObj < Base
layout :objekt
- append_view_path ActionView::FixtureResolver.new(
- "template/index.erb" => "Hello object!"
- )
-
def index
- render
+ render :template => ActionView::Template::Text.new("Hello nilz!")
end
-
+
def objekt
Object.new
end
- end
-
+ end
+
class WithSymbolAndNoMethod < Base
layout :no_method
- append_view_path ActionView::FixtureResolver.new(
- "template/index.erb" => "Hello boom!"
- )
-
def index
- render
+ render :template => ActionView::Template::Text.new("Hello boom!")
end
end
-
+
class WithMissingLayout < Base
layout "missing"
- append_view_path ActionView::FixtureResolver.new(
- "template/index.erb" => "Hello missing!"
- )
-
def index
- render
+ render :template => ActionView::Template::Text.new("Hello missing!")
end
end
-
+
class WithFalseLayout < Base
layout false
- append_view_path ActionView::FixtureResolver.new(
- "template/index.erb" => "Hello false!"
- )
-
def index
- render
+ render :template => ActionView::Template::Text.new("Hello false!")
end
end
-
+
class WithNilLayout < Base
layout nil
- append_view_path ActionView::FixtureResolver.new(
- "template/index.erb" => "Hello nil!"
- )
-
def index
- render
+ render :template => ActionView::Template::Text.new("Hello nil!")
end
end
-
+
class TestBase < ActiveSupport::TestCase
test "when no layout is specified, and no default is available, render without a layout" do
controller = Blank.new
controller.process(:index)
assert_equal "Hello blank!", controller.response_body
end
-
+
test "when layout is specified as a string, render with that layout" do
controller = WithString.new
controller.process(:index)
@@ -245,13 +193,13 @@ module AbstractControllerTests
test "when layout is specified as a string, but the layout is missing, raise an exception" do
assert_raises(ActionView::MissingTemplate) { WithMissingLayout.new.process(:index) }
end
-
+
test "when layout is specified as false, do not use a layout" do
controller = WithFalseLayout.new
controller.process(:index)
assert_equal "Hello false!", controller.response_body
end
-
+
test "when layout is specified as nil, do not use a layout" do
controller = WithNilLayout.new
controller.process(:index)
@@ -263,58 +211,58 @@ module AbstractControllerTests
controller.process(:index)
assert_equal "Overwrite Hello proc!", controller.response_body
end
-
+
test "when layout is specified as a symbol, call the requested method and use the layout returned" do
controller = WithSymbol.new
controller.process(:index)
assert_equal "Overwrite Hello symbol!", controller.response_body
end
-
+
test "when layout is specified as a symbol and the method returns nil, don't use a layout" do
controller = WithSymbolReturningNil.new
controller.process(:index)
assert_equal "Hello nilz!", controller.response_body
end
-
+
test "when the layout is specified as a symbol and the method doesn't exist, raise an exception" do
assert_raises(NoMethodError) { WithSymbolAndNoMethod.new.process(:index) }
end
-
+
test "when the layout is specified as a symbol and the method returns something besides a string/false/nil, raise an exception" do
assert_raises(ArgumentError) { WithSymbolReturningObj.new.process(:index) }
end
-
+
test "when a child controller does not have a layout, use the parent controller layout" do
controller = WithStringChild.new
controller.process(:index)
assert_equal "With String Hello string!", controller.response_body
end
-
+
test "when a child controller has specified a layout, use that layout and not the parent controller layout" do
controller = WithStringOverriddenChild.new
controller.process(:index)
assert_equal "With Override Hello string!", controller.response_body
end
-
+
test "when a child controller has an implied layout, use that layout and not the parent controller layout" do
controller = WithStringImpliedChild.new
controller.process(:index)
assert_equal "With Implied Hello string!", controller.response_body
end
-
+
test "when a child controller specifies layout nil, do not use the parent layout" do
controller = WithNilChild.new
controller.process(:index)
assert_equal "Hello string!", controller.response_body
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
controller = WithChildOfImplied.new
controller.process(:index)
assert_equal "With Implied Hello string!", controller.response_body
end
-
+
test "raises an exception when specifying layout true" do
assert_raises ArgumentError do
Object.class_eval do
@@ -326,4 +274,4 @@ module AbstractControllerTests
end
end
end
-end
+end \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 14:17:33 +0000