filenames now generated using Data::GUID. pre_post and pre_delete can now return errors.

Author: Adam Hopkins

Changes

@@ -105,3 +105,6 @@ Revision history for jQuery-File-Upload
 
 0.26
 	fixed issue in generate_output where url was not set
+
+0.27
+	filenames now generated using Data::GUID. pre_post and pre_delete can now return errors.

MYMETA.json

@@ -34,7 +34,7 @@
          "requires" : {
             "CGI" : "0",
             "Cwd" : "0",
-            "Digest::MD5" : "0",
+            "Data::GUID" : "0",
             "Image::Magick" : "0",
             "JSON" : "0",
             "JSON::XS" : "0",
@@ -46,5 +46,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "0.26"
+   "version" : "0.27"
 }

MYMETA.yml

@@ -20,12 +20,12 @@ no_index:
 requires:
   CGI: '0'
   Cwd: '0'
-  Digest::MD5: '0'
+  Data::GUID: '0'
   Image::Magick: '0'
   JSON: '0'
   JSON::XS: '0'
   Net::SSH2: '0'
   Net::SSH2::SFTP: '0'
   URI: '0'
   perl: '5.006'
-version: '0.26'
+version: '0.27'

Makefile

@@ -19,7 +19,7 @@
 #     MIN_PERL_VERSION => q[5.006]
 #     NAME => q[jQuery::File::Upload]
 #     PL_FILES => {  }
-#     PREREQ_PM => { URI=>q[0], JSON::XS=>q[0], Image::Magick=>q[0], CGI=>q[0], Test::More=>q[0], Net::SSH2::SFTP=>q[0], Digest::MD5=>q[0], JSON=>q[0], Cwd=>q[0], Net::SSH2=>q[0] }
+#     PREREQ_PM => { URI=>q[0], JSON::XS=>q[0], Image::Magick=>q[0], CGI=>q[0], Test::More=>q[0], Data::GUID=>q[0], Net::SSH2::SFTP=>q[0], JSON=>q[0], Cwd=>q[0], Net::SSH2=>q[0] }
 #     TEST_REQUIRES => {  }
 #     VERSION_FROM => q[lib/jQuery/File/Upload.pm]
 #     clean => { FILES=>q[jQuery-File-Upload-*] }
@@ -62,11 +62,11 @@ DIRFILESEP = /
 DFSEP = $(DIRFILESEP)
 NAME = jQuery::File::Upload
 NAME_SYM = jQuery_File_Upload
-VERSION = 0.26
+VERSION = 0.27
 VERSION_MACRO = VERSION
-VERSION_SYM = 0_26
+VERSION_SYM = 0_27
 DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\"
-XS_VERSION = 0.26
+XS_VERSION = 0.27
 XS_VERSION_MACRO = XS_VERSION
 XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\"
 INST_ARCHLIB = blib/arch
@@ -262,7 +262,7 @@ RCS_LABEL = rcs -Nv$(VERSION_SYM): -q
 DIST_CP = best
 DIST_DEFAULT = tardist
 DISTNAME = jQuery-File-Upload
-DISTVNAME = jQuery-File-Upload-0.26
+DISTVNAME = jQuery-File-Upload-0.27
 
 
 # --- MakeMaker macro section:
@@ -506,15 +506,15 @@ metafile : create_distdir
 	$(NOECHO) $(ECHO) 'requires:' >> META_new.yml
 	$(NOECHO) $(ECHO) '  CGI: '\''0'\''' >> META_new.yml
 	$(NOECHO) $(ECHO) '  Cwd: '\''0'\''' >> META_new.yml
-	$(NOECHO) $(ECHO) '  Digest::MD5: '\''0'\''' >> META_new.yml
+	$(NOECHO) $(ECHO) '  Data::GUID: '\''0'\''' >> META_new.yml
 	$(NOECHO) $(ECHO) '  Image::Magick: '\''0'\''' >> META_new.yml
 	$(NOECHO) $(ECHO) '  JSON: '\''0'\''' >> META_new.yml
 	$(NOECHO) $(ECHO) '  JSON::XS: '\''0'\''' >> META_new.yml
 	$(NOECHO) $(ECHO) '  Net::SSH2: '\''0'\''' >> META_new.yml
 	$(NOECHO) $(ECHO) '  Net::SSH2::SFTP: '\''0'\''' >> META_new.yml
 	$(NOECHO) $(ECHO) '  URI: '\''0'\''' >> META_new.yml
 	$(NOECHO) $(ECHO) '  perl: '\''5.006'\''' >> META_new.yml
