From 506d557edc29144c6f1e3110b4b99043232c3eaf Mon Sep 17 00:00:00 2001 From: Robert Haines Date: Fri, 27 Sep 2019 16:13:56 +0100 Subject: [PATCH 1/2] StreamableStream now uses the OS temp directory. Rather than using the local folder. Fixes #410 --- lib/zip/streamable_stream.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/zip/streamable_stream.rb b/lib/zip/streamable_stream.rb index 2a4bf507..642ddae2 100644 --- a/lib/zip/streamable_stream.rb +++ b/lib/zip/streamable_stream.rb @@ -2,12 +2,7 @@ module Zip class StreamableStream < DelegateClass(Entry) # nodoc:all def initialize(entry) super(entry) - dirname = if zipfile.is_a?(::String) - ::File.dirname(zipfile) - else - nil - end - @temp_file = Tempfile.new(::File.basename(name), dirname) + @temp_file = Tempfile.new(::File.basename(name)) @temp_file.binmode end From e87184200ab92220876577d312ce78354adf6bbf Mon Sep 17 00:00:00 2001 From: Robert Haines Date: Fri, 27 Sep 2019 16:28:02 +0100 Subject: [PATCH 2/2] Require 'tmpdir' only in the tests. It's not used in the library code. --- lib/zip.rb | 1 - test/test_helper.rb | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zip.rb b/lib/zip.rb index c3a6ed5e..fa382376 100644 --- a/lib/zip.rb +++ b/lib/zip.rb @@ -1,7 +1,6 @@ require 'delegate' require 'singleton' require 'tempfile' -require 'tmpdir' require 'fileutils' require 'stringio' require 'zlib' diff --git a/test/test_helper.rb b/test/test_helper.rb index ddeba58b..6d11af6c 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,6 +2,7 @@ require 'minitest/autorun' require 'minitest/unit' require 'fileutils' +require 'tmpdir' require 'digest/sha1' require 'zip' require 'gentestfiles'