docx 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fc798e71a79265389a2dcf22d0ecff1268a920f92463c23b9ccbce94517b7be
-  data.tar.gz: 1b21fef113ce8a84a7aeaf97b05139822763a4ac96835efd59971b52fb34ce98
+  metadata.gz: 00fd317c3d0d2f4ee4aafddd30ff41f29830f23c2e5f913c114cbc95b2bb58d1
+  data.tar.gz: 0ad6844aeb26d84f5275f86c43bb592f821be2541e797fa1318416dd20e77bf1
 SHA512:
-  metadata.gz: eab6dae181b61b9b7103460a4e5d582ef534b36f2f09cbfaba9c5ef16d880b9bca6a97d76e7c671fbb24a897189e6b1861a6f4874e589075d781b3a660e796c9
-  data.tar.gz: ca39d10248be1d18d173293fc8a918fe86e615cbd6fbdb5340a532792d9ef478ac563fb3ef61a6fdd4e1542a9d7258015e5bc34ecd69c86e6edb39ce422ec636
+  metadata.gz: 32e693b1114347678865a0b5f409a745e1f4a3a195ef70d2ab6cc255022abaad79b3bed9dd66426746b2b207ab176af19178207c4e2e6af790cd8213575ee605
+  data.tar.gz: 438dbbb6ca717e985c80f0ff4eca824c44fd1d2c94832b40121fb4423e6bf59389b03dce6d66b2f6bbbf9715e68df62c9db3db8e5a4cc60772b7cd1cdd95983d

data/lib/docx/document.rb

@@ -128,40 +128,44 @@ module Docx
     # call-seq:
     #   save(filepath) => void
     def save(path)
-      update
-      Zip::OutputStream.open(path) do |out|
-        zip.each do |entry|
-          next unless entry.file?
+      with_zip64_disabled do
+        update
+        Zip::OutputStream.open(path) do |out|
+          zip.each do |entry|
+            next unless entry.file?
 
-          out.put_next_entry(entry.name)
-          value = @replace[entry.name] || zip.read(entry.name)
+            out.put_next_entry(entry.name)
+            value = @replace[entry.name] || zip.read(entry.name)
 
-          out.write(value)
-        end
+            out.write(value)
+          end
 
+        end
+        zip.close
       end
-      zip.close
     end
 
     # Output entire document as a StringIO object
     def stream
-      update
-      stream = Zip::OutputStream.write_buffer do |out|
-        zip.each do |entry|
-          next unless entry.file?
-
-          out.put_next_entry(entry.name)
-
-          if @replace[entry.name]
-            out.write(@replace[entry.name])
-          else
-            out.write(zip.read(entry.name))
+      with_zip64_disabled do
+        update
+        stream = Zip::OutputStream.write_buffer do |out|
+          zip.each do |entry|
+            next unless entry.file?
+
+            out.put_next_entry(entry.name)
+
+            if @replace[entry.name]
+              out.write(@replace[entry.name])
+            else
+              out.write(zip.read(entry.name))
+            end
           end
         end
-      end
 
-      stream.rewind
-      stream
+        stream.rewind
+        stream
+      end
     end
 
     alias text to_s
@@ -184,6 +188,18 @@ module Docx
 
     private
 
+    # rubyzip 3.x enables ZIP64 by default, which breaks readers (e.g. pandoc)
+    # that don't support it for small files (issue #168). Disable ZIP64 only
+    # while writing, and restore the previous global value afterwards so we
+    # don't affect other rubyzip users in the consuming application.
+    def with_zip64_disabled
+      previous = Zip.write_zip64_support
+      Zip.write_zip64_support = false
+      yield
+    ensure
+      Zip.write_zip64_support = previous
+    end
+
     def load_styles
       @styles_xml = @zip.read('word/styles.xml')
       @styles = Nokogiri::XML(@styles_xml)

data/lib/docx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Docx #:nodoc:
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docx
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Christopher Hunt