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=18930dac4798d7ed09991a2697df49f72588c62a;hp=d22dc3c98131f22717f33d64cc9f4327c911ad2d;hb=74dafab798a163c251e09de7fcc21a267d1678a6;hpb=b22c66686d892bba76a150f727561f8778f3ea72

diff --git a/lib/Catalyst/Response.pm b/lib/Catalyst/Response.pm
index d22dc3c..18930da 100644
--- a/lib/Catalyst/Response.pm
+++ b/lib/Catalyst/Response.pm
@@ -3,7 +3,14 @@ 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(@_) }
+sub content_type     { shift->headers->content_type(@_) }
+sub header           { shift->headers->header(@_) }
 
 =head1 NAME
 
@@ -11,64 +18,116 @@ Catalyst::Response - Catalyst Response Class
 
 =head1 SYNOPSIS
 
-    $resp = $c->response;
-    $resp->cookies;
-    $resp->headers;
-    $resp->output;
-    $resp->redirect;
-    $resp->status;
+    $res = $c->response;
+    $res->body;
+    $res->content_encoding;
+    $res->content_length;
+    $res->content_type;
+    $res->cookies;
+    $res->header;
+    $res->headers;
+    $res->output;
+    $res->redirect;
+    $res->status;
+    $res->write;
 
 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->cookies
+=item $res->body($text)
+
+    $c->response->body('Catalyst rocks!');
+
+Contains the final output.
+
+=item $res->content_encoding
+
+Shortcut to $res->headers->content_encoding
 
-Returns a reference to a hash containing the cookies.
+=item $res->content_length
+
+Shortcut to $res->headers->content_length
+
+=item $res->content_type
+
+Shortcut to $res->headers->content_type
+
+=item $res->cookies
+
+Returns a reference to a hash containing the cookies to be set.
 
     $c->response->cookies->{foo} = { value => '123' };
 
-=item $resp->headers
+=item $res->header
+
+Shortcut to $res->headers->header
+
+=item $res->headers
 
 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 $res->output
 
-    $c->response->output('Catalyst rockz!');
+Shortcut to $res->body
 
-=item $resp->redirect($url)
+=item $res->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;
 
-=item status
+        $self->location($location);
+        $self->status($status);
+    }
+
+    return $self->location;
+}
+
+=item $res->status
 
 Contains the HTTP status.
 
     $c->response->status(404);
+    
+=item $res->write( $data )
+
+Writes $data to the output stream.
+
+=cut
+
+sub write { shift->{_context}->write(@_); }
 
 =back
 
 =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