Missed some changes, merged again from r1019

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Request / Upload.pm

diff --git a/lib/Catalyst/Request/Upload.pm b/lib/Catalyst/Request/Upload.pm
index a31df3d..25e6d89 100644 (file)
--- a/lib/Catalyst/Request/Upload.pm
+++ b/lib/Catalyst/Request/Upload.pm
@@ -3,11 +3,13 @@ package Catalyst::Request::Upload;
 use strict;
 use base 'Class::Accessor::Fast';
 
+use Catalyst::Exception;
 use File::Copy ();
 use IO::File   ();
 
-__PACKAGE__->mk_accessors(qw/filename size tempname type/);
+__PACKAGE__->mk_accessors(qw/filename headers size tempname type/);
 
+sub new { shift->SUPER::new( ref( $_[0] ) ? $_[0] : {@_} ) }
 
 =head1 NAME
 
@@ -18,6 +20,7 @@ Catalyst::Request::Upload - Catalyst Request Upload Class
     $upload->copy_to
     $upload->fh
     $upload->filename;
+    $upload->headers;
     $upload->link_to;
     $upload->size;
     $upload->slurp;
@@ -37,11 +40,7 @@ to the upload data.
 
 =item $upload->new
 
-Constructor. Normally only for engine use.
-
-=cut 
-
-sub new { shift->SUPER::new( ref( $_[0] ) ? $_[0] : {@_} ) }
+simple constructor.
 
 =item $upload->copy_to
 
@@ -65,8 +64,15 @@ Opens tempname and returns a C<IO::File> handle.
 sub fh {
     my $self = shift;
 
-    my $fh = IO::File->new( $self->tempname, IO::File::O_RDONLY )
-      or die( "Can't open ", $self->tempname, ": ", $! );
+    my $fh = IO::File->new( $self->tempname, IO::File::O_RDONLY );
+
+    unless ( defined $fh ) {
+
+        my $filename = $self->tempname;
+
+        Catalyst::Exception->throw(
+            message => qq/Can't open '$filename': '$!'/ );
+    }
 
     return $fh;
 }
@@ -75,6 +81,10 @@ sub fh {
 
 Contains client supplied filename.
 
+=item $upload->headers
+
+Returns a C<HTTP::Headers> object.
+
 =item $upload->link_to
 
 Creates a hard link to the tempname.  Returns true for success, 
@@ -102,7 +112,7 @@ Returns a scalar containing contents of tempname.
 sub slurp {
     my ( $self, $layer ) = @_;
 
-    unless ( $layer ) {
+    unless ($layer) {
         $layer = ':raw';
     }