hexapdf 0.11.6 → 0.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60a5bf5332e0ebf949653852c2f77a7a78861b120bf0c5eed30ee6591cd0736e
-  data.tar.gz: 79c8495ffcf48c4d81180ab9aa39e5ee12386f0a015ccef2460e453a879609d3
+  metadata.gz: 569e36409af92892e51daffa031686bc87db46bc846933ddb9f47c415fccfd3f
+  data.tar.gz: 88ad0152b80467b2f7936e2431b24091b8fa799b51094efcbfb467af04fb468e
 SHA512:
-  metadata.gz: ded53b4977a8caafc8811b80f42fd0e137fed0af84072ee864a30f02ac729d5327f85840c2f7eb21426a5f3beee8caa6b2d40f91e0521180f161db8ccad86a48
-  data.tar.gz: c1f7c2fb6e6fd2eacef1d11421768844471d0b048bf0eb36558f6a0a6426eed3438db1309aa17e3cd4e7a1e973affab946b52073c10ad7a37e0d9c3ce46cf3b8
+  metadata.gz: d49c7ae6f7bb2d17cf3124a10043b50d451e832f64fbf9cd6d852e00d00a6eb0fb47fedb624f97629404f5509b6126d4fdf04265164416adbb2020075b0dafd9
+  data.tar.gz: 2fa2a590c07c7e286ab4b57bd110618bab7b3e4f6bfbb00906c1df53e3314f23536644652ba6a143802ca2bc331bd8f1ffa58ee4fbda884ae020c9b517b7f652

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.11.7 - 2020-06-10
+
+### Fixed
+
+* Deletion of object streams in [HexaPDF::Task::Optimize] to avoid accessing
+  then invalid object streams
+* [HexaPDF::Task::Optimize] to work correctly when deleting object streams and
+  generating xref streams
+
 ## 0.11.6 - 2020-05-27
 
 ### Fixed

data/lib/hexapdf/task/optimize.rb

@@ -127,13 +127,18 @@ module HexaPDF
         when :delete
           doc.revisions.each_with_index do |rev, rev_index|
             xref_stream = false
+            objects_to_delete = []
             rev.each do |obj|
-              if obj.type == :ObjStm || (obj.type == :XRef && xref_streams == :delete)
-                rev.delete(obj)
+              if obj.type == :ObjStm
+                objects_to_delete << obj
+              elsif obj.type == :XRef
+                xref_stream = true
+                objects_to_delete << obj if xref_streams == :delete
               else
                 delete_fields_with_defaults(obj)
               end
             end
+            objects_to_delete.each {|obj| rev.delete(obj) }
             if xref_streams == :generate && !xref_stream
               doc.add({Type: :XRef}, revision: rev_index)
             end
@@ -143,11 +148,12 @@ module HexaPDF
             xref_stream = false
             count = 0
             objstms = [doc.wrap({Type: :ObjStm})]
+            old_objstms = []
             rev.each do |obj|
               if obj.type == :XRef
                 xref_stream = true
               elsif obj.type == :ObjStm
-                rev.delete(obj)
+                old_objstms << obj
               end
               delete_fields_with_defaults(obj)
 
@@ -160,6 +166,7 @@ module HexaPDF
                 count = 0
               end
             end
+            old_objstms.each {|objstm| rev.delete(objstm) }
             objstms.each {|objstm| doc.add(objstm, revision: rev_index) }
             doc.add({Type: :XRef}, revision: rev_index) unless xref_stream
           end

data/lib/hexapdf/version.rb

@@ -37,6 +37,6 @@
 module HexaPDF
 
   # The version of HexaPDF.
-  VERSION = '0.11.6'
+  VERSION = '0.11.7'
 
 end

data/test/hexapdf/task/test_optimize.rb

@@ -7,13 +7,15 @@ require 'hexapdf/task/optimize'
 describe HexaPDF::Task::Optimize do
   class TestType < HexaPDF::Dictionary
 
+    define_type :Test
     define_field :Optional, type: Symbol, default: :Optional
 
   end
 
   before do
+    HexaPDF::GlobalConfiguration['object.type_map'][:Test] = TestType
     @doc = HexaPDF::Document.new
-    @obj1 = @doc.add(@doc.wrap({Optional: :Optional}, type: TestType))
+    @obj1 = @doc.add({Type: :Test, Optional: :Optional})
     @doc.trailer[:Test] = @doc.wrap(@obj1)
     @doc.revisions.add
     @obj2 = @doc.add({Type: :UsedEntry})
@@ -22,6 +24,10 @@ describe HexaPDF::Task::Optimize do
     @obj1[:Test] = @doc.wrap(@obj4, type: TestType)
   end
 
+  after do
+    HexaPDF::GlobalConfiguration['object.type_map'].delete(:Test)
+  end
+
   def assert_objstms_generated
     assert(@doc.revisions.all? {|rev| rev.any? {|obj| obj.type == :ObjStm } })
     assert(@doc.revisions.all? {|rev| rev.any? {|obj| obj.type == :XRef } })
@@ -40,7 +46,7 @@ describe HexaPDF::Task::Optimize do
   end
 
   def assert_default_deleted
-    refute(@obj1.value.key?(:Optional))
+    refute(@doc.object(1).key?(:Optional))
   end
 
   describe "compact" do
@@ -84,21 +90,29 @@ describe HexaPDF::Task::Optimize do
   end
 
   describe "object_streams" do
-    it "generates object streams" do
+    def reload_document_with_objstm_from_io
+      io = StringIO.new
       objstm = @doc.add({Type: :ObjStm})
-      xref = @doc.add({Type: :XRef})
+      @doc.add({Type: :XRef})
+      objstm.add_object(@doc.add({Type: :Test}))
+      @doc.write(io)
+      io.rewind
+      @doc = HexaPDF::Document.new(io: io)
+    end
+
+    it "generates object streams" do
       210.times { @doc.add(5) }
+      objstm = @doc.add({Type: :ObjStm})
+      reload_document_with_objstm_from_io
       @doc.task(:optimize, object_streams: :generate)
       assert_objstms_generated
       assert_default_deleted
       assert_nil(@doc.object(objstm).value)
-      assert(3, @doc.revisions.current.find_all {|obj| obj.type == :ObjStm }.size)
-      assert([xref], @doc.revisions.current.find_all {|obj| obj.type == :XRef })
+      assert_equal(2, @doc.revisions.current.find_all {|obj| obj.type == :ObjStm }.size)
     end
 
     it "deletes object and xref streams" do
-      @doc.add({Type: :ObjStm})
-      @doc.add({Type: :XRef})
+      reload_document_with_objstm_from_io
       @doc.task(:optimize, object_streams: :delete, xref_streams: :delete)
       assert_no_objstms
       assert_no_xrefstms
@@ -107,9 +121,11 @@ describe HexaPDF::Task::Optimize do
 
     it "deletes object and generates xref streams" do
       @doc.add({Type: :ObjStm})
+      xref = @doc.add({Type: :XRef})
       @doc.task(:optimize, object_streams: :delete, xref_streams: :generate)
       assert_no_objstms
       assert_xrefstms_generated
+      assert_equal([xref], @doc.revisions.current.find_all {|obj| obj.type == :XRef })
       assert_default_deleted
     end
   end

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.11.6)>>
+      <</Producer(HexaPDF version 0.11.7)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.11.6)>>
+      <</Producer(HexaPDF version 0.11.7)>>
       endobj
       2 0 obj
       <</Length 10>>stream

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.11.7
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse