X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FResponse.pm;h=e0d1a3bc474f5231d17bcdc126e5385f11e41f81;hp=766ef44f338a9471152c61f22b0104465b42a529;hb=21465c884872c1ec8c30acd72796445f9eaacb31;hpb=aa64badacdc24647a55bf96f3e682fdaf9461e22

diff --git a/lib/Catalyst/Response.pm b/lib/Catalyst/Response.pm
index 766ef44..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;
@@ -31,13 +34,19 @@ See also L<Catalyst::Application>.
 
 =head1 DESCRIPTION
 
-This is the Catalyst Response class, which provides a set of accessors to
-response data.
+This is the Catalyst Response class, which provides a set of accessors
+to response data.
 
 =head1 METHODS
 
 =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
@@ -52,7 +61,7 @@ Shortcut to $resp->headers->content_type
 
 =item $resp->cookies
 
-Returns a reference to a hash containing the cookies.
+Returns a reference to a hash containing the cookies to be set.
 
     $c->response->cookies->{foo} = { value => '123' };
 
@@ -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 rockz!');
+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
 
@@ -89,11 +113,12 @@ Contains the HTTP status.
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@cpan.org>
+Marcus Ramberg, C<mramberg@cpan.org>
 
 =head1 COPYRIGHT
 
-This program is free software, you can redistribute it and/or modify it under
-the same terms as Perl itself.
+This program is free software, you can redistribute it and/or modify 
+it under the same terms as Perl itself.
 
 =cut