--- trunk/lib/Frey/Run.pm	2008/11/28 19:19:25	601
+++ trunk/lib/Frey/Run.pm	2008/12/24 21:42:00	893
@@ -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,6 +60,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 ) = @_;
 
@@ -93,8 +107,8 @@
 
 			if ( $self->run =~ m{as_markup} ) {
 				$html = $o->page( run => $self->run );
-			} elsif ( $self->run =~ m{as_sponge} ) {
-				$data = $o->as_sponge;
+			} 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;
@@ -105,7 +119,7 @@
 					$body .= '<tr><td>' . join('</td><td>', @$_ ) . '</td></tr>' foreach @{ $data->{rows} };
 					$body .= '</table>';
 				}
-			} elsif ( $self->run =~ m{as_data} ) {
+			} elsif ( $self->run =~ m{(as_data|sql)} ) {
 				my $run = $self->run;
 				$data = $o->$run;
 				confess "no data for $class->$run" unless defined $data;
@@ -120,13 +134,14 @@
 			}
 			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;
 			}
 
 			$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;
 		};
 
@@ -137,11 +152,12 @@
 	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 ) );
+		$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;
 }