--- trunk/lib/Frey/Run.pm 2008/11/24 21:32:32 499 +++ trunk/lib/Frey/Run.pm 2008/11/25 00:26:15 507 @@ -83,15 +83,14 @@ $o->depends if $o->can('depends'); - push @{ $self->status }, { $self->editor( $class ) => $self->params }; + my @status; - if ( $self->run eq 'as_markup' ) { + push @status, { $self->editor( $class ) => $self->params } if $o->can('status'); + + if ( $self->run eq 'as_markup' && ! $o->can('page') ) { warn "## using ",ref($o), "->as_markup"; - if ( $o->can('page') ) { - $html = $o->page; - } $body = $o->as_markup unless $html; - warn ">>> markup $class ",length( $html || $body ), " ", $html ? 'html' : 'body', " bytes"; + warn ">>> markup $class ",length( $body ), " ", $html ? 'html' : 'body', " bytes"; } elsif ( $self->run eq 'as_sponge' ) { $data = $o->as_sponge; confess "invalid data from sponge = ", dump( $data ) unless ref($data) eq 'HASH'; @@ -113,23 +112,25 @@ if ( defined $data ) { $html .= to_json( $data ) if $self->format =~ m{js(on)?}; $html .= Dump( $data ) if $self->format =~ m{ya?ml}; - push @{ $self->status }, { 'data' => $data }; + push @status, { 'data' => $data }; } if ( ! $html ) { $body = Frey::View::Dumper->new( data => $body )->as_markup if ref $body; $body .= Frey::View::Dumper->new( data => $data )->as_markup if defined $data; } - # override our status with one from object - eval { - $self->status( $o->status ); - }; - warn "can't override status: $@" if $@; - }; + if ( $self->run eq 'as_markup' && $o->can('page') ) { + $o->add_status($_) foreach @status; + $html = $o->page if $o->can('page') && + warn "got ", length($html), "for page"; + } + $self->add_status($_) foreach @status; + }; if ( ref($body) eq 'HASH' ) { $html = $self->page( %$body ); + warn "WARNING: old calling method which is depriciated"; } elsif ( $body && ! $html ) { $html = $self->page( title => $self->class . ' run', body => $body ); };