--- trunk/lib/Frey/Run.pm 2008/11/18 19:50:45 423
+++ trunk/lib/Frey/Run.pm 2008/11/26 20:53:51 547
@@ -3,10 +3,10 @@
#extends 'Frey::ClassLoader';
extends 'Frey::Action';
with 'Frey::Web';
-with 'Frey::Escape';
+with 'Frey::Session';
use Data::Dump qw/dump/;
-use Frey::Dumper;
+use Frey::View::Dumper;
use JSON;
use YAML;
@@ -27,8 +27,9 @@
use Moose::Util::TypeConstraints;
-sub runnable { qw/data data.js markup sponge/ }
-enum 'Runnable' => runnable;
+subtype 'Runnable'
+ => as 'Str',
+ => where sub { m{^as_} };
sub formats_available { qw/html js json yaml yml/ }
enum 'Formats' => formats_available;
@@ -48,7 +49,7 @@
has 'run' => (
is => 'rw',
isa => 'Runnable',
- default => 'markup',
+ default => 'as_markup',
);
has 'format' => (
@@ -69,35 +70,40 @@
warn "got required params form for $class ", $self->run, " format: ", $self->format;
} else {
- my $o = $class->new( %{ $self->params } );
+ $self->usage->{ $class }++;
+
+ my $o;
+ my ( $meta, $is_role, $instance ) = $self->class_meta( $class );
+ if ( $is_role ) {
+ $o = $instance;
+ } else {
+ $o = $self->new_frey_class( $class, $self->params );
+ }
+
$o->depends if $o->can('depends');
- push @{ $self->status }, { qq|$class| => $self->params };
+ my @status;
- if ( $self->run eq 'markup' ) {
- warn "## using ",ref($o), "->markup";
- if ( $o->can('page') ) {
- #$html = $o->page;
- $body = $o->markup unless $html;
- } else {
- $body = $o->markup;
- }
+ push @status, { $self->editor( $class ) => $self->params };
- warn ">>> markup $class ",length( $html || $body ), " ", $html ? 'html' : 'body', " bytes";
- } elsif ( $self->run eq 'sponge' ) {
- $data = $o->sponge;
+ if ( $self->run eq 'as_markup' && ! $o->can('page') ) {
+ warn "## using ",ref($o), "->as_markup";
+ $body = $o->as_markup unless $html;
+ warn ">>> markup $class ",length( $body ), " ", $html ? 'html' : 'body', " bytes";
+ } elsif ( $self->run eq 'as_sponge' ) {
+ $data = $o->as_sponge;
confess "invalid data from sponge = ", dump( $data ) unless ref($data) eq 'HASH';
if ( $self->format eq 'html' ) {
my $rows = $#{ $data->{rows} } + 1;
$rows ||= 'no';
- $body .= "$rows rows from $class->new" . dump( $self->params ) . "->sponge
";
+ $body .= "$rows rows from $class->new" . dump( $self->params ) . "->as_sponge
";
$body .= '
' . join(' | ', @{$data->{NAME}} ) . ' |
---|---|
' . join(' | ', @$_ ) . ' |