--- trunk/lib/Frey/Run.pm	2008/08/31 18:02:50	180
+++ trunk/lib/Frey/Run.pm	2008/11/06 18:03:06	324
@@ -1,54 +1,93 @@
 package Frey::Run;
 use Moose;
-extends 'Frey';
+extends 'Frey::ClassLoader';
 with 'Frey::Web';
+with 'Frey::Config';
+with 'Frey::Escape';
 
 =head1 NAME
 
 Frey::Run - display required form field for Class and run it
 
+=head1 DESCRIPTION
+
+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.
+
 =cut
 
+sub runnable { qw/data markup/ }
+
 has 'class' => (
 	is => 'rw',
 	isa => 'Str',
 	required => 1,
 );
 
+has 'params' => (
+	is => 'rw',
+	isa => 'HashRef',
+	default => sub { {} },
+);
+
 use Data::Dump qw/dump/;
 
 sub html {
-	my ( $self, $req ) = @_;
+	my ( $self ) = @_;
 
-	my %params = $req->params;
 	my $class = $self->class;
 
+	$self->load_class( $class );
+
 	my @required = 
 		grep {
-			defined $_ && !defined( $params{$_} )
+			defined $_ && $_->can('name') && !defined( $self->params->{ $_->name } )
 		}
 		map {
 			my $attr = $class->meta->get_attribute($_);
-			$attr->is_required && $_
+			$attr->is_required && $attr;
 		} $class->meta->get_attribute_list;
 
-		warn "## required = ",dump( @required );
-		warn "## params = ",dump( %params );
+	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>Required params for $class</h1><form method="post">|;
-		$html .= qq|<label for="$_">$_</label><input type="text" name="$_">| foreach @required;
+		foreach my $attr ( @required ) {
+			my $name = $attr->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( %params );
+		my $o = $class->new( %{ $self->params } );
 		$o->depends if $o->can('depends');
-		$html = $o->markup;
+		if ( $o->can('markup') ) {
+			warn "## using ",ref($o), "->markup";
+			$html = eval { $o->markup };
+			if ( $@ ) {
+				warn $@;
+				$html .= qq{<code>$@</code>};
+			}
+			warn ">>> markup $class ",length( $html ), " bytes\n";
+		} elsif ( $o->can('data') ) {
+			$html = '<code>' . $self->html_escape( dump( $o->data ) ) . '</code>';
+		} else {
+			$html = "IGNORE: $class ", $o->dump;
+			warn $html;
+		}
 	}
 
-	warn ">>> markup $class ",length( $html ), " bytes\n";
-	$req->print( $self->page( title => $class, body => $html ) );
+	return $self->page( title => $class, body => $html );
 }
 
 1;