X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=de506cb54af73eff4b1601153098817888eb5fa0;hp=ff016032a30d4fdb9e9176e8498a02eb1c7fdddd;hb=f63c03e47ae0278e50d513b90ecbbdfd67d1a021;hpb=5783a9a55a3037a5907c11f8649521434c2ca92e

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index ff01603..de506cb 100644
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -1,31 +1,22 @@
 package Catalyst::Engine;
 
 use strict;
-use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
-use UNIVERSAL::require;
-use Data::Dumper;
+use base 'Class::Accessor::Fast';
+use CGI::Cookie;
+use Data::Dump qw/dump/;
 use HTML::Entities;
+use HTTP::Body;
 use HTTP::Headers;
-use Time::HiRes qw/gettimeofday tv_interval/;
-use Catalyst::Request;
-use Catalyst::Response;
+use URI::QueryParam;
 
-require Module::Pluggable::Fast;
+# input position and length
+__PACKAGE__->mk_accessors(qw/read_position read_length/);
 
-$Data::Dumper::Terse = 1;
+# Stringify to class
+use overload '""' => sub { return ref shift }, fallback => 1;
 
-__PACKAGE__->mk_classdata($_) for qw/actions components/;
-__PACKAGE__->mk_accessors(qw/request response/);
-
-__PACKAGE__->actions(
-    { plain => {}, regex => {}, compiled => {}, reverse => {} } );
-
-*comp = \&component;
-*req  = \&request;
-*res  = \&response;
-
-our $COUNT = 1;
-our $START = time;
+# Amount of data to read from input on each pass
+our $CHUNKSIZE = 4096;
 
 =head1 NAME
 
@@ -37,713 +28,559 @@ See L<Catalyst>.
 
 =head1 DESCRIPTION
 
-=head2 METHODS
-
-=head3 action
-
-Add one or more actions.
+=head1 METHODS
 
-    $c->action( '!foo' => sub { $_[1]->res->output('Foo!') } );
 
-Get an action's class and coderef.
+=head2 $self->finalize_body($c)
 
-    my ($class, $code) = @{ $c->action('foo') };
-
-Get a list of available actions.
-
-    my @actions = $c->action;
-
-It also automatically calls setup() if needed.
-
-See L<Catalyst::Manual::Intro> for more informations about actions.
+Finalize body.  Prints the response output.
 
 =cut
 