-	$(NOECHO) $(ECHO) 'version: '\''0.26'\''' >> META_new.yml
+	$(NOECHO) $(ECHO) 'version: '\''0.27'\''' >> META_new.yml
 	-$(NOECHO) $(MV) META_new.yml $(DISTVNAME)/META.yml
 	$(NOECHO) $(ECHO) Generating META.json
 	$(NOECHO) $(ECHO) '{' > META_new.json
@@ -553,7 +553,7 @@ metafile : create_distdir
 	$(NOECHO) $(ECHO) '         "requires" : {' >> META_new.json
 	$(NOECHO) $(ECHO) '            "CGI" : "0",' >> META_new.json
 	$(NOECHO) $(ECHO) '            "Cwd" : "0",' >> META_new.json
-	$(NOECHO) $(ECHO) '            "Digest::MD5" : "0",' >> META_new.json
+	$(NOECHO) $(ECHO) '            "Data::GUID" : "0",' >> META_new.json
 	$(NOECHO) $(ECHO) '            "Image::Magick" : "0",' >> META_new.json
 	$(NOECHO) $(ECHO) '            "JSON" : "0",' >> META_new.json
 	$(NOECHO) $(ECHO) '            "JSON::XS" : "0",' >> META_new.json
@@ -565,7 +565,7 @@ metafile : create_distdir
 	$(NOECHO) $(ECHO) '      }' >> META_new.json
 	$(NOECHO) $(ECHO) '   },' >> META_new.json
 	$(NOECHO) $(ECHO) '   "release_status" : "stable",' >> META_new.json
-	$(NOECHO) $(ECHO) '   "version" : "0.26"' >> META_new.json
+	$(NOECHO) $(ECHO) '   "version" : "0.27"' >> META_new.json
 	$(NOECHO) $(ECHO) '}' >> META_new.json
 	-$(NOECHO) $(MV) META_new.json $(DISTVNAME)/META.json
 
@@ -873,7 +873,7 @@ ppd :
 	$(NOECHO) $(ECHO) '        <PERLCORE VERSION="5,006,0,0" />' >> $(DISTNAME).ppd
 	$(NOECHO) $(ECHO) '        <REQUIRE NAME="CGI::" />' >> $(DISTNAME).ppd
 	$(NOECHO) $(ECHO) '        <REQUIRE NAME="Cwd::" />' >> $(DISTNAME).ppd
-	$(NOECHO) $(ECHO) '        <REQUIRE NAME="Digest::MD5" />' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '        <REQUIRE NAME="Data::GUID" />' >> $(DISTNAME).ppd
 	$(NOECHO) $(ECHO) '        <REQUIRE NAME="Image::Magick" />' >> $(DISTNAME).ppd
 	$(NOECHO) $(ECHO) '        <REQUIRE NAME="JSON::" />' >> $(DISTNAME).ppd
 	$(NOECHO) $(ECHO) '        <REQUIRE NAME="JSON::XS" />' >> $(DISTNAME).ppd

Makefile.PL

@@ -25,8 +25,8 @@ WriteMakefile(
 		'Net::SSH2::SFTP' => 0,
 		'Image::Magick' => 0,
 		'Cwd' => 0,
-		'Digest::MD5' => 0,
 		'URI' => 0,
+		'Data::GUID' => 0,
     },
     dist  => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
     clean => { FILES => 'jQuery-File-Upload-*' },

blib/lib/jQuery/File/Upload.pm

@@ -2,7 +2,7 @@ package jQuery::File::Upload;
 
 use 5.008008;
 use strict;
-use warnings;
+#use warnings;
 
 use CGI;
 use JSON::XS;
@@ -11,13 +11,13 @@ use Net::SSH2;
 use Net::SSH2::SFTP;
 use Image::Magick;
 use Cwd 'abs_path';
