--- trunk/lib/Frey/Run.pm 2008/11/16 00:25:39 349
+++ trunk/lib/Frey/Run.pm 2008/11/16 14:07:13 353
@@ -41,6 +41,7 @@
has 'run' => (
is => 'rw',
isa => 'Runnable',
+ default => 'markup',
);
sub html {
@@ -102,30 +103,32 @@
}
$html .= qq||;
} else {
- my $o = $class->new( %{ $self->params } );
- $o->depends if $o->can('depends');
- if ( $o->can('markup') ) {
- warn "## using ",ref($o), "->markup";
- $html = eval { $o->markup };
- if ( $@ ) {
- warn $@;
- $html .= qq{$@
};
+ eval {
+ my $o;
+ $o = $class->new( %{ $self->params } );
+ $o->depends if $o->can('depends');
+
+ if ( $self->run eq 'markup' ) {
+ warn "## using ",ref($o), "->markup";
+ $html = $o->markup;
+ warn ">>> markup $class ",length( $html ), " bytes\n";
+ } elsif ( $self->run eq 'sponge' ) {
+ my $data = $o->sponge;
+ confess "invalid data from sponge = ", dump( $data ) unless ref($data) eq 'HASH';
+ $html .= '
';
+ $html .= '' . join(' | ', @{$data->{NAME}} ) . ' |
';
+ $html .= '' . join(' | ', @$_ ) . ' |
' foreach @{ $data->{rows} };
+ $html .= '
';
+ } elsif ( $self->run eq 'data' ) {
+ my $data = $o->data;
+ $html .= Frey::Dumper->new( data => $data )->markup;
+ $html .= '
' . $self->html_dump( $data ) . '
';
+ } else {
+ $html = $self->error( "IGNORE: $class ", $o->dump );
}
- 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 ) . '
';
- } else {
- $html = "IGNORE: $class ", $o->dump;
- warn $html;
- }
+ };
+
+ $html .= $self->error( $@ ) if $@;
}
return $self->page( title => $class, body => $html );