--- trunk/lib/Frey/Run.pm	2008/11/06 20:56:44	327
+++ trunk/lib/Frey/Run.pm	2008/11/16 00:37:34	350
@@ -1,6 +1,7 @@
 package Frey::Run;
 use Moose;
-extends 'Frey::ClassLoader';
+#extends 'Frey::ClassLoader';
+extends 'Frey::PPI';
 with 'Frey::Web';
 with 'Frey::Config';
 with 'Frey::Escape';
@@ -19,7 +20,11 @@
 
 =cut
 
-sub runnable { qw/data markup/ }
+use Moose::Util::TypeConstraints;
+
+enum 'Runnable' => qw/data markup sponge/;
+
+sub runnable { qw/data markup sponge/ }
 
 has 'class' => (
 	is => 'rw',
@@ -33,6 +38,11 @@
 	default => sub { {} },
 );
 
+has 'run' => (
+	is => 'rw',
+	isa => 'Runnable',
+);
+
 sub html {
 	my ( $self ) = @_;
 
@@ -57,16 +67,38 @@
 	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>|;
+			} 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><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 {
@@ -75,11 +107,14 @@
 		if ( $o->can('markup') ) {
 			warn "## using ",ref($o), "->markup";
 			$html = eval { $o->markup };
-			if ( $@ ) {
-				warn $@;
-				$html .= qq{<code>$@</code>};
-			}
+			$html .= $self->error( $@ ) if $@;
 			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') ) {
 			my $data = $o->data;
 			$html .= Frey::Dumper->new( data => $data )->markup;