--- trunk/lib/Frey/Run.pm 2008/12/10 19:34:06 797
+++ trunk/lib/Frey/Run.pm 2008/12/24 22:20:10 898
@@ -5,10 +5,12 @@
with 'Frey::Session';
use Data::Dump qw/dump/;
-use Frey::View::Dumper;
use JSON;
use YAML;
+use lib 'lib';
+use Frey::View::Dumper;
+
=head1 NAME
Frey::Run - display required form field for Class and run it
@@ -25,10 +27,11 @@
=cut
use Moose::Util::TypeConstraints;
+use Frey::Class::Loader; # class_runnable_re
subtype 'Runnable'
=> as 'Str',
- => where sub { m{^as_} || m{_as_} };
+ => where sub { Frey::Class::Loader::class_runnable_re };
sub formats_available { qw/html js json yaml yml/ }
enum 'Formats' => formats_available;
@@ -104,8 +107,8 @@
if ( $self->run =~ m{as_markup} ) {
$html = $o->page( run => $self->run );
- } elsif ( $self->run =~ m{as_sponge} ) {
- $data = $o->as_sponge;
+ } elsif ( $self->run =~ m{(.*as_sponge)} ) {
+ $data = $o->$1;
confess "invalid data from sponge = ", dump( $data ) unless ref($data) eq 'HASH';
if ( $self->format eq 'html' ) {
my $rows = $#{ $data->{rows} } + 1;
@@ -115,8 +118,11 @@
$body .= '
' . join(' | ', @{$data->{NAME}} ) . ' |
';
$body .= '' . join(' | ', @$_ ) . ' |
' foreach @{ $data->{rows} };
$body .= '';
+
+ delete( $data->{rows} ); # too much dumplication
+ $body .= Frey::View::Dumper->new( data => $data )->as_markup if $data;
}
- } elsif ( $self->run =~ m{as_data} ) {
+ } elsif ( $self->run =~ m{(as_data|sql)} ) {
my $run = $self->run;
$data = $o->$run;
confess "no data for $class->$run" unless defined $data;
@@ -131,7 +137,7 @@
}
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;
+ $body .= Frey::View::Dumper->new( data => $data )->as_markup if defined $data && ! defined $body;
}
$o->title( $class );
@@ -151,7 +157,7 @@
my $o = Frey->new;
$o->{request_url} = $self->request_url; # sigh, this is dynamic languge, right?
Frey::Web->meta->apply( $o );
- $html = $o->page( body => $self->error( $error ) );
+ $html = $o->page( body => $self->error( $error, undef ) );
}
warn $self->class, " produced ", length($html), " bytes of ", $self->content_type;