X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FResponse.pm;h=e0d1a3bc474f5231d17bcdc126e5385f11e41f81;hb=d837e1a7eadff19ff04373ad19d22fa293e19db5;hp=236f70120589738f635b760db89ce96b4d28553d;hpb=61b1e958102e2371a79e07a7e2cdbb371797d202;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Response.pm b/lib/Catalyst/Response.pm
index 236f701..e0d1a3b 100644
--- a/lib/Catalyst/Response.pm
+++ b/lib/Catalyst/Response.pm
@@ -3,7 +3,9 @@ package Catalyst::Response;
 use strict;
 use base 'Class::Accessor::Fast';
 
-__PACKAGE__->mk_accessors(qw/cookies headers output redirect status/);
+__PACKAGE__->mk_accessors(qw/cookies body headers location status/);
+
+*output = \&body;
 
 sub content_encoding { shift->headers->content_encoding(@_) }
 sub content_length   { shift->headers->content_length(@_)   }
@@ -17,6 +19,7 @@ Catalyst::Response - Catalyst Response Class
 =head1 SYNOPSIS
 
     $resp = $c->response;
+    $resp->body;
     $resp->content_encoding;
     $resp->content_length;
     $resp->content_type;
@@ -38,6 +41,12 @@ to response data.
 
 =over 4
 
+=item $resp->body($text)
+
+    $c->response->body('Catalyst rocks!');
+
+Contains the final output.
+
 =item $resp->content_encoding
 
 Shortcut to $resp->headers->content_encoding
@@ -66,17 +75,32 @@ Returns a L<HTTP::Headers> object containing the headers.
 
     $c->response->headers->header( 'X-Catalyst' => $Catalyst::VERSION );
 
-=item $resp->output($text)
-
-Contains the final output.
+=item $resp->output
 
-    $c->response->output('Catalyst rocks!');
+Shortcut to $resp->body
 
-=item $resp->redirect($url)
+=item $resp->redirect( $url, $status )
 
 Contains a location to redirect to.
 
-    $c->response->redirect('http://slashdot.org');
+    $c->response->redirect( 'http://slashdot.org' );
+    $c->response->redirect( 'http://slashdot.org', 307 );
+
+=cut
+
+sub redirect {
+    my $self = shift;
+    
+    if ( @_ ) {
+        my $location = shift;
+        my $status   = shift || 302;
+
+        $self->location($location);
+        $self->status($status);
+    }
+
+    return $self->location;
+}
 
 =item status