--- trunk/lib/Frey/Run.pm 2008/11/01 00:14:05 223 +++ trunk/lib/Frey/Run.pm 2008/11/05 08:20:57 285 @@ -3,6 +3,7 @@ extends 'Frey'; with 'Frey::Web'; with 'Frey::Config'; +with 'Frey::Escape'; =head1 NAME @@ -15,7 +16,7 @@ =cut -sub execute { qw/data markup request/ } +sub execute { qw/data markup/ } has 'class' => ( is => 'rw', @@ -23,55 +24,67 @@ 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 = {}; + 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 = '' . dump( $o->data ) . '
';
+ $html = '' . $self->html_escape( dump( $o->data ) ) . '
';
} else {
$html = "IGNORE: $class ", $o->dump;
warn $html;
}
}
- $req->print( $self->page( title => $class, body => $html ) );
+ return $self->page( title => $class, body => $html );
}
1;