--- trunk/lib/Frey/Run.pm 2008/11/06 20:25:27 326 +++ trunk/lib/Frey/Run.pm 2008/11/16 16:36:53 358 @@ -1,6 +1,7 @@ package Frey::Run; use Moose; -extends 'Frey::ClassLoader'; +#extends 'Frey::ClassLoader'; +extends 'Frey::PPI'; with 'Frey::Web'; with 'Frey::Config'; with 'Frey::Escape'; @@ -19,7 +20,11 @@ =cut -sub runnable { qw/data markup/ } +use Moose::Util::TypeConstraints; + +enum 'Runnable' => qw/data markup sponge/; + +sub runnable { qw/data markup sponge/ } has 'class' => ( is => 'rw', @@ -33,6 +38,12 @@ default => sub { {} }, ); +has 'run' => ( + is => 'rw', + isa => 'Runnable', + default => 'markup', +); + sub html { my ( $self ) = @_; @@ -57,39 +68,71 @@ warn "# $class config = ",dump( $values ); if ( @required ) { - $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 .= "" . $#{ $data->{rows} } . " rows from $class->new" . dump( $self->params ) . "->sponge
";
+ $html .= '' . join(' | ', @{$data->{NAME}} ) . ' |
---|---|
' . join(' | ', @$_ ) . ' |
' . $self->html_dump( $data ) . '
';
+ } else {
+ $html = $self->error( "IGNORE: $class ", $o->dump );
}
- warn ">>> markup $class ",length( $html ), " bytes\n";
- } elsif ( $o->can('data') ) {
- my $data = $o->data;
- $html .= Frey::Dumper->new( data => $data )->markup;
- $html .= '' . $self->html_escape( dump( $data ) ) . '
';
- } else {
- $html = "IGNORE: $class ", $o->dump;
- warn $html;
- }
+ };
+
+ $html .= $self->error( $@ ) if $@;
}
+ return $self->page( %$html ) if ref($html) eq 'HASH';
return $self->page( title => $class, body => $html );
}