X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FRequest%2FUpload.pm;h=167553136c499604053b84dd324baeb666187692;hb=0fd00e7bbc4486802b14242c4fcc53214db7818d;hp=4d46417f4871485cd86aa5ff60e2b07e471eec20;hpb=0fc2d522eec43202c21e9f0062e43f10db4d9008;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Request/Upload.pm b/lib/Catalyst/Request/Upload.pm index 4d46417..1675531 100644 --- a/lib/Catalyst/Request/Upload.pm +++ b/lib/Catalyst/Request/Upload.pm @@ -1,11 +1,11 @@ package Catalyst::Request::Upload; -use Class::C3; use Moose; +with 'MooseX::Emulate::Class::Accessor::Fast'; use Catalyst::Exception; use File::Copy (); -use IO::File (); +use IO::File qw( SEEK_SET ); use File::Spec::Unix; has filename => (is => 'rw'); @@ -13,7 +13,7 @@ has headers => (is => 'rw'); has size => (is => 'rw'); has tempname => (is => 'rw'); has type => (is => 'rw'); -has basename => (is => 'rw'); +has basename => (is => 'ro', lazy_build => 1); has fh => ( is => 'rw', @@ -33,6 +33,15 @@ has 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; +} + no Moose; =head1 NAME @@ -41,6 +50,8 @@ Catalyst::Request::Upload - handles file upload requests =head1 SYNOPSIS + my $upload = $c->req->upload('field'); + $upload->basename; $upload->copy_to; $upload->fh; @@ -57,11 +68,6 @@ option in the Catalyst config. If unset, Catalyst will use the system temp dir. __PACKAGE__->config( uploadtmp => '/path/to/tmpdir' ); -It is provided a way to have configurable temporary directory. -If there is no config uploadtmp, system temprary directory will used. - - __PACKAGE__->config( uploadtmp => '/path/to/tmpdir' ); - See also L. =head1 DESCRIPTION @@ -102,7 +108,7 @@ Returns an L 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'); @@ -122,6 +128,10 @@ Returns the size of the uploaded file in bytes. Returns a scalar containing the contents of the temporary file. +Note that this method will cause the filehandle pointed to by +C<< $upload->fh >> to be seeked to the start of the file, +and the file handle to be put into binary mode. + =cut sub slurp { @@ -136,26 +146,15 @@ sub slurp { binmode( $handle, $layer ); + $handle->seek(0, SEEK_SET); while ( $handle->sysread( my $buffer, 8192 ) ) { $content .= $buffer; } + $handle->seek(0, SEEK_SET); return $content; } -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; - } - - return $self->{basename}; -} - =head2 $upload->basename Returns basename for C. @@ -174,13 +173,11 @@ Provided by Moose =head1 AUTHORS -Sebastian Riedel, C - -Christian Hansen, C +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