-use Digest::MD5 qw(md5_hex);
 use URI;
+use Data::GUID;
 
 #use LWP::UserAgent;
 #use LWP::Protocol::https;
 
-our $VERSION = '0.26';
+our $VERSION = '0.27';
 
 my %errors =  (
 	'_validate_max_file_size' => 'File is too big',
@@ -111,6 +111,7 @@ sub new {
 		width => undef,
 		height => undef,
 		num_files_in_dir => undef,
+		user_error => undef,
         @_,                 # Override previous attributes
     };
     return bless $self, $class;
@@ -687,16 +688,20 @@ sub handle_request {
 		&{$self->post_get}($self);
 	}
 	elsif($method eq 'PATCH' or $method eq 'POST' or $method eq 'PUT') { 
-		&{$self->pre_post}($self);
-		$self->_post;
-		&{$self->post_post}($self);
+		$self->{user_error} = &{$self->pre_post}($self);
+		unless($self->{user_error}) {
+			$self->_post;
+			&{$self->post_post}($self);
+		}
+		else { $self->_generate_output }
 	}
 	elsif($method eq 'DELETE') { 
-		&{$self->pre_delete}($self); #even though we may not delete, we should give user option to still run code
-		if($self->should_delete) {
+		$self->{user_error} = &{$self->pre_delete}($self); #even though we may not delete, we should give user option to still run code
+		if(not $self->{user_error} and $self->should_delete) {
 			$self->_delete;
 			&{$self->post_delete}($self);
 		}
+		else { $self->_generate_output }
 	}
 	else { 
 		$self->_set_status(405);
@@ -761,7 +766,7 @@ sub generate_output {
 sub _no_ext { 
 	my $self = shift;
 	$self->filename($_->{filename});
-	my ($no_ext) = $self->filename =~ /(.*)\.(.*)/;
+	my ($no_ext) = $self->filename =~ qr/(.*)\.(.*)/;
 	return $no_ext;
 }
 
@@ -846,6 +851,7 @@ sub _clear {
 	$self->{client_filename} = undef;
 	$self->{tmp_thumb_path} = undef;
 	$self->{tmp_file_path} = undef;
+	$self->{user_error} = undef;
 }
 
 sub _post { 
@@ -876,18 +882,29 @@ sub _generate_output {
 
 	if($method eq 'POST') {
 		my %hash;
+		unless($self->{user_error}) {
+			$hash{'url'} = $self->url;
+			$hash{'thumbnailUrl'} = $self->thumbnail_url;
+			$hash{'deleteUrl'} = $self->_delete_url;
+			$hash{'deleteType'} = 'DELETE';
+			$hash{error} = $self->_generate_error;
+		}
+		else { 
+			$self->_prepare_file_basics;
+			$hash{error} = $self->{user_error};
+		}
+
 		$hash{'name'} = $self->show_client_filename ? $self->client_filename . "" : $self->filename;
 		$hash{'size'} = $self->{file_size};
-		$hash{'url'} = $self->url;
-		$hash{'thumbnailUrl'} = $self->thumbnail_url;
-		$hash{'deleteUrl'} = $self->_delete_url;
-		$hash{'deleteType'} = 'DELETE';
-
-		$hash{'error'} = $self->_generate_error;
 		$obj->{files} = [\%hash];
 	}
 	elsif($method eq 'DELETE') { 
-		$obj->{$self->_get_param('filename')} = JSON::true;
+		unless($self->{user_error}) {
+			$obj->{$self->_get_param('filename')} = JSON::true;
+		}
+		else { 
+			$obj->{error} = $self->{user_error};
+		}
 	}
 
 	my $json = JSON::XS->new->ascii->pretty->allow_nonref;
@@ -973,10 +990,7 @@ sub _prepare_file_attrs {
 	my $self = shift;
 
 	#ORDER MATTERS
-	return undef unless $self->_set_upload_obj;
-	$self->_set_fh;
-	$self->_set_file_size;
-	$self->_set_client_filename;
+	return unless $self->_prepare_file_basics;
 	$self->_set_tmp_filename;
 	$self->_set_file_type;
 	$self->_set_is_image;
@@ -992,6 +1006,17 @@ sub _prepare_file_attrs {
 	return 1;
 }
 
+sub _prepare_file_basics { 
+	my ($self) = @_;
+
+	return undef unless $self->_set_upload_obj;
+	$self->_set_fh;
+	$self->_set_file_size;
+	$self->_set_client_filename;
+
+	return 1;
+}
+
 sub _set_urls { 
 	my $self = shift;
 
@@ -1284,15 +1309,15 @@ sub _set_filename {
 		$self->filename($self->client_filename);
 	}
 	else { 
-		my $filename = md5_hex($self->client_filename . time() . int(rand(1000))) . time() . $self->filename_salt;
+		my $filename = Data::GUID->new->as_string . $self->filename_salt;
 		$self->thumbnail_filename($self->thumbnail_prefix . $filename . $self->thumbnail_postfix . '.' . $self->thumbnail_format) unless $self->thumbnail_filename;
 
 		if($self->is_image) { 
 			$filename .= '.' . $self->format;
 		}
 		else { 
 			#add extension if present
-			if($self->client_filename =~ /.*\.(.*)/) {
+			if($self->client_filename =~ qr/.*\.(.*)/) {
 				$filename .= '.' . $1;
 			}
 		}
@@ -1412,7 +1437,7 @@ sub _set_num_files_in_dir {
 			$chan->exec('ls -rt ' . $_->{upload_dir} . ' | wc -l');
 			my $buffer;
 			$chan->read($buffer,1024);
-			($self->{num_files_in_dir}) = $buffer =~ /(\d+)/;
+			($self->{num_files_in_dir}) = $buffer =~ qr/(\d+)/;
 			$max = $self->{num_files_in_dir} if $self->{num_files_in_dir} > $max;
 		}
 
@@ -2502,6 +2527,13 @@ to set unique identifiers (such as an id for the file or the primary key) so tha
 find the file in your database easier to perform whatever operations
 you want to on it. B<Note:> This will be called even if
 L<should_delete|/"should_delete"> is set to false.
+If your pre_delete returns a value, this will be interpreted as an error
+message and the delete call will be terminated and will return the error.
+For example:
+
+  $j_fu->pre_delete(sub { 
+    return 'You cannot delete this file.'; #file will not be deleted
+  });
 
 =head3 post_delete
 
@@ -2525,6 +2557,13 @@ or
 
 pre_post will be called before a post request is handled.
 POST requests are what happen when jQuery File Upload uploads your file.
+If your pre_post returns a value, this will be interpreted as an error
+message and the post call will be terminated and will return the error.
+For example:
+
+  $j_fu->pre_post(sub { 
+    return 'You have too many files.'; #file will not be uploaded
+  });
 
 =head3 post_post
 

blib/man3/jQuery::File::Upload.3pm

@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "jQuery::File::Upload 3"
-.TH jQuery::File::Upload 3 "2014-07-12" "perl v5.16.2" "User Contributed Perl Documentation"
+.TH jQuery::File::Upload 3 "2014-07-13" "perl v5.16.2" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -1122,6 +1122,15 @@ to set unique identifiers (such as an id for the file or the primary key) so tha
 find the file in your database easier to perform whatever operations
 you want to on it. \fBNote:\fR This will be called even if
 should_delete is set to false.
+If your pre_delete returns a value, this will be interpreted as an error
+message and the delete call will be terminated and will return the error.
+For example:
+.PP
+.Vb 3
+\&  $j_fu\->pre_delete(sub { 
+\&    return \*(AqYou cannot delete this file.\*(Aq; #file will not be deleted
+\&  });
+.Ve
 .PP
 \fIpost_delete\fR
 .IX Subsection "post_delete"
@@ -1155,6 +1164,15 @@ or
 .PP
 pre_post will be called before a post request is handled.
 \&\s-1POST\s0 requests are what happen when jQuery File Upload uploads your file.
+If your pre_post returns a value, this will be interpreted as an error
+message and the post call will be terminated and will return the error.
+For example:
+.PP
+.Vb 3
+\&  $j_fu\->pre_post(sub { 
+\&    return \*(AqYou have too many files.\*(Aq; #file will not be uploaded
+\&  });
+.Ve
 .PP
 \fIpost_post\fR
 .IX Subsection "post_post"