hexapdf 0.23.0 → 0.24.0

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.23.0)>>
+      <</Producer(HexaPDF version 0.24.0)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.23.0)>>
+      <</Producer(HexaPDF version 0.24.0)>>
       endobj
       2 0 obj
       <</Length 10>>stream
@@ -94,8 +94,9 @@ describe HexaPDF::Writer do
     document = HexaPDF::Document.new(io: input_io)
     document.trailer.info[:Producer] = "unknown"
     output_io = StringIO.new(''.force_encoding(Encoding::BINARY))
-    xref_section = HexaPDF::Writer.write(document, output_io)
+    start_xref_offset, xref_section = HexaPDF::Writer.write(document, output_io)
     assert_kind_of(HexaPDF::XRefSection, xref_section)
+    assert_kind_of(Integer, start_xref_offset)
     assert_equal(input_io.string, output_io.string)
   end
 
@@ -190,6 +191,60 @@ describe HexaPDF::Writer do
     assert(document.revisions.all[2].one? {|obj| obj.type == :XRef })
   end
 
+  it "doesn't create an xref stream if one was just used for an XRefStm entry" do
+    # The following document's structure is built like a typical MS Word created PDF
+    input = StringIO.new(<<~EOF.force_encoding(Encoding::BINARY))
+      %PDF-1.2
+      %\xCF\xEC\xFF\xE8\xD7\xCB\xCD
+      1 0 obj
+      <</Type/Catalog/Pages 2 0 R>>
+      endobj
+      2 0 obj
+      <</Type/Pages/Kids[3 0 R]/Count 1>>
+      endobj
+      3 0 obj
+      <</Type/Page/MediaBox[0 0 595 842]/Parent 2 0 R/Resources<<>>>>
+      endobj
+      5 0 obj
+      <</Producer(HexaPDF version 0.24.0)>>
+      endobj
+      4 0 obj
+      <</Root 1 0 R/Info 5 0 R/Size 6/Type/XRef/W[1 1 2]/Index[0 6]/Filter/FlateDecode/DecodeParms<</Columns 4/Predictor 12>>/Length 33>>stream
+      x\xDAcb`\xF8\xFF\x9F\x89Q\x88\x91\x91\x89A\x97\x81\x81\x89\xC1\x18D\xB4\x80\x88\xD3\f\f\x00C\xDE\x03\xCF
+      endstream
+      endobj
+      xref
+      0 6
+      0000000000 65535 f
+      0000000018 00000 n
+      0000000063 00000 n
+      0000000114 00000 n
+      0000000246 00000 n
+      0000000193 00000 n
+      trailer
+      <</Root 1 0 R/Info 5 0 R/Size 6>>
+      startxref
+      443
+      %%EOF
+
+      xref
+      0 0
+      trailer
+      <</Root 1 0 R/Info 5 0 R/Prev 443/XRefStm 246>>
+      startxref
+      629
+      %%EOF
+    EOF
+
+    document = HexaPDF::Document.new(io: input)
+    document.pages.add
+    io = StringIO.new
+    HexaPDF::Writer.new(document, io).write_incremental
+
+    document = HexaPDF::Document.new(io: io)
+    refute(document.trailer.key?(:Type))
+  end
+
   it "raises an error if the class is misused and an xref section contains invalid entries" do
     document = HexaPDF::Document.new
     io = StringIO.new

data/test/hexapdf/type/test_page_tree_node.rb

@@ -217,9 +217,19 @@ describe HexaPDF::Type::PageTreeNode do
       assert(@root.validate)
     end
 
+    it "works if the location stays the same" do
+      @root.move_page(3, 3)
+      assert_equal(@pages, @root.each_page.to_a)
+      assert(@root.validate)
+
+      @root.move_page(-2, -2)
+      assert_equal(@pages, @root.each_page.to_a)
+      assert(@root.validate)
+    end
+
     it "moves the page to the correct location with a positive index" do
       @root.move_page(1, 3)
-      assert_equal([@pages[0], @pages[2], @pages[1], *@pages[3..-1]], @root.each_page.to_a)
+      assert_equal([@pages[0], @pages[2], @pages[3], @pages[1], *@pages[4..-1]], @root.each_page.to_a)
       assert(@root.validate)
     end
 
@@ -229,6 +239,16 @@ describe HexaPDF::Type::PageTreeNode do
       assert(@root.validate)
     end
 
+    it "moves the page to the correct location within the same parent node" do
+      @root.move_page(2, 4)
+      assert_equal([@pages[0], @pages[1], @pages[3], @pages[4], @pages[2], *@pages[5..-1]], @root.each_page.to_a)
+      assert(@root.validate)
+
+      @root.move_page(4, 3)
+      assert_equal([@pages[0], @pages[1], @pages[3], @pages[2], @pages[4], *@pages[5..-1]], @root.each_page.to_a)
+      assert(@root.validate)
+    end
+
     it "fails if the index to the moving page is invalid" do
       assert_raises(HexaPDF::Error) { @root.move_page(10, 0) }
     end

data/test/hexapdf/type/test_trailer.rb

@@ -25,7 +25,7 @@ describe HexaPDF::Type::Trailer do
 
   it "returns the catalog object, creating it if needed" do
     doc = Minitest::Mock.new
-    doc.expect(:add, :val, [{Type: :Catalog}])
+    doc.expect(:add, :val, [{Type: :Catalog}], type: :Catalog)
     trailer = HexaPDF::Type::Trailer.new({}, document: doc)
     assert_equal(:val, trailer.catalog)
     doc.verify
@@ -34,7 +34,7 @@ describe HexaPDF::Type::Trailer do
 
   it "returns the info object, creating it if needed" do
     doc = Minitest::Mock.new
-    doc.expect(:add, :val, [{}, type: :XXInfo])
+    doc.expect(:add, :val, [{}], type: :XXInfo)
     trailer = HexaPDF::Type::Trailer.new({}, document: doc)
     assert_equal(:val, trailer.info)
     doc.verify
@@ -89,7 +89,7 @@ describe HexaPDF::Type::Trailer do
     it "corrects a missing Catalog entry" do
       @obj.delete(:Root)
       @obj.set_random_id
-      def (@doc).add(val) HexaPDF::Object.new(val, oid: 3) end
+      def (@doc).add(val, type:); type.to_s; HexaPDF::Object.new(val, oid: 3) end
 
       message = ''
       refute(@obj.validate(auto_correct: false) {|m, _| message = m })

data/test/test_helper.rb

@@ -3,7 +3,9 @@
 begin
   require 'simplecov'
   SimpleCov.start do
+    minimum_coverage line: 100
     add_filter '/test/'
+    add_filter '/fast_arc4.rb'
   end
 rescue LoadError
 end
@@ -14,10 +16,12 @@ require 'fiber'
 require 'zlib'
 
 TEST_DATA_DIR = File.join(__dir__, 'data')
-MINIMAL_PDF = File.read(File.join(TEST_DATA_DIR, 'minimal.pdf')).freeze
+MINIMAL_PDF = File.binread(File.join(TEST_DATA_DIR, 'minimal.pdf')).freeze
 
 Minitest::Test.make_my_diffs_pretty!
 
+ENV['TZ'] = 'UTC'
+
 module TestHelper
 
   # Asserts that the method +name+ of +object+ gets invoked with the +expected_values+ when

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-26 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.16'
 - !ruby/object:Gem::Dependency
   name: reline
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +231,8 @@ files:
 - examples/017-frame_text_flow.rb
 - examples/018-composer.rb
 - examples/019-acro_form.rb
+- examples/020-column_box.rb
+- examples/021-list_box.rb
 - examples/emoji-smile.png
 - examples/emoji-wink.png
 - examples/machupicchu.jpg
@@ -259,6 +275,7 @@ files:
 - lib/hexapdf/document/files.rb
 - lib/hexapdf/document/fonts.rb
 - lib/hexapdf/document/images.rb
+- lib/hexapdf/document/layout.rb
 - lib/hexapdf/document/pages.rb
 - lib/hexapdf/document/signatures.rb
 - lib/hexapdf/encryption.rb
@@ -334,10 +351,13 @@ files:
 - lib/hexapdf/importer.rb
 - lib/hexapdf/layout.rb
 - lib/hexapdf/layout/box.rb
+- lib/hexapdf/layout/box_fitter.rb
+- lib/hexapdf/layout/column_box.rb
 - lib/hexapdf/layout/frame.rb
 - lib/hexapdf/layout/image_box.rb
 - lib/hexapdf/layout/inline_box.rb
 - lib/hexapdf/layout/line.rb
+- lib/hexapdf/layout/list_box.rb
 - lib/hexapdf/layout/numeric_refinements.rb
 - lib/hexapdf/layout/style.rb
 - lib/hexapdf/layout/text_box.rb
@@ -509,6 +529,7 @@ files:
 - test/hexapdf/document/test_files.rb
 - test/hexapdf/document/test_fonts.rb
 - test/hexapdf/document/test_images.rb
+- test/hexapdf/document/test_layout.rb
 - test/hexapdf/document/test_pages.rb
 - test/hexapdf/document/test_signatures.rb
 - test/hexapdf/encryption/common.rb
@@ -573,10 +594,13 @@ files:
 - test/hexapdf/image_loader/test_pdf.rb
 - test/hexapdf/image_loader/test_png.rb
 - test/hexapdf/layout/test_box.rb
+- test/hexapdf/layout/test_box_fitter.rb
+- test/hexapdf/layout/test_column_box.rb
 - test/hexapdf/layout/test_frame.rb
 - test/hexapdf/layout/test_image_box.rb
 - test/hexapdf/layout/test_inline_box.rb
 - test/hexapdf/layout/test_line.rb
+- test/hexapdf/layout/test_list_box.rb
 - test/hexapdf/layout/test_style.rb
 - test/hexapdf/layout/test_text_box.rb
 - test/hexapdf/layout/test_text_fragment.rb
@@ -674,7 +698,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby