--- trunk/lib/Frey/Run.pm 2008/11/18 19:50:45 423
+++ trunk/lib/Frey/Run.pm 2008/12/24 22:20:10 898
@@ -1,15 +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
@@ -26,9 +27,11 @@
=cut
use Moose::Util::TypeConstraints;
+use Frey::Class::Loader; # class_runnable_re
-sub runnable { qw/data data.js markup sponge/ }
-enum 'Runnable' => runnable;
+subtype 'Runnable'
+ => as 'Str',
+ => where sub { Frey::Class::Loader::class_runnable_re };
sub formats_available { qw/html js json yaml yml/ }
enum 'Formats' => formats_available;
@@ -48,7 +51,7 @@
has 'run' => (
is => 'rw',
isa => 'Runnable',
- default => 'markup',
+ default => 'as_markup',
);
has 'format' => (
@@ -57,6 +60,17 @@
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 ) = @_;
@@ -65,39 +79,54 @@
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 {
- my $o = $class->new( %{ $self->params } );
- $o->depends if $o->can('depends');
+ $self->usage->{ $class }++;
- push @{ $self->status }, { qq|$class| => $self->params };
+=begin remove
- 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;
+ 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 = $self->new_frey_class( $class, $self->params );
+ }
+=cut
+
+ my $o = $self->new_frey_class( $class, $self->params );
+ $o->depends if $o->can('depends');
- warn ">>> markup $class ",length( $html || $body ), " ", $html ? 'html' : 'body', " bytes";
- } elsif ( $self->run eq 'sponge' ) {
- $data = $o->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;
$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(' | ', @$_ ) . ' |