@@ -98,6 +98,7 @@ module Innate action = dup action.view, action.method = layout_view_or_method(*layout) + action.options[:is_layout] = true action.params = [] action.layout = nil action.view_value = nil lib/innate/action.rb @@ -79,6 +79,7 @@ module Innate # @see Action#render # @author manveru def wrap_action_call(action, &block) + return yield if action.options[:is_layout] wrap = SortedSet.new action.node.ancestral_trait_values(:wrap).each{|sset| wrap.merge(sset) } head, *tail = wrap.map{|k,v| v } lib/innate/helper/aspect.rb @@ -28,8 +28,10 @@ class AspectAllSpec end class AspectDerivedWithLayout < AspectAllSpec + map '/derived' + provide(:html, :None) layout :page - Innate.node('/derived', self).provide(:html, :None) + def page "Content: #{@content}" end @@ -66,9 +68,11 @@ describe Innate::Helper::Aspect do it 'calls before_all and after_all' do $aspect_spec_before_all = $aspect_spec_after_all = 0 + get('/all/before_first').body.should == '42' $aspect_spec_before_all.should == 42 $aspect_spec_after_all.should == 40 + get('/all/before_second').body.should == '84' $aspect_spec_before_all.should == 84 $aspect_spec_after_all.should == 80 @@ -83,12 +87,13 @@ describe Innate::Helper::Aspect do it 'calls before_all and after_all in the superclass' do $aspect_spec_before_all = $aspect_spec_after_all = 0 + get('/derived/before_first').body.should == 'Content: 42' $aspect_spec_before_all.should == 42 $aspect_spec_after_all.should == 40 + get('/derived/before_second').body.should == 'Content: 84' $aspect_spec_before_all.should == 84 $aspect_spec_after_all.should == 80 end - end spec/innate/helper/aspect.rb b69e9dd6882e1781169b40a120b4a85ca4259eaf Michael Fellinger m.fellinger@gmail.com http://github.com/jeremyz/innate/commit/79df3a5839dac1fe15f043685d76c7f4b0cba522 79df3a5839dac1fe15f043685d76c7f4b0cba522 2009-08-27T08:21:05-07:00 2009-08-27T08:21:05-07:00 Don't call aspects in layout b9fa688cc209b62f6646eba1d99ee6e662e66d53 Michael Fellinger m.fellinger@gmail.com