--- trunk/lib/Frey/Run.pm	2008/11/08 16:12:39	331
+++ trunk/lib/Frey/Run.pm	2008/11/28 16:39:37	591
@@ -1,13 +1,13 @@
 package Frey::Run;
 use Moose;
 #extends 'Frey::ClassLoader';
-extends 'Frey::PPI';
-with 'Frey::Web';
-with 'Frey::Config';
-with 'Frey::Escape';
+extends 'Frey::Action';
+with 'Frey::Session';
 
 use Data::Dump qw/dump/;
-use Frey::Dumper;
+use Frey::View::Dumper;
+use JSON;
+use YAML;
 
 =head1 NAME
 
@@ -18,9 +18,20 @@
 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
 
-sub runnable { qw/data markup/ }
+use Moose::Util::TypeConstraints;
+
+subtype 'Runnable'
+	=> as 'Str',
+	=> where sub { m{^as_} || m{_as_} };
+
+sub formats_available { qw/html js json yaml yml/ }
+enum 'Formats' => formats_available;
 
 has 'class' => (
 	is => 'rw',
@@ -34,64 +45,104 @@
 	default => sub { {} },
 );
 
+has 'run' => (
+	is => 'rw',
+	isa => 'Runnable',
+	default => 'as_markup',
+);
+
+has 'format' => (
+	is => 'rw',
+	isa => 'Formats',
+	default => 'html',
+);
+
 sub html {
 	my ( $self ) = @_;
 
-	my $class = $self->class;
+	my ($html,$body,$data);
+	eval {
+		my $class = $self->class;
+		$self->load_class( $class );
+
+		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->load_class( $class );
+			$self->usage->{ $class }++;
 
-	my @required = 
-		grep {
-			defined $_ && $_->can('name') && !defined( $self->params->{ $_->name } )
-		}
-		map {
-			my $attr = $class->meta->get_attribute($_);
-			$attr->is_required && $attr;
-		} $class->meta->get_attribute_list;
-
-	warn "## required = ",dump( map { $_->name } @required ), " for $class";
-
-	my $html;
-	my $values = {};
-	$values = $self->config($class);
-	warn "# $class config = ",dump( $values );
-
-	if ( @required ) {
-		$html = qq|<h1>$class params</h1><form method="post">|;
-		foreach my $name ( $self->attribute_order ) {
-			my $attr = $class->meta->get_attribute( $name );
-			my $type = $name =~ m/^pass/ ? 'password' : 'text';
-			my $value =
-				$values ? $values->{$name} :
-				$attr->has_default ? $attr->default( $name ) :
-				'';
-#warn "# required $name ", $class->meta->get_attribute( $name )->dump( 2 );
-			$html .= qq|<label for="$name">$name</label><input type="$type" name="$name" value="$value">|;
-		}
-		$html .= qq|<input type="submit" value="Run $class"></form>|;
-	} else {
-		my $o = $class->new( %{ $self->params } );
-		$o->depends if $o->can('depends');
-		if ( $o->can('markup') ) {
-			warn "## using ",ref($o), "->markup";
-			$html = eval { $o->markup };
-			if ( $@ ) {
-				warn $@;
-				$html .= qq{<code>$@</code>};
+=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 );
 			}
-			warn ">>> markup $class ",length( $html ), " bytes\n";
-		} elsif ( $o->can('data') ) {
-			my $data = $o->data;
-			$html .= Frey::Dumper->new( data => $data )->markup;
-			$html .= '<hr/><code>' . $self->html_dump( $data ) . '</code>';
-		} else {
-			$html = "IGNORE: $class ", $o->dump;
-			warn $html;
-		}
+=cut
+
+			my $o = $self->new_frey_class( $class, $self->params );
+			$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;
+				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 =~ 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;
+				$self->add_status( { $self->run => $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};
+			}
+			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 );
+
+			$html = $o->page( body => $body ) if $body && !$html;
+	
+			confess "no html output for $class ", $o->dump unless defined $html;
+		};
+
+	};
+
+	$self->status_parts;
+
+	if ( $@ ) {
+		my $o = Frey->new;
+		Frey::Web->meta->apply( $o );
+		$html = $o->page( body => $self->error( $@ ) );
 	}
 
-	return $self->page( title => $class, body => $html );
+	warn $self->class, " produced ", length($html), " bytes";
+
+	return $html;
 }
 
 1;