--- trunk/lib/Frey/Run.pm	2008/11/06 18:03:06	324
+++ trunk/lib/Frey/Run.pm	2008/11/08 23:03:35	336
@@ -1,10 +1,14 @@
 package Frey::Run;
 use Moose;
-extends 'Frey::ClassLoader';
+#extends 'Frey::ClassLoader';
+extends 'Frey::PPI';
 with 'Frey::Web';
 with 'Frey::Config';
 with 'Frey::Escape';
 
+use Data::Dump qw/dump/;
+use Frey::Dumper;
+
 =head1 NAME
 
 Frey::Run - display required form field for Class and run it
@@ -30,8 +34,6 @@
 	default => sub { {} },
 );
 
-use Data::Dump qw/dump/;
-
 sub html {
 	my ( $self ) = @_;
 
@@ -56,9 +58,15 @@
 	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} :
@@ -80,7 +88,9 @@
 			}
 			warn ">>> markup $class ",length( $html ), " bytes\n";
 		} elsif ( $o->can('data') ) {
-			$html = '<code>' . $self->html_escape( dump( $o->data ) ) . '</code>';
+			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;