--- trunk/lib/Frey/Run.pm	2008/11/16 16:36:53	358
+++ trunk/lib/Frey/Run.pm	2008/11/18 02:16:38	400
@@ -1,9 +1,8 @@
 package Frey::Run;
 use Moose;
 #extends 'Frey::ClassLoader';
-extends 'Frey::PPI';
+extends 'Frey::Action';
 with 'Frey::Web';
-with 'Frey::Config';
 with 'Frey::Escape';
 
 use Data::Dump qw/dump/;
@@ -18,13 +17,16 @@
 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;
 
-enum 'Runnable' => qw/data markup sponge/;
-
-sub runnable { qw/data markup sponge/ }
+sub runnable { qw/data data.js markup sponge/ }
+enum 'Runnable' => runnable;
 
 has 'class' => (
 	is => 'rw',
@@ -47,93 +49,62 @@
 sub html {
 	my ( $self ) = @_;
 
-	my $class = $self->class;
-
-	$self->load_class( $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">|;
-
-		my $a;
-		my @attrs = map {  $a->{$_}++; $_ } $self->attribute_order;
-		push @attrs, $_ foreach grep { ! $a->{$_} } map { $_->name } @required;
-		warn "# attrs = ",dump( @attrs );
-
-		foreach my $name ( @attrs ) {
-			my $attr = $class->meta->get_attribute( $name );
-			my $type = $name =~ m/^pass/ ? 'password' : 'text';
-			my $value = '';
-			my $value_html = '';
-			if ( ref($values) eq 'HASH' ) {
-				$value = $values->{$name};
-			} elsif ( ref($values) eq 'ARRAY' ) {
-				$value_html = qq|<select name="$name">| . join("\n",
-					map {
-						my $v = $_->{$name};
-						qq|<option value="$v">$v</option>|
-					} @$values
-				) . qq|</select>|;
-			} elsif ( $attr->has_type_constraint && $attr->type_constraint->can('values') ) {
-				$value_html = qq|<select name="$name">| . join("\n",
-					map { qq|<option value="$_">$_</option>| } @{ $attr->type_constraint->values }
-				) . qq|</select>|;
-			} elsif ( $attr->has_default ) {
-				$value = $attr->default( $name );
-			}
-			$value_html = qq|<input type="$type" name="$name" value="$value">| unless $value_html;
-
-#warn "# required $name ", $class->meta->get_attribute( $name )->dump( 2 );
-			$html .= qq|<label for="$name">$name</label>| . $value_html;
-		}
-		$html .= qq|<input type="submit" value="Run $class"></form>|;
-	} else {
-		eval {
+	eval {
+		my $class = $self->class;
+		$self->load_class( $class );
+
+		if ( $html = $self->params_form ) {
+			warn "got params form for $class";
+		} else {
 			my $o;
+			# we don't want default status elements
+			$self->params->{status} = [];
 			$o = $class->new( %{ $self->params } );
 			$o->depends if $o->can('depends');
 
 			if ( $self->run eq 'markup' ) {
 				warn "## using ",ref($o), "->markup";
 				$html = $o->markup;
+				# preserve status
+				push @{ $self->status }, { $class => $o->status } if $o->can('status');
+
 				warn ">>> markup $class ",length( $html ), " bytes\n";
 			} elsif ( $self->run eq 'sponge' ) {
 				my $data = $o->sponge;
 				confess "invalid data from sponge = ", dump( $data ) unless ref($data) eq 'HASH';
-				$html .= "<strong>" . $#{ $data->{rows} } . "</strong> rows from <code>$class->new" . dump( $self->params ) . "->sponge</code>";
+				my $rows = $#{ $data->{rows} } + 1;
+				$rows ||= 'no';
+				$html .= "<strong>$rows</strong> rows from <code>$class->new" . dump( $self->params ) . "->sponge</code>";
 				$html .= '<table>';
 				$html .= '<tr><th>' . join('</th><th>', @{$data->{NAME}} ) . '</th></tr>';
 				$html .= '<tr><td>' . join('</td><td>', @$_ ) . '</td></tr>' foreach @{ $data->{rows} };
 				$html .= '</table>';
-			} elsif ( $self->run eq 'data' ) {
+			} elsif ( $self->run =~ m{^data(\.(js|json|yaml|yml))?$} ) {
 				my $data = $o->data;
-				$html .= Frey::Dumper->new( data => $data )->markup;
-				$html .= '<hr/><code>' . $self->html_dump( $data ) . '</code>';
+				if ( my $format = $1 ) {
+					$html .= to_json( $data ) if $format =~ m{js(on)?};
+					$html .= Dump( $data )    if $format =~ m{yaml?};
+				}
+				if ( ! $html ) {
+					$html .= Frey::Dumper->new( data => $data )->markup;
+					push @{ $self->status }, { 'Dump' => $data };
+				}
 			} else {
 				$html = $self->error( "IGNORE: $class ", $o->dump );
 			}
 		};
 
-		$html .= $self->error( $@ ) if $@;
-	}
+		if ( ref($html) eq 'HASH' ) {
+			$html = $self->page( %$html );
+		} else {
+			$html = $self->page( title => $self->class, body => $html );
+		};
+	};
+
+	$html = $self->error( $@ ) if $@;
 
-	return $self->page( %$html ) if ref($html) eq 'HASH';
-	return $self->page( title => $class, body => $html );
+	return $html;
 }
 
 1;