--- trunk/lib/Frey/Run.pm	2008/11/19 03:11:41	447
+++ trunk/lib/Frey/Run.pm	2008/12/16 21:00:27	862
@@ -1,13 +1,11 @@
 package Frey::Run;
 use Moose;
-#extends 'Frey::ClassLoader';
+#extends 'Frey::Class::Loader';
 extends 'Frey::Action';
-with 'Frey::Web';
-with 'Frey::Escape';
 with 'Frey::Session';
 
 use Data::Dump qw/dump/;
-use Frey::Dumper;
+use Frey::View::Dumper;
 use JSON;
 use YAML;
 
@@ -28,8 +26,9 @@
 
 use Moose::Util::TypeConstraints;
 
-sub runnable { qw/data data.js markup sponge/ }
-enum 'Runnable' => runnable;
+subtype 'Runnable'
+	=> as 'Str',
+	=> where sub { m{^as_} || m{_as_} };
 
 sub formats_available { qw/html js json yaml yml/ }
 enum 'Formats' => formats_available;
@@ -49,7 +48,7 @@
 has 'run' => (
 	is => 'rw',
 	isa => 'Runnable',
-	default => 'markup',
+	default => 'as_markup',
 );
 
 has 'format' => (
@@ -58,6 +57,17 @@
 	default => 'html',
 );
 
+has 'request_url' => (
+	documentation => 'Take url from params if not specified',
+	is => 'rw',
+	isa => 'Uri', coerce => 1,
+	lazy => 1,
+	default => sub {
+		my $self = shift;
+		$self->params->{request_url};
+	},
+);
+
 sub html {
 	my ( $self ) = @_;
 
@@ -66,46 +76,51 @@
 		my $class = $self->class;
 		$self->load_class( $class );
 
-		if ( $body = $self->params_form ) {
+		if ( my $form = $self->params_form ) {
+			$html = $self->page( body => $form );
 			warn "got required params form for $class ", $self->run, " format: ", $self->format;
 		} else {
 
 			$self->usage->{ $class }++;
 
+=begin remove
+
 			my $o;
 			my ( $meta, $is_role, $instance ) = $self->class_meta( $class );
 			if ( $is_role ) {
 				$o = $instance;
+				if ( $o->can('add_status') ) {
+					$self->TODO("missing add_status in $o");
+					Frey::Web->meta->apply( $o );
+					warn "# apply Frey::Web to $class instance $o";
+				}
 			} else {
-				$o = $class->new( %{ $self->params } );
+				$o = $self->new_frey_class( $class, $self->params );
 			}
+=cut
 
+			my $o = $self->new_frey_class( $class, $self->params );
 			$o->depends if $o->can('depends');
 
-			push @{ $self->status }, { qq|<a target="editor" href="/editor+$class+1">$class</a>| => $self->params };
-
-			if ( $self->run eq 'markup' ) {
-				warn "## using ",ref($o), "->markup";
-				if ( $o->can('page') ) {
-					$html = $o->page;
-				}
-				$body = $o->markup unless $html;
-
-				warn ">>> markup $class ",length( $html || $body ), " ", $html ? 'html' : 'body', " bytes";
-			} elsif ( $self->run eq 'sponge' ) {
-				$data = $o->sponge;
+			if ( $self->run =~ m{as_markup} ) {
+				$html = $o->page( run => $self->run );
+			} elsif ( $self->run =~ m{(.*as_sponge)} ) {
+				$data = $o->$1;
 				confess "invalid data from sponge = ", dump( $data ) unless ref($data) eq 'HASH';
 				if ( $self->format eq 'html' ) {
 					my $rows = $#{ $data->{rows} } + 1;
 					$rows ||= 'no';
-					$body .= "<strong>$rows</strong> rows from <code>$class->new" . dump( $self->params ) . "->sponge</code>";
+					$body .= "<strong>$rows</strong> rows from <code>$class->new" . dump( $self->params ) . "->as_sponge</code>";
 					$body .= '<table>';
 					$body .= '<tr><th>' . join('</th><th>', @{$data->{NAME}} ) . '</th></tr>';
 					$body .= '<tr><td>' . join('</td><td>', @$_ ) . '</td></tr>' foreach @{ $data->{rows} };
 					$body .= '</table>';
 				}
-			} elsif ( $self->run eq 'data' ) {
-				$data = $o->data;
+			} elsif ( $self->run =~ m{as_data} ) {
+				my $run = $self->run;
+				$data = $o->$run;
+				confess "no data for $class->$run" unless defined $data;
+				$self->add_status( { $self->run => $data } );
 			} else {
 				$body = $self->error( "IGNORE: $class ", $o->dump );
 			}
@@ -113,28 +128,33 @@
 			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 };
 			}
 			if ( ! $html ) {
-				$body .= Frey::Dumper->new( data => $data )->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 $@;
-		};
+			$o->title( $class );
 
+			$html = $o->page( body => $body ) if $body && !$html;
+			$self->content_type( $o->content_type );
 
-		if ( ref($body) eq 'HASH' ) {
-			$html = $self->page( %$body );
-		} elsif ( $body && ! $html ) {
-			$html = $self->page( title => $self->class . ' run', body => $body );
+			confess "no html output for $class ", $o->dump unless defined $html;
 		};
+
 	};
 
-	$html = $self->page( title => $self->class, body => $self->error( $@ ) ) if $@;
+	$self->status_parts;
+
+	if ( $@ ) {
+		my $error = $@;
+		my $o = Frey->new;
+		$o->{request_url} = $self->request_url; # sigh, this is dynamic languge, right?
+		Frey::Web->meta->apply( $o );
+		$html = $o->page( body => $self->error( $error, undef ) );
+	}
+
+	warn $self->class, " produced ", length($html), " bytes of ", $self->content_type;
 
 	return $html;
 }