--- trunk/lib/Frey/Run.pm 2008/11/01 13:17:45 229 +++ trunk/lib/Frey/Run.pm 2008/11/05 08:20:50 277 @@ -16,7 +16,7 @@ =cut -sub execute { qw/data markup request/ } +sub execute { qw/data markup/ } has 'class' => ( is => 'rw', @@ -24,29 +24,33 @@ 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 $_ && !defined( $self->params->{$_} ) } map { my $attr = $class->meta->get_attribute($_); $attr->is_required && $_ } $class->meta->get_attribute_list; - warn "## required = ",dump( @required ); - warn "## params = ",dump( %params ); + warn "## required = ",dump( @required ); my $html; - my $values = $self->config($class); - $values = {} if $@; + my $values = {}; + my $values = $self->config($class) if $self->can('config'); if ( @required ) { $html = qq|
$@
};
+ }
warn ">>> markup $class ",length( $html ), " bytes\n";
} elsif ( $o->can('data') ) {
$html = '' . $self->html_escape( dump( $o->data ) ) . '
';
@@ -74,7 +79,7 @@
}
}
- $req->print( $self->page( title => $class, body => $html ) );
+ return $self->page( title => $class, body => $html );
}
1;