@@ -249,7 +249,9 @@ module Merb::RenderMixin # raised if no layout was specified, and the default layouts were # not found. def _get_layout(layout = nil) - layout = _layout.to_s if _layout + if _layout && !layout + layout = _layout.instance_of?(Symbol) && self.respond_to?(_layout, true) ? send(_layout) : _layout + end layout = layout.to_s if layout # If a layout was provided, throw an error if it's not found lib/merb-core/controller/mixins/render.rb @@ -26,6 +26,18 @@ module Merb::Test::Fixtures class RenderStringControllerLayout < RenderString self._template_root = File.dirname(__FILE__) / "alt_views" end + + class RenderStringDynamicLayout < RenderString + layout :determine_layout + + def alt_index + render "the alt index" + end + + def determine_layout + action_name.index('alt') == 0 ? 'alt' : 'custom' + end + end class RenderTemplate < Testing spec/public/abstract_controller/controllers/render.rb @@ -22,6 +22,11 @@ describe Merb::AbstractController, " rendering plain strings" do dispatch_should_make_body("RenderStringControllerLayout", "Controller: the index") end + it "should support rendering plain strings with dynamic layouts" do + dispatch_should_make_body("RenderStringDynamicLayout", "Custom: the index", :index) + dispatch_should_make_body("RenderStringDynamicLayout", "Alt: the alt index", :alt_index) + end + end describe Merb::AbstractController, " rendering templates" do spec/public/abstract_controller/render_spec.rb 3f0f4f410f29b14b9f72057fb91755fe402c6ef1 Mirko Froehlich mirko@digitalhobbit.com http://github.com/wycats/merb-core/commit/6be99f54af744cc84d3403cff5e11086b7f7496b 6be99f54af744cc84d3403cff5e11086b7f7496b 2008-02-17T07:52:08-08:00 2008-02-16T00:10:12-08:00 Added support for dynamic layouts. When a layout is specified as a symbol on the controller level, we now try to call a method with that name to dynamically determine the layout. We fall back to interpreting the symbol as the name of the layout if no method with that name exists. This is mainly to support rendering a different layout based on request parameters, for example mobile vs. web. See ticket #66. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> d38d91a1a2a15554bb5d816e6783079790baefee Michael D. Ivey ivey@gweezlebur.com