X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=d1716efd6703f41a28a54eaf319509c3485db4f5;hb=6d1ab9154b299ce3697ec69d4ffd10dda4c07c0e;hp=67645242927aa130f9da93d07609f9a35f6891af;hpb=f88238ea2dbb6336a33f17ed3c72ea9204a6556d;p=catagits%2FCatalyst-Runtime.git
diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 6764524..d1716ef 100644
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -2,6 +2,7 @@ package Catalyst::Engine;
use strict;
use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
+use attributes ();
use UNIVERSAL::require;
use CGI::Cookie;
use Data::Dumper;
@@ -25,6 +26,9 @@ __PACKAGE__->mk_accessors(qw/request response state/);
*req = \&request;
*res = \&response;
+# For backwards compatibility
+*finalize_output = \&finalize_body;
+
# For statistics
our $COUNT = 1;
our $START = time;
@@ -122,7 +126,7 @@ Errors are available via $c->error.
sub execute {
my ( $c, $class, $code ) = @_;
- $class = $c->comp($class) || $class;
+ $class = $c->components->{$class} || $class;
$c->state(0);
my $callsub = ( caller(1) )[3];
@@ -175,20 +179,32 @@ sub finalize {
$c->finalize_error;
}
- if ( !$c->response->output && $c->response->status !~ /^(1|3)\d\d$/ ) {
+ if ( !$c->response->body && $c->response->status !~ /^(1|3)\d\d$/ ) {
$c->finalize_error;
}
- if ( $c->response->output && !$c->response->content_length ) {
+ if ( $c->response->body && !$c->response->content_length ) {
use bytes; # play safe with a utf8 aware perl
- $c->response->content_length( length $c->response->output );
+ $c->response->content_length( length $c->response->body );
}
my $status = $c->finalize_headers;
- $c->finalize_output;
+ $c->finalize_body;
return $status;
}
+=item $c->finalize_output
+
+alias to finalize_body
+
+=item $c->finalize_body
+
+Finalize body.
+
+=cut
+
+sub finalize_body { }
+
=item $c->finalize_cookies
Finalize cookies.
@@ -259,7 +275,7 @@ sub finalize_error {
$name = '';
}
- $c->res->output( <<"" );
+ $c->res->body( <<"" );
$title
@@ -323,15 +339,7 @@ Finalize headers.
sub finalize_headers { }
-=item $c->finalize_output
-
-Finalize output.
-
-=cut
-
-sub finalize_output { }
-
-=item $c->handler( $class, $r )
+=item $c->handler( $class, $engine )
Handles the request.
@@ -387,7 +395,7 @@ into a Catalyst context .
=cut
sub prepare {
- my ( $class, $r ) = @_;
+ my ( $class, $engine ) = @_;
my $c = bless {
request => Catalyst::Request->new(
@@ -416,21 +424,38 @@ sub prepare {
$c->res->headers->header( 'X-Catalyst' => $Catalyst::VERSION );
}
- $c->prepare_request($r);
+ $c->prepare_request($engine);
$c->prepare_path;
$c->prepare_headers;
$c->prepare_cookies;
$c->prepare_connection;
+ $c->prepare_action;
my $method = $c->req->method || '';
my $path = $c->req->path || '';
my $hostname = $c->req->hostname || '';
my $address = $c->req->address || '';
+
$c->log->debug(qq/"$method" request for "$path" from $hostname($address)/)
if $c->debug;
- $c->prepare_action;
- $c->prepare_parameters;
+ if ( $c->request->method eq 'POST' and $c->request->content_length ) {
+
+ if ( $c->req->content_type eq 'application/x-www-form-urlencoded' ) {
+ $c->prepare_parameters;
+ }
+ elsif ( $c->req->content_type eq 'multipart/form-data' ) {
+ $c->prepare_parameters;
+ $c->prepare_uploads;
+ }
+ else {
+ $c->prepare_body;
+ }
+ }
+
+ if ( $c->request->method eq 'GET' ) {
+ $c->prepare_parameters;
+ }
if ( $c->debug && keys %{ $c->req->params } ) {
my $t = Text::ASCIITable->new;
@@ -438,13 +463,13 @@ sub prepare {
$t->setColWidth( 'Key', 37, 1 );
$t->setColWidth( 'Value', 36, 1 );
for my $key ( keys %{ $c->req->params } ) {
- my $value = $c->req->params->{$key} || '';
+ my $param = $c->req->params->{$key};
+ my $value = defined($param) ? $param : '';
$t->addRow( $key, $value );
}
$c->log->debug( 'Parameters are', $t->draw );
}
- $c->prepare_uploads;
return $c;
}
@@ -498,6 +523,14 @@ sub prepare_action {
if ( $c->debug && @args );
}
+=item $c->prepare_body
+
+Prepare message body.
+
+=cut
+
+sub prepare_body { }
+
=item $c->prepare_connection
Prepare connection.