X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FResponse.pm;h=3af1eef965d39a2d42036364d22f904c85a9b8a7;hb=eb1f4b491f735a82e8f1279e96c5ba4f6bf5365c;hp=185dc99727b309c32e00876156f9dc5a511edd1b;hpb=9c4288eaedee0bba8e4a123b4664bc07a4b5c24c;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Response.pm b/lib/Catalyst/Response.pm index 185dc99..3af1eef 100644 --- a/lib/Catalyst/Response.pm +++ b/lib/Catalyst/Response.pm @@ -26,7 +26,26 @@ has _writer => ( predicate => '_has_writer', ); -sub DEMOLISH { $_[0]->_writer->close if $_[0]->_has_writer } +has write_fh => ( + is=>'ro', + predicate=>'has_write_fh', + lazy=>1, + builder=>'_build_write_fh'); + + sub _build_write_fh { + my $self = shift; + $self->_context->finalize_headers unless + $self->finalized_headers; + $self->_writer; + }; + +sub DEMOLISH { + my $self = shift; + return if $self->has_write_fh; + if($self->_has_writer) { + $self->_writer->close + } +} has cookies => (is => 'rw', default => sub { {} }); has body => (is => 'rw', default => undef); @@ -53,17 +72,11 @@ sub output { shift->body(@_) } sub code { shift->status(@_) } -=head2 $self->write($buffer) - -Writes the buffer to the client. - -=cut - sub write { my ( $self, $buffer ) = @_; # Finalize headers if someone manually writes output - $self->finalize_headers; + $self->_context->finalize_headers unless $self->finalized_headers; $buffer = q[] unless defined $buffer; @@ -73,12 +86,6 @@ sub write { return $len; } -=head2 $self->finalize_headers($c) - -Abstract method, allows engines to write headers to response - -=cut - sub finalize_headers { my ($self) = @_; @@ -258,11 +265,49 @@ $res->code is an alias for this, to match HTTP::Response->code. Writes $data to the output stream. +=head2 $res->write_fh + +Returns a PSGI $writer object that has two methods, write and close. You can +close over this object for asynchronous and nonblocking applications. For +example (assuming you are using a supporting server, like L + + package AsyncExample::Controller::Root; + + use Moose; + + BEGIN { extends 'Catalyst::Controller' } + + sub prepare_cb { + my $write_fh = pop; + return sub { + my $message = shift; + $write_fh->write("Finishing: $message\n"); + $write_fh->close; + }; + } + + sub anyevent :Local :Args(0) { + my ($self, $c) = @_; + my $cb = $self->prepare_cb($c->res->write_fh); + + my $watcher; + $watcher = AnyEvent->timer( + after => 5, + cb => sub { + $cb->(scalar localtime); + undef $watcher; # cancel circular-ref + }); + } + =head2 $res->print( @data ) Prints @data to the output stream, separated by $,. This lets you pass the response object to functions that want to write to an L. +=head2 $self->finalize_headers($c) + +Writes headers to response if not already written + =head2 DEMOLISH Ensures that the response is flushed and closed at the end of the