use strict;
use base 'Class::Accessor::Fast';
+use Catalyst::Exception;
use File::Copy ();
use IO::File ();
+use File::Spec::Unix;
-__PACKAGE__->mk_accessors(qw/filename size tempname type/);
+__PACKAGE__->mk_accessors(qw/filename headers size tempname type basename/);
+sub new { shift->SUPER::new( ref( $_[0] ) ? $_[0] : {@_} ) }
=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>.
-=item $upload->new
+=head1 DESCRIPTION
-Constructor. Normally only for engine use.
+This class provides accessors and methods to handle client upload requests.
-=cut
+=head1 METHODS
-sub new { shift->SUPER::new( ref( $_[0] ) ? $_[0] : {@_} ) }
+=head2 $upload->new
+
+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');
return File::Copy::copy( $self->tempname, @_ );
}
-=item $upload->fh
+=head2 $upload->fh
-Opens tempname and returns a C<IO::File> handle.
+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 )
- 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;
}
-=item $upload->filename
+=head2 $upload->filename
+
+Returns the client-supplied filename.
-Contains client supplied filename.
+=head2 $upload->headers
-=item $upload->link_to
+Returns an L<HTTP::Headers> object for the request.
-Creates a hard link to the tempname. Returns true for success,
-false otherwise.
+=head2 $upload->link_to
+
+Creates a hard link to the temporary file. Returns true for success,
+false for failure.
$upload->link_to('/path/to/target');
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';
}
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};
+}
+
+=head2 $upload->basename
+
+Returns basename for C<filename>.
-=item $upload->type
+=head2 $upload->tempname
-Contains client supplied Content-Type.
+Returns the path to the temporary file.
-=back
+=head2 $upload->type
-=head1 AUTHOR
+Returns the client-supplied Content-Type.
+
+=head1 AUTHORS
Sebastian Riedel, C<sri@cpan.org>
+
Christian Hansen, C<ch@ngmedia.com>
=head1 COPYRIGHT