--- trunk/lib/Frey/Run.pm 2008/11/30 23:49:32 653 +++ trunk/lib/Frey/Run.pm 2008/12/24 13:51:59 887 @@ -1,14 +1,16 @@ package Frey::Run; use Moose; -#extends 'Frey::ClassLoader'; +#extends 'Frey::Class::Loader'; extends 'Frey::Action'; 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; @@ -116,7 +119,7 @@ $body .= '