Added $upload->slurp and tests

diff --git a/lib/Catalyst/Request/Upload.pm b/lib/Catalyst/Request/Upload.pm
index 5891332..a31df3d 100644 (file)
--- a/lib/Catalyst/Request/Upload.pm
+++ b/lib/Catalyst/Request/Upload.pm
@@ -20,6 +20,7 @@ Catalyst::Request::Upload - Catalyst Request Upload Class
     $upload->filename;
     $upload->link_to;
     $upload->size;
+    $upload->slurp;
     $upload->tempname;
     $upload->type;
 
@@ -92,6 +93,31 @@ sub link_to {
 
 Contains size of the file in bytes.
 
+=item $upload->slurp
+
+Returns a scalar containing contents of tempname.
+
+=cut
+
+sub slurp {
+    my ( $self, $layer ) = @_;
+
+    unless ( $layer ) {
+        $layer = ':raw';
+    }
+
+    my $content = undef;
+    my $handle  = $self->fh;
+
+    binmode( $handle, $layer );
+
+    while ( $handle->sysread( my $buffer, 8192 ) ) {
+        $content .= $buffer;
+    }
+
+    return $content;
+}
+
 =item $upload->tempname
 
 Contains path to the temporary spool file.

diff --git a/t/engine/request/uploads.t b/t/engine/request/uploads.t
index adb43d2..f24b60b 100644 (file)
--- a/t/engine/request/uploads.t
+++ b/t/engine/request/uploads.t
@@ -6,7 +6,7 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../lib";
 
-use Test::More tests => 39;
+use Test::More tests => 43;
 use Catalyst::Test 'TestApp';
 
 use Catalyst::Request;
@@ -99,3 +99,19 @@ use HTTP::Request::Common;
         is( $upload->size, length( $part->content ), 'Upload Content-Length' );
     }
 }
+
+{
+    my $creq;
+
+    my $request = POST( 'http://localhost/engine/request/uploads/slurp',
+        'Content-Type' => 'multipart/form-data',
+        'Content'      => [
+            'slurp' => [ "$FindBin::Bin/uploads.t" ],
+         ]
+    );
+
+    ok( my $response = request($request), 'Request' );
+    ok( $response->is_success, 'Response Successful 2xx' );
+    is( $response->content_type, 'text/plain', 'Response Content-Type' );
+    is( $response->content, ($request->parts)[0]->content, 'Content' );
+}

diff --git a/t/lib/TestApp/Controller/Engine/Request/Uploads.pm b/t/lib/TestApp/Controller/Engine/Request/Uploads.pm
new file mode 100644 (file)
index 0000000..fbd4acf
--- /dev/null
+++ b/t/lib/TestApp/Controller/Engine/Request/Uploads.pm
@@ -0,0 +1,12 @@
+package TestApp::Controller::Engine::Request::Uploads;
+
+use strict;
+use base 'Catalyst::Base';
+
+sub slurp : Relative {
+    my ( $self, $c ) = @_;
+    $c->response->content_type('text/plain; charset=utf-8');
+    $c->response->output( $c->request->upload('slurp')->slurp );
+}
+
+1;