--- branches/mojo/lib/Frey/Mojo/Run.pm	2008/11/02 18:27:19	242
+++ branches/mojo/lib/Frey/Mojo/Run.pm	2008/11/02 21:24:04	243
@@ -10,8 +10,9 @@
 
 use Frey::ClassLoader;
 
-warn "# ",dump( Frey::ClassLoader->new->load_all_classes() );
+warn "# load_all_classes ",dump( Frey::ClassLoader->new->load_all_classes() );
 
+use Frey::Run;
 
 sub markup {
     my ($self, $c) = @_;
@@ -24,59 +25,9 @@
 	my $class = $c->match->captures->{class} || 'Frey::ClassBrowser';
 	$class =~ s{[/-]}{::}g;
 
-	my @required = 
-		grep {
-			defined $_ && !defined( $params->{$_} )
-		}
-		map {
-			my $attr = $class->meta->get_attribute($_);
-			$attr->is_required && $_
-		} $class->meta->get_attribute_list;
-
-	warn "## required = ",dump( @required );
-
-	my $html;
-
-	my $values = {};
-	$values = $class->config($class) if $class->can('config');
-
-	if ( @required ) {
-		$html = qq|<h1>Required params for $class</h1><form method="get">|;
-		foreach my $name ( @required ) {
-			my $type = $name =~ m/^pass/ ? 'password' : 'text';
-			my $value = $values ? $values->{$name} : '';
-			$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 );
-		$o->depends if $o->can('depends');
-
-		if ( $o->can('markup') ) {
-			$html = eval { $o->markup };
-			if ( $@ ) {
-				warn $@;
-				$html .= qq{<code>$@</code>};
-			}
-		} else {
-			warn "SKIP: $class can't markup";
-		}
-
-	}
-
-	eval {
-		# FIXME am I paranoid?
-		package Mock::Web;
-		use Moose;
-		extends 'Frey';
-		with 'Frey::Web';
-
-		$html = Mock::Web->new->page(
-			title => $class,
-			body => $html,
-		);
-	};
+	warn "# c ",dump( $c );
+
+	my $html = Frey::Run->new( class => $class )->html;
 
     # Response objec
     my $res = $c->res;
@@ -85,4 +36,9 @@
 	$res->body( $html );
 }
 
+sub data {
+	my ($self, $c) = @_;
+	$self->markup( $c );
+}
+
 1;