--- trunk/lib/Frey/Pipe.pm 2008/11/17 22:40:22 386 +++ trunk/lib/Frey/Pipe.pm 2008/11/18 17:11:08 420 @@ -1,6 +1,7 @@ package Frey::Pipe; use Moose; extends 'Frey'; +with 'Frey::Web'; use Frey::Action; @@ -34,15 +35,19 @@ my $out; my $pipe; + $self->title( ref($self) . ' | ' . $self->pipe ); + foreach my $part ( split(/\|/, $self->pipe ) ) { warn "# part: '$part'"; if ( $part =~ m{^([^/]+)/([^\+\?]+)(.*)?$} ) { my ( $class, $method, $args ) = ( $1, $2, $3 ); + push @{ $self->status }, { $class => { method => $method, args => $args } }; my $params = $pipe; $params = {} unless defined $params; if ( defined $args ) { $args =~ s{^[\?\+\s]}{}; warn "# class $class method $method args '$args'", $pipe ? " pipe args " . join(',',keys %$pipe) : '' if $self->debug; + push @{ $self->status }, { $class =>$args }; map { my ( $name, $value ) = ( $1, $2 ) if m{^([^=]+)=(.+)$} || confess "can't parse '$_'"; $params->{$name} = $value; @@ -50,10 +55,10 @@ } my ( $html, $default ) = Frey::Action->new( class => $class, params => $params )->params_form; - warn "$class need more params than ",dump( $default ) if $html; # FIXME replace with query + warn "$class need more params than ",dump( $default ) if $html && $self->debug; # FIXME replace with query my $code = '$result = ' . $class . '->new' . dump( %$default ) . '->' . $method . '();'; - warn "# pipe $part -> $code"; + warn "# pipe $part -> $code" if $self->debug; my $result; eval $code; die $@ if $@; @@ -66,7 +71,9 @@ } } - return '' . $self->pipe . '' . $out; + warn "# pipe ", $self->title, dump( $self->status ); + + return $out; } 1;