--- trunk/lib/Frey/Run.pm	2008/11/28 13:16:47	581
+++ trunk/lib/Frey/Run.pm	2008/12/14 14:13:35	835
@@ -1,6 +1,6 @@
 package Frey::Run;
 use Moose;
-#extends 'Frey::ClassLoader';
+#extends 'Frey::Class::Loader';
 extends 'Frey::Action';
 with 'Frey::Session';
 
@@ -57,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 ) = @_;
 
@@ -65,27 +76,34 @@
 		my $class = $self->class;
 		$self->load_class( $class );
 
-		if ( $self->params_form ) {
-			$html = $self->page;
+		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 = $self->new_frey_class( $class, $self->params );
 			}
+=cut
 
+			my $o = $self->new_frey_class( $class, $self->params );
 			$o->depends if $o->can('depends');
 
-			$o->add_status( { $self->editor( $class ) => $self->params } );
-
 			if ( $self->run =~ m{as_markup} ) {
-				$html = $o->page;
+				$html = $o->page( run => $self->run );
 			} elsif ( $self->run =~ m{as_sponge} ) {
 				$data = $o->as_sponge;
 				confess "invalid data from sponge = ", dump( $data ) unless ref($data) eq 'HASH';
@@ -99,7 +117,10 @@
 					$body .= '</table>';
 				}
 			} elsif ( $self->run =~ m{as_data} ) {
-				$data = $o->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 );
 			}
@@ -107,25 +128,33 @@
 			if ( defined $data ) {
 				$html .= to_json( $data ) if $self->format =~ m{js(on)?};
 				$html .= Dump( $data )    if $self->format =~ m{ya?ml};
-				$self->add_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;
 			}
 
-			$self->title( $class );
+			$o->title( $class );
 
 			$html = $o->page( body => $body ) if $body && !$html;
+			$self->content_type( $o->content_type );
+
+			confess "no html output for $class ", $o->dump unless defined $html;
 		};
 
 	};
 
 	$self->status_parts;
 
-	$html = $self->error( $@ ) if $@;
+	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";
+	warn $self->class, " produced ", length($html), " bytes of ", $self->content_type;
 
 	return $html;
 }