Skip to content

Clean up temp file usage and fix #410 #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 4, 2019
Merged

Clean up temp file usage and fix #410 #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
506d557
StreamableStream now uses the OS temp directory.
hainesr Sep 27, 2019
e871842
Require 'tmpdir' only in the tests.
hainesr Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/zip.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
require 'delegate'
require 'singleton'
require 'tempfile'
require 'tmpdir'
require 'fileutils'
require 'stringio'
require 'zlib'
Expand Down
7 changes: 1 addition & 6 deletions lib/zip/streamable_stream.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions test/test_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
require 'minitest/autorun'
require 'minitest/unit'
require 'fileutils'
require 'tmpdir'
require 'digest/sha1'
require 'zip'
require 'gentestfiles'
Expand Down