--- trunk/lib/Frey/Run.pm 2008/11/19 15:35:34 456 +++ trunk/lib/Frey/Run.pm 2009/01/06 00:22:56 934 @@ -1,16 +1,16 @@ package Frey::Run; use Moose; -#extends 'Frey::ClassLoader'; +#extends 'Frey::Class::Loader'; extends 'Frey::Action'; -with 'Frey::Web'; -with 'Frey::Escape'; with 'Frey::Session'; use Data::Dump qw/dump/; -use Frey::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 @@ -27,10 +27,11 @@ =cut use Moose::Util::TypeConstraints; +use Frey::Class::Loader; # class_runnable_re subtype 'Runnable' => as 'Str', - => where sub { m{^as_} }; + => where sub { Frey::Class::Loader::class_runnable_re }; sub formats_available { qw/html js json yaml yml/ } enum 'Formats' => formats_available; @@ -59,42 +60,59 @@ default => 'html', ); +has 'request_url' => ( + documentation => 'Take url from params if not specified', + is => 'rw', + isa => 'Uri', coerce => 1, + lazy => 1, + default => sub { + my $self = shift; + $self->params->{request_url}; + }, +); + sub html { my ( $self ) = @_; my ($html,$body,$data); + + my $current_status; + $current_status->{$_}++ foreach $self->status; + eval { my $class = $self->class; $self->load_class( $class ); - if ( $body = $self->params_form ) { + 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; 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 = $class->new( %{ $self->params } ); + $o = $self->new_frey_class( $class, $self->params ); } +=cut + my $o = $self->new_frey_class( $class, $self->params ); $o->depends if $o->can('depends'); - push @{ $self->status }, { qq|$class| => $self->params }; - - if ( $self->run eq 'as_markup' ) { - warn "## using ",ref($o), "->as_markup"; - if ( $o->can('page') ) { - $html = $o->page; - } - $body = $o->as_markup unless $html; - - warn ">>> markup $class ",length( $html || $body ), " ", $html ? 'html' : 'body', " bytes"; - } elsif ( $self->run eq 'as_sponge' ) { - $data = $o->as_sponge; + if ( $self->run =~ m{as_markup} ) { + $html = $o->page( run => $self->run ); + } 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; @@ -104,9 +122,15 @@ $body .= '