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=e2862da8def069f3c160781cfffc95f92d583a68;hp=d22dc3c98131f22717f33d64cc9f4327c911ad2d;hb=640faa87f0c572b58acd22124bfa6f6c59106873;hpb=b22c66686d892bba76a150f727561f8778f3ea72

diff --git a/lib/Catalyst/Response.pm b/lib/Catalyst/Response.pm
index d22dc3c..e2862da 100644
--- a/lib/Catalyst/Response.pm
+++ b/lib/Catalyst/Response.pm
@@ -3,72 +3,150 @@ 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
 
-Catalyst::Response - Catalyst Response Class
+Catalyst::Response - stores output responding to the current client request
 
 =head1 SYNOPSIS
 
-    $resp = $c->response;
-    $resp->cookies;
-    $resp->headers;
-    $resp->output;
-    $resp->redirect;
-    $resp->status;
-
-See also L<Catalyst::Application>.
+    $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;
 
 =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 methods for responding to
+the current client request.
 
 =head1 METHODS
 
 =over 4
 
-=item $resp->cookies
+=item $res->body($text)
+
+    $c->response->body('Catalyst rocks!');
+
+Sets or returns the output (text or binary data).
+
+=item $res->content_encoding
+
+Shortcut for $res->headers->content_encoding.
+
+=item $res->content_length
+
+Shortcut for $res->headers->content_length.
 
-Returns a reference to a hash containing the cookies.
+=item $res->content_type
+
+Shortcut for $res->headers->content_type.
+
+=item $res->cookies
+
+Returns a reference to a hash containing cookies to be set. The keys of the
+hash are the cookies' names, and their corresponding values are hash
+references used to construct a L<CGI::Cookie> object.
 
     $c->response->cookies->{foo} = { value => '123' };
 
-=item $resp->headers
+The keys of the hash reference on the right correspond to the L<CGI::Cookie>
+parameters of the same name, except they are used without a leading dash.
+Possible parameters are:
+
+=over 4
+
+=item value
+
+=item expires
+
+=item domain
 
-Returns a L<HTTP::Headers> object containing the headers.
+=item path
+
+=item secure
+
+=back
+
+=item $res->header
+
+Shortcut for $res->headers->header.
+
+=item $res->headers
+
+Returns an L<HTTP::Headers> object, which can be used to set headers.
 
     $c->response->headers->header( 'X-Catalyst' => $Catalyst::VERSION );
 
-=item $resp->output($text)
+=item $res->output
 
-Contains the final output.
+Alias for $res->body.
 
-    $c->response->output('Catalyst rockz!');
+=item $res->redirect( $url, $status )
 
-=item $resp->redirect($url)
+Causes the response to redirect to the specified URL.
 
-Contains a location to redirect to.
+    $c->response->redirect( 'http://slashdot.org' );
+    $c->response->redirect( 'http://slashdot.org', 307 );
+
+=cut
 
-    $c->response->redirect('http://slashdot.org');
+sub redirect {
+    my $self = shift;
 
-=item status
+    if (@_) {
+        my $location = shift;
+        my $status   = shift || 302;
 
-Contains the HTTP status.
+        $self->location($location);
+        $self->status($status);
+    }
+
+    return $self->location;
+}
+
+=item $res->status
+
+Sets or returns 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
+=head1 AUTHORS
 
 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