--- trunk/lib/Frey/Run.pm 2008/11/16 00:37:34 350
+++ trunk/lib/Frey/Run.pm 2008/11/16 13:01:56 351
@@ -41,6 +41,7 @@
has 'run' => (
is => 'rw',
isa => 'Runnable',
+ default => 'markup',
);
sub html {
@@ -102,26 +103,38 @@
}
$html .= qq||;
} else {
- my $o = $class->new( %{ $self->params } );
+ my $o;
+ eval { $o = $class->new( %{ $self->params } ); };
+ if ( $@ ) {
+ return $self->page( title => $class, body => $self->error( $@ ) );
+ }
$o->depends if $o->can('depends');
- if ( $o->can('markup') ) {
+
+ if ( $self->run eq 'markup' ) {
warn "## using ",ref($o), "->markup";
$html = eval { $o->markup };
$html .= $self->error( $@ ) if $@;
warn ">>> markup $class ",length( $html ), " bytes\n";
- } elsif ( $o->can('sponge') ) {
- my $data = $o->sponge;
- $html .= '
';
- $html .= '' . join(' | ', @{$data->{NAME}} ) . ' |
';
- $html .= '' . join(' | ', @$_ ) . ' |
' foreach @{ $data->{rows} };
- $html .= '
';
- } elsif ( $o->can('data') ) {
- my $data = $o->data;
- $html .= Frey::Dumper->new( data => $data )->markup;
- $html .= '
' . $self->html_dump( $data ) . '
';
+ } elsif ( $self->run eq 'sponge' ) {
+ my $data = eval { $o->sponge };
+ if ( $@ ) {
+ $html .= $self->error( $@ );
+ } else {
+ $html .= '';
+ $html .= '' . join(' | ', @{$data->{NAME}} ) . ' |
';
+ $html .= '' . join(' | ', @$_ ) . ' |
' foreach @{ $data->{rows} };
+ $html .= '
';
+ }
+ } elsif ( $self->run eq 'data' ) {
+ my $data = eval { $o->data; };
+ if ( $@ ) {
+ $html .= $self->error( $@ );
+ } else {
+ $html .= Frey::Dumper->new( data => $data )->markup;
+ $html .= '
' . $self->html_dump( $data ) . '
';
+ }
} else {
- $html = "IGNORE: $class ", $o->dump;
- warn $html;
+ $html = $self->error( "IGNORE: $class ", $o->dump );
}
}