--- trunk/lib/Frey/Run.pm	2008/11/06 18:03:06	324
+++ trunk/lib/Frey/Run.pm	2008/11/15 23:52:22	348
@@ -1,10 +1,14 @@
 package Frey::Run;
 use Moose;
-extends 'Frey::ClassLoader';
+#extends 'Frey::ClassLoader';
+extends 'Frey::PPI';
 with 'Frey::Web';
 with 'Frey::Config';
 with 'Frey::Escape';
 
+use Data::Dump qw/dump/;
+use Frey::Dumper;
+
 =head1 NAME
 
 Frey::Run - display required form field for Class and run it
@@ -16,7 +20,7 @@
 
 =cut
 
-sub runnable { qw/data markup/ }
+sub runnable { qw/data markup sponge/ }
 
 has 'class' => (
 	is => 'rw',
@@ -30,8 +34,6 @@
 	default => sub { {} },
 );
 
-use Data::Dump qw/dump/;
-
 sub html {
 	my ( $self ) = @_;
 
@@ -56,16 +58,34 @@
 	warn "# $class config = ",dump( $values );
 
 	if ( @required ) {
-		$html = qq|<h1>Required params for $class</h1><form method="post">|;
-		foreach my $attr ( @required ) {
-			my $name = $attr->name;
+		$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 =
-				$values ? $values->{$name} :
-				$attr->has_default ? $attr->default( $name ) :
-				'';
+			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>|;
+			} else {
+				$value = $attr->default( $name ) if $attr->has_default;
+			}
+			$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><input type="$type" name="$name" value="$value">|;
+			$html .= qq|<label for="$name">$name</label>| . $value_html;
 		}
 		$html .= qq|<input type="submit" value="Run $class"></form>|;
 	} else {
@@ -79,8 +99,16 @@
 				$html .= qq{<code>$@</code>};
 			}
 			warn ">>> markup $class ",length( $html ), " bytes\n";
+		} elsif ( $o->can('sponge') ) {
+			my $data = $o->sponge;
+			$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 ( $o->can('data') ) {
-			$html = '<code>' . $self->html_escape( dump( $o->data ) ) . '</code>';
+			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;