--- trunk/lib/Frey/Run.pm	2008/11/28 16:44:16	592
+++ trunk/lib/Frey/Run.pm	2009/01/10 23:28:43	989
@@ -1,14 +1,16 @@
 package Frey::Run;
 use Moose;
-#extends 'Frey::ClassLoader';
+#extends 'Frey::Class::Loader';
 extends 'Frey::Action';
 with 'Frey::Session';
 
 use Data::Dump qw/dump/;
-use Frey::View::Dumper;
 use JSON;
 use YAML;
 
+use lib 'lib';
+use Frey::View::Dumper;
+
 =head1 NAME
 
 Frey::Run - display required form field for Class and run it
@@ -25,10 +27,11 @@
 =cut
 
 use Moose::Util::TypeConstraints;
+use Frey::Class::Loader; # class_runnable_re
 
 subtype 'Runnable'
 	=> as 'Str',
-	=> where sub { m{^as_} || m{_as_} };
+	=> where sub { Frey::Class::Loader::class_runnable_re };
 
 sub formats_available { qw/html js json yaml yml/ }
 enum 'Formats' => formats_available;
@@ -57,16 +60,31 @@
 	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 ) = @_;
 
 	my ($html,$body,$data);
+
+	my $current_status;
+	$current_status->{$_}++ foreach $self->status;
+
 	eval {
 		my $class = $self->class;
 		$self->load_class( $class );
 
 		if ( my $form = $self->params_form ) {
-			$html = $self->page( body => $form );
+			$html = $self->html_page( body => $form );
 			warn "got required params form for $class ", $self->run, " format: ", $self->format;
 		} else {
 
@@ -92,9 +110,9 @@
 			$o->depends if $o->can('depends');
 
 			if ( $self->run =~ m{as_markup} ) {
-				$html = $o->page( run => $self->run );
-			} elsif ( $self->run =~ m{as_sponge} ) {
-				$data = $o->as_sponge;
+				$html = $o->html_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;
@@ -104,12 +122,20 @@
 					$body .= '<tr><th>' . join('</th><th>', @{$data->{NAME}} ) . '</th></tr>';
 					$body .= '<tr><td>' . join('</td><td>', @$_ ) . '</td></tr>' foreach @{ $data->{rows} };
 					$body .= '</table>';
+
+					$self->add_css(qq|
+						tr:nth-child(even) {
+							background-color: #eee;
+						}
+					|);
+
+					delete( $data->{rows} ); # too much dumplication
+					$body .= Frey::View::Dumper->new( data => $data )->as_markup if $data;
 				}
-			} elsif ( $self->run =~ m{as_data} ) {
-				$data = $o->{$self->run}();
-				warn "no data from ", $self->run;
-				$data ||= $o->as_data();
-				confess "no data for $class->" . $self->run . " from " . $self->html_dump( $data ) unless $data;
+			} elsif ( $self->run =~ m{(as_data|sql)} ) {
+				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 );
@@ -121,14 +147,24 @@
 			}
 			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;
+				$body .= Frey::View::Dumper->new( data => $data )->as_markup if defined $data && ! defined $body;
 			}
 
-			$self->title( $class );
+			$o->title( $class );
+
+			$html = $o->html_page( body => $body ) if $body && !$html;
+			$self->content_type( $o->content_type );
 
-			$html = $o->page( body => $body ) if $body && !$html;
-	
 			confess "no html output for $class ", $o->dump unless defined $html;
+
+			if ( $o->can('status') ) {
+				foreach ( $o->status ) {
+					next if $current_status->{$_}++;
+					$self->add_status( $_ );
+					warn "# run add_status: ", $self->dump( $_ );
+				}
+			}
+
 		};
 
 	};
@@ -136,12 +172,14 @@
 	$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( $@ ) );
+		$html = $o->html_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;
 }