root
/
rubyzip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch newly created StringIOs to binmode. 

StringIO objects created within File.open_buffer were not being switched into
binmode, but those passed in were. Fix this inconsistency and add a test.
This commit is contained in:
Robert Haines 2018-04-04 15:40:38 +01:00
parent 15ccc25da1
commit 84c208982f
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/zip/file.rb
View File

@ -134,12 +134,10 @@ module Zip
raise "Zip::File.open_buffer expects a String or IO-like argument (responds to #{IO_METHODS.join(', ')}). Found: #{io.class}" raise "Zip::File.open_buffer expects a String or IO-like argument (responds to #{IO_METHODS.join(', ')}). Found: #{io.class}"
end end
if io.is_a?(::String) io = ::StringIO.new(io) if io.is_a?(::String)
io = ::StringIO.new(io)
elsif io.respond_to?(:binmode)
# https://github.com/rubyzip/rubyzip/issues/119 # https://github.com/rubyzip/rubyzip/issues/119
io.binmode io.binmode if io.respond_to?(:binmode)
end
zf = ::Zip::File.new(io, true, true, options) zf = ::Zip::File.new(io, true, true, options)
return zf unless block_given? return zf unless block_given?

7
test/file_test.rb
View File

@ -97,6 +97,13 @@ class ZipFileTest < MiniTest::Test
end end
end end
def test_open_buffer_with_string
string = File.read('test/data/rubycode.zip')
::Zip::File.open_buffer string do |zf|
assert zf.entries.map { |e| e.name }.include?('zippedruby1.rb')
end
end
def test_open_buffer_with_stringio def test_open_buffer_with_stringio
string_io = StringIO.new File.read('test/data/rubycode.zip') string_io = StringIO.new File.read('test/data/rubycode.zip')
::Zip::File.open_buffer string_io do |zf| ::Zip::File.open_buffer string_io do |zf|