--- trunk/lib/Frey/Run.pm 2008/11/01 00:59:02 225 +++ trunk/lib/Frey/Run.pm 2008/11/05 20:18:33 314 @@ -12,11 +12,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 request/ } +sub runnable { qw/data markup/ } has 'class' => ( is => 'rw', @@ -24,45 +24,57 @@ 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 $_ && $_->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 ); - warn "## params = ",dump( %params ); + warn "## required = ",dump( map { $_->name } @required ), " for $class"; my $html; + my $values = {}; + $values = $self->config($class) if $self->can('config'); 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 = $self->config($class)->{$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|
|; } 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') ) { - warn "## using $o->markup"; - $html = $o->markup; + if ( $o->can('markup') ) { + warn "## using ",ref($o), "->markup"; + $html = eval { $o->markup }; + if ( $@ ) { + warn $@; + $html .= qq{$@}; + } warn ">>> markup $class ",length( $html ), " bytes\n"; } elsif ( $o->can('data') ) { $html = '' . $self->html_escape( dump( $o->data ) ) . ''; @@ -72,7 +84,7 @@ } } - $req->print( $self->page( title => $class, body => $html ) ); + return $self->page( title => $class, body => $html ); } 1;