--- branches/mojo/lib/Frey/Run.pm	2008/11/02 18:27:19	242
+++ branches/mojo/lib/Frey/Run.pm	2008/11/02 21:24:04	243
@@ -16,7 +16,7 @@
 
 =cut
 
-sub execute { qw/data markup request/ }
+sub execute { qw/data markup/ }
 
 has 'class' => (
 	is => 'rw',
@@ -24,29 +24,33 @@
 	required => 1,
 );
 
+has 'params' => (
+	is => 'rw',
+	isa => 'HashRef',
+	default => sub { {} },
+);
+
 use Data::Dump qw/dump/;
 
-sub request {
-	my ( $self, $req ) = @_;
+sub html {
+	my ( $self ) = @_;
 
-	my %params = $req->params;
 	my $class = $self->class;
 
 	my @required = 
 		grep {
-			defined $_ && !defined( $params{$_} )
+			defined $_ && !defined( $self->params->{$_} )
 		}
 		map {
 			my $attr = $class->meta->get_attribute($_);
 			$attr->is_required && $_
 		} $class->meta->get_attribute_list;
 
-		warn "## required = ",dump( @required );
-		warn "## params = ",dump( %params );
+	warn "## required = ",dump( @required );
 
 	my $html;
-	my $values = $self->config($class);
-	$values = {} if $@;
+	my $values = {};
+	my $values = $self->config($class) if $self->can('config');
 
 	if ( @required ) {
 		$html = qq|<h1>Required params for $class</h1><form method="post">|;
@@ -57,14 +61,15 @@
 		}
 		$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');
-		if ( $o->can('request') ) {
-			warn "## turning over to $o->request";
-			$o->request( $req );
-		} elsif ( $o->can('markup') ) {
+		if ( $o->can('markup') ) {
 			warn "## using ",ref($o), "->markup";
-			$html = $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>';
@@ -74,7 +79,7 @@
 		}
 	}
 
-	$req->print( $self->page( title => $class, body => $html ) );
+	return $self->page( title => $class, body => $html );
 }
 
 1;