-sub action {
-    my $self = shift;
-    $self->setup unless $self->components;
-    $self->actions( {} ) unless $self->actions;
-    my $action;
-    $_[1] ? ( $action = {@_} ) : ( $action = shift );
-    if ( ref $action eq 'HASH' ) {
-        while ( my ( $name, $code ) = each %$action ) {
-            my $class = caller(0);
-            if ( $name =~ /^\/(.*)\/$/ ) {
-                my $regex = $1;
-                $self->actions->{compiled}->{qr/$regex/} = $name;
-                $self->actions->{regex}->{$name} = [ $class, $code ];
-            }
-            elsif ( $name =~ /^\?(.*)$/ ) {
-                $name = $1;
-                $name = _prefix( $class, $name );
-                $self->actions->{plain}->{$name} = [ $class, $code ];
-            }
-            elsif ( $name =~ /^\!\?(.*)$/ ) {
-                $name = $1;
-                $name = _prefix( $class, $name );
-                $name = "\!$name";
-                $self->actions->{plain}->{$name} = [ $class, $code ];
-            }
-            else { $self->actions->{plain}->{$name} = [ $class, $code ] }
-            $self->actions->{reverse}->{"$code"} = $name;
-            $self->log->debug(qq/"$class" defined "$name" as "$code"/)
-              if $self->debug;
-        }
-    }
-    elsif ($action) {
-        if    ( my $p = $self->actions->{plain}->{$action} ) { return [$p] }
-        elsif ( my $r = $self->actions->{regex}->{$action} ) { return [$r] }
-        else {
-            for my $regex ( keys %{ $self->actions->{compiled} } ) {
-                my $name = $self->actions->{compiled}->{$regex};
-                if ( $action =~ $regex ) {
-                    my @snippets;
-                    for my $i ( 1 .. 9 ) {
-                        no strict 'refs';
-                        last unless ${$i};
-                        push @snippets, ${$i};
-                    }
-                    return [ $self->actions->{regex}->{$name},
-                        $name, \@snippets ];
-                }
-            }
+sub finalize_body {
+    my ( $self, $c ) = @_;
+    my $body = $c->response->body;
+    if ( ref $body && ( $body->can('read') || ref($body) eq 'GLOB' ) ) {
+        while ( !eof $body ) {
+            read $body, my ($buffer), $CHUNKSIZE;
+            last unless $self->write( $c, $buffer );
         }
-        return 0;
+        close $body;
     }
     else {
-        return (
-            keys %{ $self->actions->{plain} },
-            keys %{ $self->actions->{regex} }
-        );
+        $self->write( $c, $body );
     }
 }
 
-=head3 benchmark
-
-Takes a coderef with arguments and returns elapsed time as float.
+=head2 $self->finalize_cookies($c)
 
-    my ( $elapsed, $status ) = $c->benchmark( sub { return 1 } );
-    $c->log->info( sprintf "Processing took %f seconds", $elapsed );
+Create CGI::Cookies from $c->res->cookies, and set them as response headers.
 
 =cut
 
-sub benchmark {
-    my $c       = shift;
-    my $code    = shift;
-    my $time    = [gettimeofday];
-    my @return  = &$code(@_);
-    my $elapsed = tv_interval $time;
-    return wantarray ? ( $elapsed, @return ) : $elapsed;
-}
-
-=head3 component (comp)
+sub finalize_cookies {
+    my ( $self, $c ) = @_;
 
-Get a component object by name.
+    my @cookies;
+    while ( my ( $name, $cookie ) = each %{ $c->response->cookies } ) {
 
-    $c->comp('MyApp::Model::MyModel')->do_stuff;
-
-Regex search for a component.
-
-    $c->comp('mymodel')->do_stuff;
-
-=cut
+        my $cookie = CGI::Cookie->new(
+            -name    => $name,
+            -value   => $cookie->{value},
+            -expires => $cookie->{expires},
+            -domain  => $cookie->{domain},
+            -path    => $cookie->{path},
+            -secure  => $cookie->{secure} || 0
+        );
 
-sub component {
-    my ( $c, $name ) = @_;
-    if ( my $component = $c->components->{$name} ) {
-        return $component;
+        push @cookies, $cookie->as_string;
     }
-    else {
-        for my $component ( keys %{ $c->components } ) {
-            return $c->components->{$component} if $component =~ /$name/i;
-        }
+
+    for my $cookie (@cookies) {
+        $c->res->headers->push_header( 'Set-Cookie' => $cookie );
     }
 }
 
-=head3 errors
-
-Returns an arrayref containing errors messages.
+=head2 $self->finalize_error($c)
 
-    my @errors = @{ $c->errors };
-
-Add a new error.
-
-    $c->errors('Something bad happened');
+Output an apropriate error message, called if there's an error in $c
+after the dispatch has finished. Will output debug messages if Catalyst
+is in debug mode, or a `please come back later` message otherwise.
 
 =cut
 
-sub errors {
-    my $c = shift;
-    my $errors = ref $_[0] eq 'ARRAY' ? $_[0] : [@_];
-    push @{ $c->{errors} }, @$errors;
-    return $c->{errors};
-}
+sub finalize_error {
+    my ( $self, $c ) = @_;
 
-=head3 finalize
+    $c->res->content_type('text/html; charset=utf-8');
+    my $name = $c->config->{name} || join(' ', split('::', ref $c));
 
-Finalize request.
-
-=cut
-
-sub finalize {
-    my $c = shift;
-    if ( !$c->res->output || $#{ $c->errors } >= 0 ) {
-        $c->res->headers->content_type('text/html');
-        my $name = $c->config->{name} || 'Catalyst Application';
-        my ( $title, $errors, $infos );
-        if ( $c->debug ) {
-            $errors = join '<br/>', @{ $c->errors };
-            $errors ||= 'No output';
-            $title = $name = "$name on Catalyst $Catalyst::VERSION";
-            my $req   = encode_entities Dumper $c->req;
-            my $res   = encode_entities Dumper $c->res;
-            my $stash = encode_entities Dumper $c->stash;
-            $infos = <<"";
-<br/>
-<b><u>Request</u></b><br/>
-<pre>$req</pre>
-<b><u>Response</u></b><br/>
-<pre>$res</pre>
-<b><u>Stash</u></b><br/>
-<pre>$stash</pre>
+    my ( $title, $error, $infos );
+    if ( $c->debug ) {
 
+        # For pretty dumps
+        $error = join '', map {
+                '<p><code class="error">'
+              . encode_entities($_)
+              . '</code></p>'
+        } @{ $c->error };
+        $error ||= 'No output';
+        $error = qq{<pre wrap="">$error</pre>};
+        $title = $name = "$name on Catalyst $Catalyst::VERSION";
+        $name  = "<h1>$name</h1>";
+
+        # Don't show context in the dump
+        delete $c->req->{_context};
+        delete $c->res->{_context};
+
+        # Don't show body parser in the dump
+        delete $c->req->{_body};
+
+        # Don't show response header state in dump
+        delete $c->res->{_finalized_headers};
+
+        my @infos;
+        my $i = 0;
+        for my $dump ( $c->dump_these ) {
+            my $name  = $dump->[0];
+            my $value = encode_entities( dump( $dump->[1] ));
+            push @infos, sprintf <<"EOF", $name, $value;
+<h2><a href="#" onclick="toggleDump('dump_$i'); return false">%s</a></h2>
+<div id="dump_$i">
+    <pre wrap="">%s</pre>
+</div>
+EOF
+            $i++;
         }
-        else {
-            $title  = $name;
-            $errors = '';
-            $infos  = <<"";
+        $infos = join "\n", @infos;
+    }
+    else {
+        $title = $name;
+        $error = '';
+        $infos = <<"";
 <pre>
 (en) Please come back later
+(fr) SVP veuillez revenir plus tard
 (de) Bitte versuchen sie es spaeter nocheinmal
-(nl) Gelieve te komen later terug
+(at) Konnten's bitt'schoen spaeter nochmal reinschauen
 (no) Vennligst prov igjen senere
-(fr) Veuillez revenir plus tard
-(es) Vuelto por favor mas adelante
-(pt) Voltado por favor mais tarde
-(it) Ritornato prego più successivamente
+(dk) Venligst prov igen senere
+(pl) Prosze sprobowac pozniej
 </pre>
 
-            $name = '';
-        }
-        $c->res->{output} = <<"";
-<html>
-    <head>
-        <title>$title</title>
-        <style type="text/css">
-            body {
-                font-family: "Bitstream Vera Sans", "Trebuchet MS", Verdana,
-                             Tahoma, Arial, helvetica, sans-serif;
-                color: #ddd;
-                background-color: #eee;
-                margin: 0px;
-                padding: 0px;
-            }
-            div.box {
-                background-color: #ccc;
-                border: 1px solid #aaa;
-                padding: 4px;
-                margin: 10px;
-                -moz-border-radius: 10px;
-            }
-            div.errors {
-                background-color: #977;
-                border: 1px solid #755;
-                padding: 8px;
-                margin: 4px;
-                margin-bottom: 10px;
-                -moz-border-radius: 10px;
-            }
-            div.infos {
-                background-color: #797;
-                border: 1px solid #575;
-                padding: 8px;
-                margin: 4px;
-                margin-bottom: 10px;
-                -moz-border-radius: 10px;
+        $name = '';
+    }
+    $c->res->body( <<"" );
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <meta http-equiv="Content-Language" content="en" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>$title</title>
+    <script type="text/javascript">
+        <!--
+        function toggleDump (dumpElement) {
+            var e = document.getElementById( dumpElement );
+            if (e.style.display == "none") {
+                e.style.display = "";
             }
-            div.name {
-                background-color: #779;
-                border: 1px solid #557;
-                padding: 8px;
-                margin: 4px;
-                -moz-border-radius: 10px;
+            else {
+                e.style.display = "none";
             }
-        </style>
-    </head>
-    <body>
-        <div class="box">
-            <div class="errors">$errors</div>
-            <div class="infos">$infos</div>
-            <div class="name">$name</div>
-        </div>
-    </body>
+        }
+        -->
+    </script>
+    <style type="text/css">
+        body {
+            font-family: "Bitstream Vera Sans", "Trebuchet MS", Verdana,
+                         Tahoma, Arial, helvetica, sans-serif;
+            color: #333;
+            background-color: #eee;
+            margin: 0px;
+            padding: 0px;
+        }
+        :link, :link:hover, :visited, :visited:hover {
+            color: #000;
+        }
+        div.box {
+            position: relative;
+            background-color: #ccc;
+            border: 1px solid #aaa;
+            padding: 4px;
+            margin: 10px;
+        }
+        div.error {
+            background-color: #cce;
+            border: 1px solid #755;
+            padding: 8px;
+            margin: 4px;
+            margin-bottom: 10px;
+        }
+        div.infos {
+            background-color: #eee;
+            border: 1px solid #575;
+            padding: 8px;
+            margin: 4px;
+            margin-bottom: 10px;
+        }
+        div.name {
+            background-color: #cce;
+            border: 1px solid #557;
+            padding: 8px;
+            margin: 4px;
+        }
+        code.error {
+            display: block;
+            margin: 1em 0;
+            overflow: auto;
+        }
+        div.name h1, div.error p {
+            margin: 0;
+        }
+        h2 {
+            margin-top: 0;
+            margin-bottom: 10px;
+            font-size: medium;
+            font-weight: bold;
+            text-decoration: underline;
+        }
+        h1 {
+            font-size: medium;
+            font-weight: normal;
+        }
+        /* from http://users.tkk.fi/~tkarvine/linux/doc/pre-wrap/pre-wrap-css3-mozilla-opera-ie.html */
+        /* Browser specific (not valid) styles to make preformatted text wrap */
+        pre { 
+            white-space: pre-wrap;       /* css-3 */
+            white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+            white-space: -pre-wrap;      /* Opera 4-6 */
+            white-space: -o-pre-wrap;    /* Opera 7 */
+            word-wrap: break-word;       /* Internet Explorer 5.5+ */
+        }
+    </style>
+</head>
+<body>
+    <div class="box">
+        <div class="error">$error</div>
+        <div class="infos">$infos</div>
+        <div class="name">$name</div>
+    </div>
+</body>
 </html>
 
-    }
-    if ( my $location = $c->res->redirect ) {
-        $c->log->debug(qq/Redirecting to "$location"/) if $c->debug;
-        $c->res->headers->header( Location => $location );
-        $c->res->status(302);
-    }
-    $c->res->headers->content_length( length $c->res->output );
-    my $status = $c->finalize_headers;
-    $c->finalize_output;
-    return $status;
+
+    # Trick IE
+    $c->res->{body} .= ( ' ' x 512 );
+
+    # Return 500
+    $c->res->status(500);
 }
 
-=head3 finalize_headers
+=head2 $self->finalize_headers($c)
 
-Finalize headers.
+Abstract method, allows engines to write headers to response
 
 =cut
 
 sub finalize_headers { }
 
-=head3 finalize_output
-
-Finalize output.
+=head2 $self->finalize_read($c)
 
 =cut
 
-sub finalize_output { }
+sub finalize_read {
+    my ( $self, $c ) = @_;
 
-=head3 forward
+    undef $self->{_prepared_read};
+}
 
-Forward processing to a private/public action or a method from a class.
-If you define a class without method it will default to process().
+=head2 $self->finalize_uploads($c)
 
-    $c->forward('!foo');
-    $c->forward('index.html');
-    $c->forward(qw/MyApp::Model::CDBI::Foo do_stuff/);
-    $c->forward('MyApp::View::TT');
+Clean up after uploads, deleting temp files.
 
 =cut
 
-sub forward {
-    my $c       = shift;
-    my $command = shift;
-    unless ($command) {
-        $c->log->debug('Nothing to forward to') if $c->debug;
-        return 0;
-    }
-    if ( $command =~ /^\?(.*)$/ ) {
-        $command = $1;
-        my $caller = caller(0);
-        $command = _prefix( $caller, $command );
-    }
-    elsif ( $command =~ /^\!\?(.*)$/ ) {
-        $command = $1;
-        my $caller = caller(0);
-        $command = _prefix( $caller, $command );
-        $command = "\!$command";
-    }
-    elsif ( $command =~ /^\!(.*)$/ ) {
-        my $try    = $1;
-        my $caller = caller(0);
-        my $prefix = _class2prefix($caller);
-        $try = "!$prefix/$command";
-        $command = $try if $c->actions->{plain}->{$try};
-    }
-    my ( $class, $code );
-    if ( my $action = $c->action($command) ) {
-        if ( $action->[2] ) {
-            $c->log->debug(qq/Couldn't forward "$command" to regex action/)
-              if $c->debug;
-            return 0;
-        }
-        ( $class, $code ) = @{ $action->[0] };
-    }
-    else {
-        $class = $command;
-        if ( $class =~ /[^\w\:]/ ) {
-            $c->log->debug(qq/Couldn't forward to "$class"/) if $c->debug;
-            return 0;
-        }
-        my $method = shift || 'process';
-        if ( $code = $class->can($method) ) {
-            $c->actions->{reverse}->{"$code"} = "$class->$method";
-        }
-        else {
-            $c->log->debug(qq/Couldn't forward to "$class->$method"/)
-              if $c->debug;
-            return 0;
+sub finalize_uploads {
+    my ( $self, $c ) = @_;
+
+    if ( keys %{ $c->request->uploads } ) {
+        for my $key ( keys %{ $c->request->uploads } ) {
+            my $upload = $c->request->uploads->{$key};
+            unlink map { $_->tempname }
+              grep     { -e $_->tempname }
+              ref $upload eq 'ARRAY' ? @{$upload} : ($upload);
         }
     }
-    $class = $c->components->{$class} || $class;
-    return $c->process( $class, $code );
 }
 
-=head3 handler
+=head2 $self->prepare_body($c)
 
-Handles the request.
+sets up the L<Catalyst::Request> object body using L<HTTP::Body>
 
 =cut
 
-sub handler {
-    my ( $class, $r ) = @_;
-
-    # Always expect worst case!
-    my $status = -1;
-    eval {
-        my $handler = sub {
-            my $c = $class->prepare($r);
-            if ( my $action = $c->action( $c->req->action ) ) {
-                my ( $begin, $end );
-                my $class  = ${ $action->[0] }[0];
-                my $prefix = _class2prefix($class);
-                if ($prefix) {
-                    if ( $c->actions->{plain}->{"\!$prefix/begin"} ) {
-                        $begin = "\!$prefix/begin";
-                    }
-                    elsif ( $c->actions->{plain}->{'!begin'} ) {
-                        $begin = '!begin';
-                    }
-                    if ( $c->actions->{plain}->{"\!$prefix/end"} ) {
-                        $end = "\!$prefix/end";
-                    }
-                    elsif ( $c->actions->{plain}->{'!end'} ) { $end = '!end' }
-                }
-                else {
-                    if ( $c->actions->{plain}->{'!begin'} ) {
-                        $begin = '!begin';
-                    }
-                    if ( $c->actions->{plain}->{'!end'} ) { $end = '!end' }
-                }
-                $c->forward($begin)            if $begin;
-                $c->forward( $c->req->action ) if $c->req->action;
-                $c->forward($end)              if $end;
-            }
-            else {
-                my $action = $c->req->path;
-                my $error  = $action
-                  ? qq/Unknown resource "$action"/
-                  : "No default action defined";
-                $c->log->error($error) if $c->debug;
-                $c->errors($error);
-            }
-            return $c->finalize;
-        };
-        if ( $class->debug ) {
-            my $elapsed;
-            ( $elapsed, $status ) = $class->benchmark($handler);
-            $elapsed = sprintf '%f', $elapsed;
-            my $av = sprintf '%.3f', 1 / $elapsed;
-            $class->log->info( "Request took $elapsed" . "s ($av/s)" );
+sub prepare_body {
+    my ( $self, $c ) = @_;
+
+    $self->read_length( $c->request->header('Content-Length') || 0 );
+    my $type = $c->request->header('Content-Type');
+
+    unless ( $c->request->{_body} ) {
+        $c->request->{_body} = HTTP::Body->new( $type, $self->read_length );
+        $c->request->{_body}->{tmpdir} = $c->config->{uploadtmp}
+          if exists $c->config->{uploadtmp};
+    }
+
+    if ( $self->read_length > 0 ) {
+        while ( my $buffer = $self->read($c) ) {
+            $c->prepare_body_chunk($buffer);
+        }
+
+        # paranoia against wrong Content-Length header
+        my $remaining = $self->read_length - $self->read_position;
+        if ( $remaining > 0 ) {
+            $self->finalize_read($c);
+            Catalyst::Exception->throw(
+                "Wrong Content-Length value: " . $self->read_length );
         }
-        else { $status = &$handler }
-    };
-    if ( my $error = $@ ) {
-        chomp $error;
-        $class->log->error(qq/Caught exception in engine "$error"/);
     }
-    $COUNT++;
-    return $status;
 }
 
-=head3 prepare
+=head2 $self->prepare_body_chunk($c)
 
-Turns the request (Apache, CGI...) into a Catalyst context.
+Add a chunk to the request body.
 
 =cut
 
-sub prepare {
-    my ( $class, $r ) = @_;
-    my $c = bless {
-        request => Catalyst::Request->new(
-            {
-                arguments  => [],
-                cookies    => {},
-                headers    => HTTP::Headers->new,
-                parameters => {},
-                snippets   => [],
-                uploads    => {}
-            }
-        ),
-        response => Catalyst::Response->new(
-            { cookies => {}, headers => HTTP::Headers->new, status => 200 }
-        ),
-        stash => {}
-    }, $class;
-    if ( $c->debug ) {
-        my $secs = time - $START || 1;
-        my $av = sprintf '%.3f', $COUNT / $secs;
-        $c->log->debug('********************************');
-        $c->log->debug("* Request $COUNT ($av/s) [$$]");
-        $c->log->debug('********************************');
-        $c->res->headers->header( 'X-Catalyst' => $Catalyst::VERSION );
-    }
-    $c->prepare_request($r);
-    $c->prepare_path;
-    $c->prepare_cookies;
-    $c->prepare_headers;
-    my $method = $c->req->method;
-    my $path   = $c->req->path;
-    $c->log->debug(qq/"$method" request for "$path"/) if $c->debug;
-    $c->prepare_action;
-    $c->prepare_parameters;
-    $c->prepare_uploads;
-    return $c;
+sub prepare_body_chunk {
+    my ( $self, $c, $chunk ) = @_;
+
+    $c->request->{_body}->add($chunk);
 }
 
-=head3 prepare_action
+=head2 $self->prepare_body_parameters($c)
 
-Prepare action.
+Sets up parameters from body. 
 
 =cut
 
-sub prepare_action {
-    my $c    = shift;
-    my $path = $c->req->path;
-    my @path = split /\//, $c->req->path;
-    $c->req->args( \my @args );
-    while (@path) {
-        $path = join '/', @path;
-        if ( my $result = $c->action($path) ) {
-
-            # It's a regex
-            if ($#$result) {
-                my $match    = $result->[1];
-                my @snippets = @{ $result->[2] };
-                $c->log->debug(qq/Requested action "$path" matched "$match"/)
-                  if $c->debug;
-                $c->log->debug(
-                    'Snippets are "' . join( ' ', @snippets ) . '"' )
-                  if ( $c->debug && @snippets );
-                $c->req->action($match);
-                $c->req->snippets( \@snippets );
-            }
-            else {
-                $c->req->action($path);
-                $c->log->debug(qq/Requested action "$path"/) if $c->debug;
-            }
-            $c->req->match($path);
-            last;
-        }
-        unshift @args, pop @path;
-    }
-    unless ( $c->req->action ) {
-        my $prefix = $c->req->args->[0];
-        if ( $prefix && $c->actions->{plain}->{"\!$prefix/default"} ) {
-            $c->req->match('');
-            $c->req->action("\!$prefix/default");
-            $c->log->debug('Using prefixed default action') if $c->debug;
-        }
-        elsif ( $c->actions->{plain}->{'!default'} ) {
-            $c->req->match('');
-            $c->req->action('!default');
-            $c->log->debug('Using default action') if $c->debug;
-        }
-    }
-    $c->log->debug( 'Arguments are "' . join( '/', @args ) . '"' )
-      if ( $c->debug && @args );
+sub prepare_body_parameters {
+    my ( $self, $c ) = @_;
+    $c->request->body_parameters( $c->request->{_body}->param );
 }
 
-=head3 prepare_cookies;
+=head2 $self->prepare_connection($c)
 
-Prepare cookies.
+Abstract method implemented in engines.
 
 =cut
 
-sub prepare_cookies { }
+sub prepare_connection { }
 
-=head3 prepare_headers
+=head2 $self->prepare_cookies($c)
 
-Prepare headers.
+Parse cookies from header. Sets a L<CGI::Cookie> object.
 
 =cut
 
-sub prepare_headers { }
+sub prepare_cookies {
+    my ( $self, $c ) = @_;
 
-=head3 prepare_parameters
+    if ( my $header = $c->request->header('Cookie') ) {
+        $c->req->cookies( { CGI::Cookie->parse($header) } );
+    }
+}
 
-Prepare parameters.
+=head2 $self->prepare_headers($c)
 
 =cut
 
-sub prepare_parameters { }
+sub prepare_headers { }
 
-=head3 prepare_path
+=head2 $self->prepare_parameters($c)
 
-Prepare path and base.
+sets up parameters from query and post parameters.
 
 =cut
 
-sub prepare_path { }
+sub prepare_parameters {
+    my ( $self, $c ) = @_;
+
+    # We copy, no references
+    while ( my ( $name, $param ) = each %{ $c->request->query_parameters } ) {
+        $param = ref $param eq 'ARRAY' ? [ @{$param} ] : $param;
+        $c->request->parameters->{$name} = $param;
+    }
+
+    # Merge query and body parameters
+    while ( my ( $name, $param ) = each %{ $c->request->body_parameters } ) {
+        $param = ref $param eq 'ARRAY' ? [ @{$param} ] : $param;
+        if ( my $old_param = $c->request->parameters->{$name} ) {
+            if ( ref $old_param eq 'ARRAY' ) {
+                push @{ $c->request->parameters->{$name} },
+                  ref $param eq 'ARRAY' ? @$param : $param;
+            }
+            else { $c->request->parameters->{$name} = [ $old_param, $param ] }
+        }
+        else { $c->request->parameters->{$name} = $param }
+    }
+}
 
-=head3 prepare_request
+=head2 $self->prepare_path($c)
 
-Prepare the engine request.
+abstract method, implemented by engines.
 
 =cut
 
-sub prepare_request { }
+sub prepare_path { }
+
+=head2 $self->prepare_request($c)
 
-=head3 prepare_uploads
+=head2 $self->prepare_query_parameters($c)
 
-Prepare uploads.
+process the query string and extract query parameters.
 
 =cut
 
-sub prepare_uploads { }
+sub prepare_query_parameters {
+    my ( $self, $c, $query_string ) = @_;
+
+    # replace semi-colons
+    $query_string =~ s/;/&/g;
+
+    my $u = URI->new( '', 'http' );
+    $u->query($query_string);
+    for my $key ( $u->query_param ) {
+        my @vals = $u->query_param($key);
+        $c->request->query_parameters->{$key} = @vals > 1 ? [@vals] : $vals[0];
+    }
+}
 
-=head3 process
+=head2 $self->prepare_read($c)
 
-Process a coderef in given class and catch exceptions.
-Errors are available via $c->errors.
+prepare to read from the engine.
 
 =cut
 
-sub process {
-    my ( $c, $class, $code ) = @_;
-    my $status;
-    eval {
-        if ( $c->debug )
-        {
-            my $action = $c->actions->{reverse}->{"$code"} || "$code";
-            my $elapsed;
-            ( $elapsed, $status ) =
-              $c->benchmark( $code, $class, $c, @{ $c->req->args } );
-            $c->log->info( sprintf qq/Processing "$action" took %fs/, $elapsed )
-              if $c->debug;
-        }
-        else { $status = &$code( $class, $c, @{ $c->req->args } ) }
-    };
-    if ( my $error = $@ ) {
-        chomp $error;
-        $error = qq/Caught exception "$error"/;
-        $c->log->error($error);
-        $c->errors($error) if $c->debug;
-        return 0;
-    }
-    return $status;
+sub prepare_read {
+    my ( $self, $c ) = @_;
+
+    # Reset the read position
+    $self->read_position(0);
 }
 
-=head3 remove_action
+=head2 $self->prepare_request(@arguments)
 
-Remove an action.
+Populate the context object from the request object.
 
-    $c->remove_action('!foo');
+=cut
+
+sub prepare_request { }
+
+=head2 $self->prepare_uploads($c)
 
 =cut
 
-sub remove_action {
-    my ( $self, $action ) = @_;
-    if ( delete $self->actions->{regex}->{$action} ) {
-        while ( my ( $regex, $name ) = each %{ $self->actions->{compiled} } ) {
-            if ( $name eq $action ) {
-                delete $self->actions->{compiled}->{$regex};
-                last;
-            }
+sub prepare_uploads {
+    my ( $self, $c ) = @_;
+    my $uploads = $c->request->{_body}->upload;
+    for my $name ( keys %$uploads ) {
+        my $files = $uploads->{$name};
+        $files = ref $files eq 'ARRAY' ? $files : [$files];
+        my @uploads;
+        for my $upload (@$files) {
+            my $u = Catalyst::Request::Upload->new;
+            $u->headers( HTTP::Headers->new( %{ $upload->{headers} } ) );
+            $u->type( $u->headers->content_type );
+            $u->tempname( $upload->{tempname} );
+            $u->size( $upload->{size} );
+            $u->filename( $upload->{filename} );
+            push @uploads, $u;
         }
-    }
-    else {
-        delete $self->actions->{plain}->{$action};
+        $c->request->uploads->{$name} = @uploads > 1 ? \@uploads : $uploads[0];
+
+        # support access to the filename as a normal param
+        my @filenames = map { $_->{filename} } @uploads;
+        $c->request->parameters->{$name} =
+          @filenames > 1 ? \@filenames : $filenames[0];
     }
 }
 
-=head3 request (req)
+=head2 $self->prepare_write($c)
 
-Returns a C<Catalyst::Request> object.
+Abstract method. Implemented by the engines.
 
-    my $req = $c->req;
+=cut
 
-=head3 response (res)
+sub prepare_write { }
 
-Returns a C<Catalyst::Response> object.
+=head2 $self->read($c, [$maxlength])
 
-    my $res = $c->res;
+=cut
 
-=head3 setup
+sub read {
+    my ( $self, $c, $maxlength ) = @_;
 
-Setup.
+    unless ( $self->{_prepared_read} ) {
+        $self->prepare_read($c);
+        $self->{_prepared_read} = 1;
+    }
 
-    MyApp->setup;
+    my $remaining = $self->read_length - $self->read_position;
+    $maxlength ||= $CHUNKSIZE;
 
-=cut
+    # Are we done reading?
+    if ( $remaining <= 0 ) {
+        $self->finalize_read($c);
+        return;
+    }
 
-sub setup {
-    my $self = shift;
-    $self->setup_components;
-    if ( $self->debug ) {
-        my $name = $self->config->{name} || 'Application';
-        $self->log->info("$name powered by Catalyst $Catalyst::VERSION");
+    my $readlen = ( $remaining > $maxlength ) ? $maxlength : $remaining;
+    my $rc = $self->read_chunk( $c, my $buffer, $readlen );
+    if ( defined $rc ) {
+        $self->read_position( $self->read_position + $rc );
+        return $buffer;
+    }
+    else {
+        Catalyst::Exception->throw(
+            message => "Unknown error reading input: $!" );
     }
 }
 
-=head3 setup_components
+=head2 $self->read_chunk($c, $buffer, $length)
 
-Setup components.
+Each engine inplements read_chunk as its preferred way of reading a chunk
+of data.
 
 =cut
 
-sub setup_components {
-    my $self = shift;
-
-    # Components
-    my $class = ref $self || $self;
-    eval <<"";
-        package $class;
-        import Module::Pluggable::Fast
-          name   => '_components',
-          search => [
-            '$class\::Controller', '$class\::C',
-            '$class\::Model',      '$class\::M',
-            '$class\::View',       '$class\::V'
-          ];
-
-    if ( my $error = $@ ) {
-        chomp $error;
-        $self->log->error(
-            qq/Couldn't initialize "Module::Pluggable::Fast", "$error"/);
-    }
-    $self->components( {} );
-    for my $component ( $self->_components($self) ) {
-        $self->components->{ ref $component } = $component;
-    }
-    $self->log->debug( 'Initialized components "'
-          . join( ' ', keys %{ $self->components } )
-          . '"' )
-      if $self->debug;
-}
+sub read_chunk { }
+
+=head2 $self->read_length
+
+The length of input data to be read.  This is obtained from the Content-Length
+header.
 
-=head3 stash
+=head2 $self->read_position
 
-Returns a hashref containing all your data.
+The amount of input data that has already been read.
 
-    $c->stash->{foo} ||= 'yada';
-    print $c->stash->{foo};
+=head2 $self->run($c)
+
+Start the engine. Implemented by the various engine classes.
 
 =cut
 
-sub stash {
-    my $self = shift;
-    if ( $_[0] ) {
-        my $stash = $_[1] ? {@_} : $_[0];
-        while ( my ( $key, $val ) = each %$stash ) {
-            $self->{stash}->{$key} = $val;
-        }
+sub run { }
+
+=head2 $self->write($c, $buffer)
+
+Writes the buffer to the client. Can only be called once for a request.
+
+=cut
+
+sub write {
+    my ( $self, $c, $buffer ) = @_;
+
+    unless ( $self->{_prepared_write} ) {
+        $self->prepare_write($c);
+        $self->{_prepared_write} = 1;
     }
-    return $self->{stash};
-}
 
-sub _prefix {
-    my ( $class, $name ) = @_;
-    my $prefix = _class2prefix($class);
-    $name = "$prefix/$name" if $prefix;
-    return $name;
+    print STDOUT $buffer;
 }
 
-sub _class2prefix {
-    my $class = shift;
-    $class =~ /^.*::[(M)(Model)(V)(View)(C)(Controller)]+::(.*)$/;
-    my $prefix = lc $1 || '';
-    $prefix =~ s/\:\:/_/g;
-    return $prefix;
-}
 
-=head1 AUTHOR
+=head2 $self->finalize_output
+
+<obsolete>, see finalize_body
+
+=head1 AUTHORS
+
+Sebastian Riedel, <sri@cpan.org>
 
-Sebastian Riedel, C<sri@cpan.org>
+Andy Grundman, <andy@hybridized.org>
 
 =head1 COPYRIGHT