--- trunk/lib/Frey/Run.pm	2008/11/15 23:52:22	348
+++ trunk/lib/Frey/Run.pm	2008/11/16 19:57:00	365
@@ -20,6 +20,10 @@
 
 =cut
 
+use Moose::Util::TypeConstraints;
+
+enum 'Runnable' => qw/data markup sponge/;
+
 sub runnable { qw/data markup sponge/ }
 
 has 'class' => (
@@ -34,6 +38,12 @@
 	default => sub { {} },
 );
 
+has 'run' => (
+	is => 'rw',
+	isa => 'Runnable',
+	default => 'markup',
+);
+
 sub html {
 	my ( $self ) = @_;
 
@@ -61,12 +71,11 @@
 		$html = qq|<h1>$class params</h1><form method="post">|;
 
 		my $a;
-		my @attrs = map {  $a->{$_}++; $_ } $self->attribute_order;
+		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 );
+		foreach my $name ( grep { ! $class->meta->get_attribute($_)->is_lazy } @attrs ) {
 			my $type = $name =~ m/^pass/ ? 'password' : 'text';
 			my $value = '';
 			my $value_html = '';
@@ -79,8 +88,16 @@
 						qq|<option value="$v">$v</option>|
 					} @$values
 				) . qq|</select>|;
+			} elsif ( my $attr = $class->meta->get_attribute( $name ) ) {
+				if ( $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 );
+				}
 			} else {
-				$value = $attr->default( $name ) if $attr->has_default;
+				warn "wired attribute $name";
 			}
 			$value_html = qq|<input type="$type" name="$name" value="$value">| unless $value_html;
 
@@ -89,32 +106,38 @@
 		}
 		$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>};
+		eval {
+			my $o;
+			$o = $class->new( %{ $self->params } );
+			$o->depends if $o->can('depends');
+
+			if ( $self->run eq 'markup' ) {
+				warn "## using ",ref($o), "->markup";
+				$html = $o->markup;
+				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';
+				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' ) {
+				my $data = $o->data;
+				$html .= Frey::Dumper->new( data => $data )->markup;
+				$html .= '<hr/><span class="frey-popdown">dump<span><code>' . $self->html_dump( $data ) . '</code></span></span>';
+			} else {
+				$html = $self->error( "IGNORE: $class ", $o->dump );
 			}
-			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;
-			$html .= '<hr/><code>' . $self->html_dump( $data ) . '</code>';
-		} else {
-			$html = "IGNORE: $class ", $o->dump;
-			warn $html;
-		}
+		};
+
+		$html .= $self->error( $@ ) if $@;
 	}
 
+	return $self->page( %$html ) if ref($html) eq 'HASH';
 	return $self->page( title => $class, body => $html );
 }