--- trunk/lib/Frey/Pipe.pm	2008/11/06 20:56:44	327
+++ trunk/lib/Frey/Pipe.pm	2008/11/17 22:40:22	386
@@ -1,5 +1,8 @@
 package Frey::Pipe;
 use Moose;
+extends 'Frey';
+
+use Frey::Action;
 
 =head1 DESCRIPTION
 
@@ -33,18 +36,23 @@
 
 	foreach my $part ( split(/\|/, $self->pipe ) ) {
 		warn "# part: '$part'";
-		if ( $part =~ m{^([^/]+)/([^\+]+)(\+.*)?$} ) {
+		if ( $part =~ m{^([^/]+)/([^\+\?]+)(.*)?$} ) {
 			my ( $class, $method, $args ) = ( $1, $2, $3 );
 			my $params = $pipe;
+			$params = {} unless defined $params;
 			if ( defined $args ) {
-				$args =~ s/^\+//;
-				warn "# class $class method $method args $args", $pipe ? " pipe args " . join(',',keys %$pipe) : '';
+				$args =~ s{^[\?\+\s]}{};
+				warn "# class $class method $method args '$args'", $pipe ? " pipe args " . join(',',keys %$pipe) : '' if $self->debug;
 				map {
-					my ( $name, $value ) = ( $1, $2 ) if m{^([^=]+)=(.+)$};
+					my ( $name, $value ) = ( $1, $2 ) if m{^([^=]+)=(.+)$} || confess "can't parse '$_'";
 					$params->{$name} = $value;
-				} split(/[\s\+]/, $args)
+				} split(/\s*\+\s/, $args)
 			}
-			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;
@@ -58,7 +66,7 @@
 		}
 	}
 
-	return $out;
+	return '<code>' . $self->pipe . '</code>' . $out;
 }
 
 1;