--- trunk/lib/Frey/Run.pm	2008/08/31 18:02:50	180
+++ trunk/lib/Frey/Run.pm	2008/11/24 21:32:32	499
@@ -1,54 +1,143 @@
 package Frey::Run;
 use Moose;
-extends 'Frey';
+#extends 'Frey::ClassLoader';
+extends 'Frey::Action';
 with 'Frey::Web';
+with 'Frey::Escape';
+with 'Frey::Session';
+
+use Data::Dump qw/dump/;
+use Frey::View::Dumper;
+use JSON;
+use YAML;
 
 =head1 NAME
 
 Frey::Run - display required form field for Class and run it
 
+=head1 DESCRIPTION
+
+This object will try to run other Moose objects from your application. It
+will try to invoke C<data>, and C<markup> method on the.
+
+=head1 SEE ALSO
+
+L<Frey::Action> which creates form for params
+
 =cut
 
+use Moose::Util::TypeConstraints;
+
+subtype 'Runnable'
+	=> as 'Str',
+	=> where sub { m{^as_} };
+
+sub formats_available { qw/html js json yaml yml/ }
+enum 'Formats' => formats_available;
+
 has 'class' => (
 	is => 'rw',
 	isa => 'Str',
 	required => 1,
 );
 
-use Data::Dump qw/dump/;
+has 'params' => (
+	is => 'rw',
+	isa => 'HashRef',
+	default => sub { {} },
+);
+
+has 'run' => (
+	is => 'rw',
+	isa => 'Runnable',
+	default => 'as_markup',
+);
+
+has 'format' => (
+	is => 'rw',
+	isa => 'Formats',
+	default => 'html',
+);
 
 sub html {
-	my ( $self, $req ) = @_;
+	my ( $self ) = @_;
 
-	my %params = $req->params;
-	my $class = $self->class;
+	my ($html,$body,$data);
+	eval {
+		my $class = $self->class;
+		$self->load_class( $class );
+
+		if ( $body = $self->params_form ) {
+			warn "got required params form for $class ", $self->run, " format: ", $self->format;
+		} else {
+
+			$self->usage->{ $class }++;
+
+			my $o;
+			my ( $meta, $is_role, $instance ) = $self->class_meta( $class );
+			if ( $is_role ) {
+				$o = $instance;
+			} else {
+				$o = $self->new_frey_class( $class, $self->params );
+			}
+
+			$o->depends if $o->can('depends');
+
+			push @{ $self->status }, { $self->editor( $class ) => $self->params };
+
+			if ( $self->run eq 'as_markup' ) {
+				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";
+			} elsif ( $self->run eq 'as_sponge' ) {
+				$data = $o->as_sponge;
+				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 ) . "->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 'as_data' ) {
+				$data = $o->as_data;
+			} else {
+				$body = $self->error( "IGNORE: $class ", $o->dump );
+			}
+
+			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::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 $@;
+		};
+
+
+		if ( ref($body) eq 'HASH' ) {
+			$html = $self->page( %$body );
+		} elsif ( $body && ! $html ) {
+			$html = $self->page( title => $self->class . ' run', body => $body );
+		};
+	};
 
-	my @required = 
-		grep {
-			defined $_ && !defined( $params{$_} )
-		}
-		map {
-			my $attr = $class->meta->get_attribute($_);
-			$attr->is_required && $_
-		} $class->meta->get_attribute_list;
-
-		warn "## required = ",dump( @required );
-		warn "## params = ",dump( %params );
-
-	my $html;
-
-	if ( @required ) {
-		$html = qq|<h1>Required params for $class</h1><form method="post">|;
-		$html .= qq|<label for="$_">$_</label><input type="text" name="$_">| foreach @required;
-		$html .= qq|<input type="submit" value="Run $class"></form>|;
-	} else {
-		my $o = $class->new( %params );
-		$o->depends if $o->can('depends');
-		$html = $o->markup;
-	}
+	$html = $self->page( title => $self->class, body => $self->error( $@ ) ) if $@;
 
-	warn ">>> markup $class ",length( $html ), " bytes\n";
-	$req->print( $self->page( title => $class, body => $html ) );
+	return $html;
 }
 
 1;