Merge pull request #314 from mwlang/bugfix/open_buffer_without_block

simonoff · web-flow · commit df8dfbcff31a · 2017-02-08T13:16:06.000+02:00
allows open_buffer to work without a given block
diff --git a/lib/zip/file.rb b/lib/zip/file.rb
@@ -129,6 +129,7 @@ def open_buffer(io, options = {})
         end
         zf = ::Zip::File.new(io, true, true, options)
         zf.read_from_stream(io)
+        return zf unless block_given?
         yield zf
         begin
           zf.write_buffer(io)
diff --git a/test/file_test.rb b/test/file_test.rb
@@ -104,6 +104,12 @@ def test_open_buffer_with_stringio
     end
   end
 
+  def test_open_buffer_without_block
+    string_io = StringIO.new File.read('test/data/rubycode.zip')
+    zf = ::Zip::File.open_buffer string_io
+    assert zf.entries.map { |e| e.name }.include?('zippedruby1.rb')
+  end
+
   def test_cleans_up_tempfiles_after_close
     zf = ::Zip::File.new(EMPTY_FILENAME, ::Zip::File::CREATE)
     zf.get_output_stream('myFile') do |os|
