--- trunk/lib/Frey/Pipe.pm	2008/11/17 17:55:50	377
+++ trunk/lib/Frey/Pipe.pm	2008/11/18 16:54:10	418
@@ -1,7 +1,9 @@
 package Frey::Pipe;
 use Moose;
+extends 'Frey';
+with 'Frey::Web';
 
-with 'Frey::Config';
+use Frey::Action;
 
 =head1 DESCRIPTION
 
@@ -33,25 +35,29 @@
 	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 );
 			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) : '';
+				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 ! $params->{$arg};
-			}
-			my $code = '$result = ' . $class . '->new' . dump( %$params ) . '->' . $method . '();';
-			warn "# pipe $part -> $code";
+
+			my ( $html, $default ) = Frey::Action->new( class => $class, params => $params )->params_form;
+			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" if $self->debug;
 			my $result;
 			eval $code;
 			die $@ if $@;
@@ -64,7 +70,7 @@
 		}
 	}
 
-	return '<code>' . $self->pipe . '</code>' . $out;
+	return $out;
 }
 
 1;