--- trunk/lib/Frey/Run.pm 2008/11/19 15:35:34 456 +++ trunk/lib/Frey/Run.pm 2008/11/24 21:32:32 499 @@ -7,7 +7,7 @@ with 'Frey::Session'; use Data::Dump qw/dump/; -use Frey::Dumper; +use Frey::View::Dumper; use JSON; use YAML; @@ -78,12 +78,12 @@ if ( $is_role ) { $o = $instance; } else { - $o = $class->new( %{ $self->params } ); + $o = $self->new_frey_class( $class, $self->params ); } $o->depends if $o->can('depends'); - push @{ $self->status }, { qq|$class| => $self->params }; + push @{ $self->status }, { $self->editor( $class ) => $self->params }; if ( $self->run eq 'as_markup' ) { warn "## using ",ref($o), "->as_markup"; @@ -91,7 +91,6 @@ $html = $o->page; } $body = $o->as_markup unless $html; - warn ">>> markup $class ",length( $html || $body ), " ", $html ? 'html' : 'body', " bytes"; } elsif ( $self->run eq 'as_sponge' ) { $data = $o->as_sponge; @@ -117,7 +116,8 @@ push @{ $self->status }, { 'data' => $data }; } if ( ! $html ) { - $body .= Frey::Dumper->new( data => $data )->as_markup; + $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