--- trunk/lib/Frey/Run.pm 2008/11/06 20:56:44 327 +++ trunk/lib/Frey/Run.pm 2008/11/08 23:34:43 339 @@ -1,6 +1,7 @@ package Frey::Run; use Moose; -extends 'Frey::ClassLoader'; +#extends 'Frey::ClassLoader'; +extends 'Frey::PPI'; with 'Frey::Web'; with 'Frey::Config'; with 'Frey::Escape'; @@ -19,7 +20,7 @@ =cut -sub runnable { qw/data markup/ } +sub runnable { qw/data markup sponge/ } has 'class' => ( is => 'rw', @@ -57,9 +58,15 @@ warn "# $class config = ",dump( $values ); if ( @required ) { - $html = qq|

Required params for $class

|; - foreach my $attr ( @required ) { - my $name = $attr->name; + $html = qq|

$class params

|; + + 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,6 +87,12 @@ $html .= qq{$@}; } warn ">>> markup $class ",length( $html ), " bytes\n"; + } elsif ( $o->can('sponge') ) { + my $data = $o->sponge; + $html .= ''; + $html .= ''; + $html .= '' foreach @{ $data->{rows} }; + $html .= '
' . join('', @{$data->{NAME}} ) . '
' . join('', @$_ ) . '
'; } elsif ( $o->can('data') ) { my $data = $o->data; $html .= Frey::Dumper->new( data => $data )->markup;