--- trunk/lib/Frey/Pipe.pm	2008/11/17 13:34:56	368
+++ trunk/lib/Frey/Pipe.pm	2008/11/17 20:10:28	384
@@ -1,6 +1,6 @@
 package Frey::Pipe;
 use Moose;
-
+extends 'Frey';
 with 'Frey::Config';
 
 =head1 DESCRIPTION
@@ -35,20 +35,20 @@
 
 	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;
 			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 $default = $self->config( $class );
-			foreach my $arg ( keys %$default ) {
-				$params->{$arg} = $default->{$arg} if ! $params->{$arg};
+			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 . '();';
 			warn "# pipe $part -> $code";
@@ -64,7 +64,7 @@
 		}
 	}
 
-	return $out;
+	return '<code>' . $self->pipe . '</code>' . $out;
 }
 
 1;