--- trunk/lib/Frey/Pipe.pm 2008/11/17 20:10:28 384 +++ trunk/lib/Frey/Pipe.pm 2008/11/18 02:17:06 401 @@ -1,7 +1,9 @@ package Frey::Pipe; use Moose; extends 'Frey'; -with 'Frey::Config'; +with 'Frey::Web'; + +use Frey::Action; =head1 DESCRIPTION @@ -38,19 +40,21 @@ if ( $part =~ m{^([^/]+)/([^\+\?]+)(.*)?$} ) { my ( $class, $method, $args ) = ( $1, $2, $3 ); 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; } split(/\s*\+\s/, $args) } - my %default = $self->config( $class ); - foreach my $arg ( keys %default ) { - $params->{$arg} = $default{$arg} if ! defined $params->{$arg}; - } - my $code = '$result = ' . $class . '->new' . dump( %$params ) . '->' . $method . '();'; + + 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 + + my $code = '$result = ' . $class . '->new' . dump( %$default ) . '->' . $method . '();'; warn "# pipe $part -> $code"; my $result; eval $code;