X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FRequest%2FUpload.pm;h=d8e58bea7e0f7834b39ad0b9048d648b482d1e52;hb=965f3e35b1f8287990aeb8f102ebc0bc107e11e8;hp=a3e6f5565b11c5ad2a25ff1314d5120e31789bf6;hpb=7257e9dbc2d2550e43b0ddeb1027360428a3c44f;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Request/Upload.pm b/lib/Catalyst/Request/Upload.pm
index a3e6f55..d8e58be 100644
--- a/lib/Catalyst/Request/Upload.pm
+++ b/lib/Catalyst/Request/Upload.pm
@@ -1,15 +1,51 @@
 package Catalyst::Request::Upload;
 
-use strict;
-use base 'Class::Accessor::Fast';
+use Moose;
+with 'MooseX::Emulate::Class::Accessor::Fast';
 
 use Catalyst::Exception;
 use File::Copy ();
-use IO::File   ();
+use IO::File ();
+use File::Spec::Unix;
+use namespace::clean -except => 'meta';
+
+has filename => (is => 'rw');
+has headers => (is => 'rw');
+has size => (is => 'rw');
+has tempname => (is => 'rw');
+has type => (is => 'rw');
+has basename => (is => 'ro', lazy_build => 1);
+
+has fh => (
+  is => 'rw',
+  required => 1,
+  lazy => 1,
+  default => sub {
+    my $self = shift;
+
+    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': '$!'/ );
+    }
 
-__PACKAGE__->mk_accessors(qw/filename headers size tempname type/);
+    return $fh;
+  },
+);
+
+sub _build_basename {
+    my $self = shift;
+    my $basename = $self->filename;
+    $basename =~ s|\\|/|g;
+    $basename = ( File::Spec::Unix->splitpath($basename) )[2];
+    $basename =~ s|[^\w\.-]+|_|g;
+    return $basename;
+}
 
-sub new { shift->SUPER::new( ref( $_[0] ) ? $_[0] : {@_} ) }
+no Moose;
+
+=for stopwords uploadtmp
 
 =head1 NAME
 
@@ -17,6 +53,9 @@ Catalyst::Request::Upload - handles file upload requests
 
 =head1 SYNOPSIS
 
+    my $upload = $c->req->upload('field');
+
+    $upload->basename;
     $upload->copy_to;
     $upload->fh;
     $upload->filename;
@@ -62,24 +101,6 @@ sub copy_to {
 
 Opens a temporary file (see tempname below) and returns an L<IO::File> handle.
 
-=cut
-
-sub fh {
-    my $self = shift;
-
-    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;
-}
-
 =head2 $upload->filename
 
 Returns the client-supplied filename.
@@ -90,7 +111,7 @@ Returns an L<HTTP::Headers> object for the request.
 
 =head2 $upload->link_to
 
-Creates a hard link to the temporary file. Returns true for success, 
+Creates a hard link to the temporary file. Returns true for success,
 false for failure.
 
     $upload->link_to('/path/to/target');
@@ -110,6 +131,10 @@ Returns the size of the uploaded file in bytes.
 
 Returns a scalar containing the contents of the temporary file.
 
+Note that this will cause the filehandle pointed to by C<< $upload->fh >> to
+be reset to the start of the file using seek and the file handle to be put
+into binary mode.
+
 =cut
 
 sub slurp {
@@ -124,13 +149,19 @@ sub slurp {
 
     binmode( $handle, $layer );
 
+    $handle->seek(0, IO::File::SEEK_SET);
     while ( $handle->sysread( my $buffer, 8192 ) ) {
         $content .= $buffer;
     }
 
+    $handle->seek(0, IO::File::SEEK_SET);
     return $content;
 }
 
+=head2 $upload->basename
+
+Returns basename for C<filename>.
+
 =head2 $upload->tempname
 
 Returns the path to the temporary file.
@@ -139,17 +170,21 @@ Returns the path to the temporary file.
 
 Returns the client-supplied Content-Type.
 
-=head1 AUTHORS
+=head2 meta
 
-Sebastian Riedel, C<sri@cpan.org>
+Provided by Moose
 
-Christian Hansen, C<ch@ngmedia.com>
+=head1 AUTHORS
+
+Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT
 
-This program is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
 it under the same terms as Perl itself.
 
 =cut
 
+__PACKAGE__->meta->make_immutable;
+
 1;