fixed custom temporary directory bug in Mojo::Asset::File

mojolicious · Feb 6, 2013 · eff7e8d · eff7e8d
1 parent c659eb9
commit eff7e8d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -4,6 +4,7 @@
   - Improved documentation.
   - Improved tests.
   - Fixed memory leak in development not found page.
+  - Fixed custom temporary directory bug in Mojo::Asset::File.
 
 3.84  2013-01-30
   - Deprecated after_static_dispatch hook in favor of before_routes.

diff --git a/lib/Mojo/Asset/File.pm b/lib/Mojo/Asset/File.pm
@@ -22,7 +22,7 @@ has handle => sub {
   }
 
   # Open new or temporary file
-  my $base = catfile File::Spec::Functions::tmpdir, 'mojo.tmp';
+  my $base = catfile $self->tmpdir, 'mojo.tmp';
   my $name = $path // $base;
   until ($handle->open($name, O_CREAT | O_EXCL | O_RDWR)) {
     croak qq{Can't open file "$name": $!} if defined $path || $! != $!{EEXIST};

diff --git a/t/mojo/asset.t b/t/mojo/asset.t
@@ -1,6 +1,9 @@
 use Mojo::Base -strict;
 
 use Test::More;
+use File::Basename 'dirname';
+use File::Path 'mkpath';
+use File::Spec::Functions qw(catdir tmpdir);
 use Mojo::Asset::File;
 use Mojo::Asset::Memory;
 
@@ -168,8 +171,13 @@ ok !$asset->is_file, 'stored in memory';
 
 # Temporary directory
 {
-  local $ENV{MOJO_TMPDIR} = '/does/not/exist';
-  is(Mojo::Asset::File->new->tmpdir, '/does/not/exist', 'right value');
+  mkpath my $tmpdir = catdir tmpdir, 'test';
+  local $ENV{MOJO_TMPDIR} = $tmpdir;
+  $file = Mojo::Asset::File->new;
+  is($file->tmpdir, $tmpdir, 'same directory');
+  $file->add_chunk('works!');
+  is $file->slurp, 'works!', 'right content';
+  is dirname($file->path), $tmpdir, 'same directory';
 }
 
 # Temporary file without cleanup