Added recursive -r flag to prove example

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Response.pm

diff --git a/lib/Catalyst/Response.pm b/lib/Catalyst/Response.pm
index a84e3c8..e0d1a3b 100644 (file)
--- 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(@_)   }
@@ -39,9 +41,11 @@ to response data.
 
 =over 4
 
-=item $resp->body
+=item $resp->body($text)
+
+    $c->response->body('Catalyst rocks!');
 
-Shortcut for $resp->output.
+Contains the final output.
 
 =item $resp->content_encoding
 
@@ -71,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