added input streaming support to Mojo::Content

Changes

@@ -20,6 +20,7 @@ This file documents the revision history for Perl extension Mojo.
         - Added callback tests. (melo)
         - Added support for MOJO_CHUNK_SIZE=1. (melo)
         - Added not_found.html.* templates.
+        - Added input streaming support to Mojo::Content.
         - Updated Mojolicious lite_app generator to use .ep templates.
         - Fixed param to be CGI.pm compatible.
         - Fixed a few cases where exceptions and not found events would

lib/Mojo/Command/Cgi.pm

@@ -33,7 +33,7 @@ sub run {
     # Run
     $cgi->run;
 
-    return shift;
+    return $self;
 }
 
 1;

lib/Mojo/Command/Get.pm

@@ -0,0 +1,84 @@
+# Copyright (C) 2008-2009, Sebastian Riedel.
+
+package Mojo::Command::Get;
+
+use strict;
+use warnings;
+
+use base 'Mojo::Command';
+
+use Mojo::Client;
+use Mojo::Transaction::Single;
+
+__PACKAGE__->attr(description => <<'EOF');
+Get file from URL.
+EOF
+__PACKAGE__->attr(usage => <<"EOF");
+usage: $0 get [URL]
+EOF
+
+# I hope this has taught you kids a lesson: kids never learn.
+sub run {
+    my ($self, $url) = @_;
+
+    # URL
+    die $self->usage unless $url;
+
+    # Client
+    my $client = Mojo::Client->new;
+
+    # Transaction
+    my $tx = Mojo::Transaction::Single->new;
+    $tx->req->method('GET');
+    $tx->req->url->parse($url);
+    $tx->res->body(sub { print $_[1] });
+
+    # Request
+    $client->process($tx);
+
+    return $self;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+Mojo::Command::Get - Get Command
+
+=head1 SYNOPSIS
+
+    use Mojo::Command::Get;
+
+    my $get = Mojo::Command::Get->new;
+    $get->run(@ARGV);
+
+=head1 DESCRIPTION
+
+L<Mojo::Command::Get> is a command interface to L<Mojo::Client>.
+
+=head1 ATTRIBUTES
+
+L<Mojo::Command::Get> inherits all attributes from L<Mojo::Command> and
+implements the following new ones.
+
+=head2 C<description>
+
+    my $description = $get->description;
+    $get            = $get->description('Foo!');
+
+=head2 C<usage>
+
+    my $usage = $get->usage;
+    $get      = $get->usage('Foo!');
+
+=head1 METHODS
+
+L<Mojo::Command::Get> inherits all methods from L<Mojo::Command> and implements
+the following new ones.
+
+=head2 C<run>
+
+    $get = $get->run(@ARGV);
+
+=cut

lib/Mojo/Content.pm

@@ -19,7 +19,9 @@ __PACKAGE__->attr([qw/body_cb filter progress_cb/]);
 __PACKAGE__->attr([qw/buffer filter_buffer/] => sub { Mojo::Buffer->new });
 __PACKAGE__->attr(headers                    => sub { Mojo::Headers->new });
 __PACKAGE__->attr(raw_header_size            => 0);
+__PACKAGE__->attr(relaxed                    => 0);
 
+__PACKAGE__->attr(_body_size => 0);
 __PACKAGE__->attr('_eof');
 
 sub body_contains {
@@ -180,6 +182,38 @@ sub parse {
     # Not chunked, pass through
     else { $self->buffer($self->filter_buffer) }
 
+    # Custom body parser
+    if (my $cb = $self->body_cb) {
+
+        # Chunked or relaxed content
+        if ($self->is_chunked || $self->relaxed) {
+            $self->$cb($self->buffer->empty);
+        }
+
+        # Normal content
+        else {
+
+            # Need
+            my $length = $self->headers->content_length || 0;
+            my $need = $length - $self->_body_size;
+
+            # Slurp
+            if ($need > 0) {
+                my $chunk = $self->buffer->remove($need);
+                $self->_body_size($self->_body_size + length $chunk);
+                $self->$cb($chunk);
+            }
+
+            # Done
+            $self->done if $length <= $self->raw_body_size;
+        }
+    }
+
+    # Leftovers
+    if ($self->is_done) {
+        $self->state('done_with_leftovers') if $self->has_leftovers;
+    }
+
     return $self;
 }
 
@@ -294,6 +328,11 @@ implements the following new ones.
         print '+';
     });
 
+=head2 C<relaxed>
+
+    my $relaxed = $content->relaxed;
+    $content    = $content->relaxed(1);
+
 =head2 C<raw_header_size>
 
     my $size = $content->raw_header_size;

lib/Mojo/Content/MultiPart.pm

@@ -128,12 +128,16 @@ sub get_body_chunk {
 sub parse {
     my $self = shift;
 
-    # Upgrade state
-    $self->state('multipart_preamble') if $self->is_state('body');
-
     # Parse headers and filter body
     $self->SUPER::parse(@_);
 
+    # Custom body parser
+    return $self if $self->body_cb;
+
+    # Upgrade state
+    $self->state('multipart_preamble') if $self->is_state('body');
+
+    # Parse multipart content
     $self->_parse_multipart;
 
     return $self;

lib/Mojo/Content/Single.pm

@@ -15,7 +15,6 @@ use Mojo::Content::MultiPart;
 use constant MAX_MEMORY_SIZE => $ENV{MOJO_MAX_MEMORY_SIZE} || 10240;
 
 __PACKAGE__->attr(asset => sub { Mojo::Asset::Memory->new });
-__PACKAGE__->attr(relaxed => 0);
 
 sub body_contains {
     my ($self, $chunk) = @_;
@@ -48,8 +47,8 @@ sub parse {
     # Parse headers and filter body
     $self->SUPER::parse(@_);
 
-    # Still parsing headers
-    return $self if $self->is_state('headers');
+    # Still parsing headers or using a custom body parser
+    return $self if $self->is_state('headers') || $self->body_cb;
 
     # Make sure we don't waste memory
     if ($self->asset->isa('Mojo::Asset::Memory')) {
@@ -121,11 +120,6 @@ implements the following new ones.
     my $asset = $content->asset;
     $content  = $content->asset(Mojo::Asset::Memory->new);
 
-=head2 C<relaxed>
-
-    my $relaxed = $content->relaxed;
-    $content    = $content->relaxed(1);
-
 =head1 METHODS
 
 L<Mojo::Content::Single> inherits all methods from L<Mojo::Content> and