X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FRequest%2FUpload.pm;h=d496aa1f25f84f5ae40bcfbf6cb3449438596d5d;hp=a31df3d5ad7e692c2597c11b93a31cf6e17ce8f7;hb=059c085bfcead450e70ace9ef193aa99ac2ab37d;hpb=32d4bba8cb8276572093428eef50bf0bda59aa3d

diff --git a/lib/Catalyst/Request/Upload.pm b/lib/Catalyst/Request/Upload.pm
index a31df3d..d496aa1 100644
--- a/lib/Catalyst/Request/Upload.pm
+++ b/lib/Catalyst/Request/Upload.pm
@@ -1,51 +1,84 @@
 package Catalyst::Request::Upload;
 
 use strict;
-use base 'Class::Accessor::Fast';
 
+use Catalyst::Exception;
 use File::Copy ();
 use IO::File   ();
+use File::Spec::Unix;
+
+use Moose;
+
+has filename  => (is => 'rw');
+has headers   => (is => 'rw');
+has size      => (is => 'rw');
+has tempname  => (is => 'rw');
+has type      => (is => 'rw');
+has basename  => (is => 'rw');
+
+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 size tempname type/);
+    return $fh;
+  },
+);
 
+no Moose;
 
 =head1 NAME
 
-Catalyst::Request::Upload - Catalyst Request Upload Class
+Catalyst::Request::Upload - handles file upload requests
 
 =head1 SYNOPSIS
 
-    $upload->copy_to
-    $upload->fh
+    $upload->basename;
+    $upload->copy_to;
+    $upload->fh;
     $upload->filename;
+    $upload->headers;
     $upload->link_to;
     $upload->size;
     $upload->slurp;
     $upload->tempname;
     $upload->type;
 
-See also L<Catalyst>.
+To specify where Catalyst should put the temporary files, set the 'uploadtmp'
+option in the Catalyst config. If unset, Catalyst will use the system temp dir.
 
-=head1 DESCRIPTION
+    __PACKAGE__->config( uploadtmp => '/path/to/tmpdir' );
 
-This is the Catalyst Request Upload class, which provides a set of accessors 
-to the upload data.
+It is provided a way to have configurable temporary directory.
+If there is no config uploadtmp, system temprary directory will used.
 
-=head1 METHODS
+    __PACKAGE__->config( uploadtmp => '/path/to/tmpdir' );
 
-=over 4
+See also L<Catalyst>.
+
+=head1 DESCRIPTION
 
-=item $upload->new
+This class provides accessors and methods to handle client upload requests.
 
-Constructor. Normally only for engine use.
+=head1 METHODS
 
-=cut 
+=head2 $upload->new
 
-sub new { shift->SUPER::new( ref( $_[0] ) ? $_[0] : {@_} ) }
+Simple constructor.
 
-=item $upload->copy_to
+=head2 $upload->copy_to
 
-Copies tempname using C<File::Copy>. Returns true for success, false otherwise.
+Copies the temporary file using L<File::Copy>. Returns true for success,
+false for failure.
 
      $upload->copy_to('/path/to/target');
 
@@ -56,29 +89,22 @@ sub copy_to {
     return File::Copy::copy( $self->tempname, @_ );
 }
 
-=item $upload->fh
-
-Opens tempname and returns a C<IO::File> handle.
-
-=cut
+=head2 $upload->fh
 
-sub fh {
-    my $self = shift;
+Opens a temporary file (see tempname below) and returns an L<IO::File> handle.
 
-    my $fh = IO::File->new( $self->tempname, IO::File::O_RDONLY )
-      or die( "Can't open ", $self->tempname, ": ", $! );
+=head2 $upload->filename
 
-    return $fh;
-}
+Returns the client-supplied filename.
 
-=item $upload->filename
+=head2 $upload->headers
 
-Contains client supplied filename.
+Returns an L<HTTP::Headers> object for the request.
 
-=item $upload->link_to
+=head2 $upload->link_to
 
-Creates a hard link to the tempname.  Returns true for success, 
-false otherwise.
+Creates a hard link to the temporary file. Returns true for success, 
+false for failure.
 
     $upload->link_to('/path/to/target');
 
@@ -89,20 +115,20 @@ sub link_to {
     return CORE::link( $self->tempname, $target );
 }
 
-=item $upload->size
+=head2 $upload->size
 
-Contains size of the file in bytes.
+Returns the size of the uploaded file in bytes.
 
-=item $upload->slurp
+=head2 $upload->slurp
 
-Returns a scalar containing contents of tempname.
+Returns a scalar containing the contents of the temporary file.
 
 =cut
 
 sub slurp {
     my ( $self, $layer ) = @_;
 
-    unless ( $layer ) {
+    unless ($layer) {
         $layer = ':raw';
     }
 
@@ -118,19 +144,39 @@ sub slurp {
     return $content;
 }
 
-=item $upload->tempname
+sub basename {
+    my $self = shift;
+    unless ( $self->{basename} ) {
+        my $basename = $self->filename;
+        $basename =~ s|\\|/|g;
+        $basename = ( File::Spec::Unix->splitpath($basename) )[2];
+        $basename =~ s|[^\w\.-]+|_|g;
+        $self->{basename} = $basename;
+    }
 
-Contains path to the temporary spool file.
+    return $self->{basename};
+}
 
-=item $upload->type
+=head2 $upload->basename
 
-Contains client supplied Content-Type.
+Returns basename for C<filename>.
 
-=back
+=head2 $upload->tempname
 
-=head1 AUTHOR
+Returns the path to the temporary file.
+
+=head2 $upload->type
+
+Returns the client-supplied Content-Type.
+
+=head2 meta
+
+Provided by Moose
+
+=head1 AUTHORS
 
 Sebastian Riedel, C<sri@cpan.org>
+
 Christian Hansen, C<ch@ngmedia.com>
 
 =head1 COPYRIGHT