--- trunk/lib/Frey/Run.pm 2008/11/05 08:20:54 281 +++ trunk/lib/Frey/Run.pm 2008/11/06 20:56:44 327 @@ -1,10 +1,13 @@ package Frey::Run; use Moose; -extends 'Frey'; +extends 'Frey::ClassLoader'; 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 @@ -12,11 +15,11 @@ =head1 DESCRIPTION This object will try to run other Moose objects from your application. It -will try to invoke C, C or C method on the. +will try to invoke C, and C method on the. =cut -sub execute { qw/data markup/ } +sub runnable { qw/data markup/ } has 'class' => ( is => 'rw', @@ -30,33 +33,39 @@ default => sub { {} }, ); -use Data::Dump qw/dump/; - sub html { my ( $self ) = @_; my $class = $self->class; + $self->load_class( $class ); + my @required = grep { - defined $_ && !defined( $self->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 ), " for $class"; + warn "## required = ",dump( map { $_->name } @required ), " for $class"; my $html; my $values = {}; - my $values = $self->config($class) if $self->can('config'); + $values = $self->config($class); + warn "# $class config = ",dump( $values ); if ( @required ) { $html = qq|

Required params for $class

|; - foreach my $name ( @required ) { + foreach my $attr ( @required ) { + my $name = $attr->name; my $type = $name =~ m/^pass/ ? 'password' : 'text'; - my $value = $values ? $values->{$name} : ''; + my $value = + $values ? $values->{$name} : + $attr->has_default ? $attr->default( $name ) : + ''; +#warn "# required $name ", $class->meta->get_attribute( $name )->dump( 2 ); $html .= qq||; } $html .= qq|
|; @@ -72,7 +81,9 @@ } warn ">>> markup $class ",length( $html ), " bytes\n"; } elsif ( $o->can('data') ) { - $html = '' . $self->html_escape( dump( $o->data ) ) . ''; + my $data = $o->data; + $html .= Frey::Dumper->new( data => $data )->markup; + $html .= '
' . $self->html_dump( $data ) . ''; } else { $html = "IGNORE: $class ", $o->dump; warn $html;