Skip to content

Be smarter about handling buffer file modes #201

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
simonoff merged 1 commit into from
Jan 17, 2015
Merged

Be smarter about handling buffer file modes #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion lib/zip/file.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,18 @@ def open_buffer(io, options = {})
if io.is_a?(::String)
require 'stringio'
io = ::StringIO.new(io)
elsif io.is_a?(IO)
# https://github.com/rubyzip/rubyzip/issues/119
io.binmode
end
zf = ::Zip::File.new(io, true, true, options)
zf.read_from_stream(io)
yield zf
zf.write_buffer(io)
begin
zf.write_buffer(io)
rescue IOError => e
raise unless e.message == "not opened for writing"
end
end

# Iterates over the contents of the ZipFile. This is more efficient
Expand Down
2 changes: 1 addition & 1 deletion lib/zip/output_stream.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def initialize(file_name, stream=false)
@file_name = file_name
@output_stream = if stream
iostream = @file_name.dup
iostream.reopen
iostream.reopen(@file_name)
iostream.rewind
iostream
else
Expand Down