--- trunk/lib/Frey/Run.pm	2008/11/19 16:53:13	457
+++ trunk/lib/Frey/Run.pm	2008/11/25 14:58:59	518
@@ -7,7 +7,7 @@
 with 'Frey::Session';
 
 use Data::Dump qw/dump/;
-use Frey::Dumper;
+use Frey::View::Dumper;
 use JSON;
 use YAML;
 
@@ -83,16 +83,14 @@
 
 			$o->depends if $o->can('depends');
 
-			push @{ $self->status }, { qq|<a target="editor" href="/editor+$class+1">$class</a>| => $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';
@@ -114,27 +112,35 @@
 			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::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
-			eval { 
-				$self->status( $o->status );
-			};
-			warn "can't override status: $@" if $@;
-		};
+			warn "## status from $self ",dump(@status);
 
+			if ( $self->run eq 'as_markup' && $o->can('page') ) {
+				$o->add_status($_) foreach @status;
+				$html = $o->page;
+				warn "got ", length($html), "for page";
+			} else {
+				$self->add_status($_) foreach @status;
+			}
+		};
 
 		if ( ref($body) eq 'HASH' ) {
 			$html = $self->page( %$body );
+			warn "WARNING: old calling convention with HASH which is depriciated but produced ", length($html), " bytes";
 		} elsif ( $body && ! $html ) {
 			$html = $self->page( title => $self->class . ' run', body => $body );
+			warn "wrap body of ",length($body), " in page with ", length($html), " bytes";
 		};
 	};
 
+	warn "## status ", dump( map { keys %$_ } @{ $self->status } );
+
 	$html = $self->page( title => $self->class, body => $self->error( $@ ) ) if $@;
 
 	return $html;