Merge pull request #201 from mcantor/master

Be smarter about handling buffer file modes
rubyzip · Jan 17, 2015 · 721c1f0 · 721c1f0
2 parents 9e7af06 + 7c7d786
commit 721c1f0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/zip/file.rb b/lib/zip/file.rb
@@ -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

diff --git a/lib/zip/output_stream.rb b/lib/zip/output_stream.rb
@@ -29,7 +29,7 @@ def initialize(file_name, stream=false, encrypter=nil)
       @file_name = file_name
       @output_stream = if stream
                          iostream = @file_name.dup
-                         iostream.reopen
+                         iostream.reopen(@file_name)
                          iostream.rewind
                          iostream
                        else