--- trunk/lib/Frey/Run.pm 2008/11/17 14:37:48 369
+++ trunk/lib/Frey/Run.pm 2008/11/28 19:19:25 601
@@ -2,11 +2,12 @@
use Moose;
#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;
=head1 NAME
@@ -25,9 +26,12 @@
use Moose::Util::TypeConstraints;
-enum 'Runnable' => qw/data markup sponge/;
+subtype 'Runnable'
+ => as 'Str',
+ => where sub { m{^as_} || m{_as_} };
-sub runnable { qw/data markup sponge/ }
+sub formats_available { qw/html js json yaml yml/ }
+enum 'Formats' => formats_available;
has 'class' => (
is => 'rw',
@@ -44,52 +48,102 @@
has 'run' => (
is => 'rw',
isa => 'Runnable',
- default => 'markup',
+ default => 'as_markup',
+);
+
+has 'format' => (
+ is => 'rw',
+ isa => 'Formats',
+ default => 'html',
);
sub html {
my ( $self ) = @_;
- my $html;
+ my ($html,$body,$data);
eval {
my $class = $self->class;
$self->load_class( $class );
- if ( $html = $self->params_form ) {
- warn "got params form for $class";
+ if ( my $form = $self->params_form ) {
+ $html = $self->page( body => $form );
+ warn "got required params form for $class ", $self->run, " format: ", $self->format;
} else {
+
+ $self->usage->{ $class }++;
+
+=begin remove
+
my $o;
- $o = $class->new( %{ $self->params } );
+ my ( $meta, $is_role, $instance ) = $self->class_meta( $class );
+ if ( $is_role ) {
+ $o = $instance;
+ if ( $o->can('add_status') ) {
+ $self->TODO("missing add_status in $o");
+ Frey::Web->meta->apply( $o );
+ warn "# apply Frey::Web to $class instance $o";
+ }
+ } else {
+ $o = $self->new_frey_class( $class, $self->params );
+ }
+=cut
+
+ my $o = $self->new_frey_class( $class, $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;
+ if ( $self->run =~ m{as_markup} ) {
+ $html = $o->page( run => $self->run );
+ } elsif ( $self->run =~ m{as_sponge} ) {
+ $data = $o->as_sponge;
confess "invalid data from sponge = ", dump( $data ) unless ref($data) eq 'HASH';
- my $rows = $#{ $data->{rows} } + 1;
- $rows ||= 'no';
- $html .= "$rows rows from $class->new" . dump( $self->params ) . "->sponge
";
- $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 .= '
dump' . $self->html_dump( $data ) . '
';
+ if ( $self->format eq 'html' ) {
+ my $rows = $#{ $data->{rows} } + 1;
+ $rows ||= 'no';
+ $body .= "$rows rows from $class->new" . dump( $self->params ) . "->as_sponge
";
+ $body .= '';
+ $body .= '' . join(' | ', @{$data->{NAME}} ) . ' |
';
+ $body .= '' . join(' | ', @$_ ) . ' |
' foreach @{ $data->{rows} };
+ $body .= '
';
+ }
+ } elsif ( $self->run =~ m{as_data} ) {
+ my $run = $self->run;
+ $data = $o->$run;
+ confess "no data for $class->$run" unless defined $data;
+ $self->add_status( { $self->run => $data } );
} else {
- $html = $self->error( "IGNORE: $class ", $o->dump );
+ $body = $self->error( "IGNORE: $class ", $o->dump );
+ }
+
+ if ( defined $data ) {
+ $html .= to_json( $data ) if $self->format =~ m{js(on)?};
+ $html .= Dump( $data ) if $self->format =~ m{ya?ml};
}
+ if ( ! $html ) {
+ $body = Frey::View::Dumper->new( data => $body )->as_markup if ref $body;
+ $body .= Frey::View::Dumper->new( data => $data )->as_markup if defined $data;
+ }
+
+ $o->title( $class );
+
+ $html = $o->page( body => $body ) if $body && !$html;
+
+ confess "no html output for $class ", $o->dump unless defined $html;
};
};
- $html .= $self->error( $@ ) if $@;
- return $self->page( %$html ) if ref($html) eq 'HASH';
- return $self->page( title => $self->class, body => $html );
+ $self->status_parts;
+
+ if ( $@ ) {
+ my $error = $@;
+ my $o = Frey->new;
+ Frey::Web->meta->apply( $o );
+ $html = $o->page( body => $self->error( $error ) );
+ }
+
+ warn $self->class, " produced ", length($html), " bytes";
+
+ return $html;
}
1;