hexapdf 0.24.1 → 0.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d7da895c4baff0d0e5114a6c423f3f6ca3de02004807d7f5a81c19e404edff1
-  data.tar.gz: 89c6dd4709077bf6c6ccb710addeccfdf23a4a75d37dda4357f36c25d5f8865d
+  metadata.gz: d651940209b634c4f8c95924479f46dca2b49a458b731cd6bfba5ad95151c70d
+  data.tar.gz: aebe4ea9b21414b68483557f0f4cda0ea02ba17ae39bd58166c0864890c56691
 SHA512:
-  metadata.gz: f5400d99a41fec977ba734bf487af5ce847bdea1f762a0f2df98b45f20952ee4059b08b75ff76ddb3e87db2191f1f7d18b01d9c1d8911b44fbdfc54ea2faa478
-  data.tar.gz: f70679b7844a27d2da4f208900309b1820c39174923ab7d0645edbeddaa60455bd359a6e355c254e8764de013078d199846ec5ac443de3d39dd1abc4ad93c890
+  metadata.gz: 6d5fc26a440b93e140ae1cf761b969c9cb8c7b708db52674b3b8f785babfd4552f6682b536cae682570309d3f4b40fc8d26e8a9c933de271b7cd347a49334c07
+  data.tar.gz: 61b7303d84de7bd0851e6f60de62e8e25a5c772ad97837c2ab03962f220a06caae03cb05c668b233eb8fc0273e3232a9be6965d31ad9add1bf6c9ee979cb828e

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.24.2 - 2022-08-31
+
+### Fixed
+
+* [HexaPDF::Importer] to detect loops in a fully-loaded document
+* HexaPDF::Type::PageTreeNode#perform_validation to only do the validation for
+  the document's root page tree node
+* HexaPDF::Type::Page#perform_validation to only do the validation if the page
+  is part of the document's page tree
+* Box layouting to take small floating point differences into account
+
+
 ## 0.24.1 - 2022-08-11
 
 ### Added

data/Rakefile

@@ -47,7 +47,7 @@ namespace :dev do
   end
 
   task :test_all do
-    versions = `rbenv versions --bare | grep -i 2.[67]\\\\\\|3.`.split("\n")
+    versions = `rbenv versions --bare | grep -i ^2.[67]\\\\\\|^3.`.split("\n")
     versions.each do |version|
       sh "eval \"$(rbenv init -)\"; rbenv shell #{version} && ruby -v && rake test"
     end

data/lib/hexapdf/importer.rb

@@ -117,6 +117,8 @@ module HexaPDF
       when HexaPDF::Object
         if object.type == :Catalog || object.type == :Pages
           @mapper[object.data] = nil
+        elsif (mapped_object = @mapper[object.data]) && !mapped_object.null?
+          mapped_object
         else
           obj = object.dup
           @mapper[object.data] = NullableWeakRef.new(obj)

data/lib/hexapdf/layout/box.rb

@@ -34,6 +34,7 @@
 # commercial licenses are available at <https://gettalong.at/hexapdf/>.
 #++
 require 'hexapdf/layout/style'
+require 'geom2d/utils'
 
 module HexaPDF
   module Layout
@@ -76,6 +77,8 @@ module HexaPDF
     #         which should just draw the content.
     class Box
 
+      include Geom2D::Utils
+
       # Creates a new Box object, using the provided block as drawing block (see ::new).
       #
       # If +content_box+ is +true+, the width and height are taken to mean the content width and
@@ -183,7 +186,9 @@ module HexaPDF
       def split(available_width, available_height, frame)
         if @fit_successful
           [self, nil]
-        elsif (style.position != :flow && (@width > available_width || @height > available_height)) ||
+        elsif (style.position != :flow &&
+               (float_compare(@width, available_width) > 0 ||
+                float_compare(@height, available_height) > 0)) ||
             content_height == 0 || content_width == 0
           [nil, self]
         else

data/lib/hexapdf/layout/image_box.rb

@@ -98,7 +98,8 @@ module HexaPDF
           @height = image_height * ratio + rh
         end
 
-        @width <= available_width && @height <= available_height
+        @fit_successful = float_compare(@width, available_width) <= 0 &&
+          float_compare(@height, available_height) <= 0
       end
 
       private

data/lib/hexapdf/type/page.rb

@@ -564,6 +564,11 @@ module HexaPDF
 
       # Ensures that the required inheritable fields are set.
       def perform_validation(&block)
+        root_node = document.catalog.pages
+        parent_node = self[:Parent]
+        parent_node = parent_node[:Parent] while parent_node && parent_node != root_node
+        return unless parent_node
+
         super
         REQUIRED_INHERITABLE_FIELDS.each do |name|
           next if self[name]

data/lib/hexapdf/type/page_tree_node.rb

@@ -265,7 +265,7 @@ module HexaPDF
       # page tree!
       def perform_validation(&block)
         super
-        return if key?(:Parent)
+        return unless document.catalog[:Pages] == self
 
         validate_node = lambda do |node|
           count = 0

data/lib/hexapdf/version.rb

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

data/test/hexapdf/test_importer.rb

@@ -26,6 +26,7 @@ describe HexaPDF::Importer do
     @obj = @source.add({hash: @hash, array: ["one", "two"],
                         ref: HexaPDF::Reference.new(obj.oid, obj.gen),
                         others: [:symbol, 5, 5.5, nil, true, false]})
+    @obj[:MySelf] = @obj
     @source.pages.add
     @source.pages.root[:Rotate] = 90
     @dest = HexaPDF::Document.new

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.24.1)>>
+      <</Producer(HexaPDF version 0.24.2)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.24.1)>>
+      <</Producer(HexaPDF version 0.24.2)>>
       endobj
       2 0 obj
       <</Length 10>>stream
@@ -206,7 +206,7 @@ describe HexaPDF::Writer do
       <</Type/Page/MediaBox[0 0 595 842]/Parent 2 0 R/Resources<<>>>>
       endobj
       5 0 obj
-      <</Producer(HexaPDF version 0.24.0)>>
+      <</Producer(HexaPDF version 0.24.2)>>
       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

data/test/hexapdf/type/test_page.rb

@@ -71,8 +71,17 @@ describe HexaPDF::Type::Page do
   end
 
   describe "validation" do
+    it "only does validation if the page is in the document's page tree" do
+      page = @doc.add({Type: :Page})
+      assert(page.validate)
+      page[:Parent] = @doc.add({Type: :Pages, Kids: [page]})
+      assert(page.validate)
+      page[:Parent] = @doc.catalog.pages
+      refute(page.validate)
+    end
+
     it "fails if a required inheritable field is not set" do
-      root = @doc.add({Type: :Pages})
+      root = @doc.catalog[:Pages] = @doc.add({Type: :Pages})
       page = @doc.add({Type: :Page, Parent: root})
       message = ''
       refute(page.validate {|m, _| message = m })

data/test/hexapdf/type/test_page_tree_node.rb

@@ -7,7 +7,7 @@ require 'hexapdf/type/page_tree_node'
 describe HexaPDF::Type::PageTreeNode do
   before do
     @doc = HexaPDF::Document.new
-    @root = @doc.add({Type: :Pages})
+    @root = @doc.catalog[:Pages] = @doc.add({Type: :Pages})
   end
 
   # Defines the following page tree:
@@ -283,6 +283,12 @@ describe HexaPDF::Type::PageTreeNode do
   end
 
   describe "validation" do
+    it "only does validation on the document's root node" do
+      @doc.catalog.delete(:Pages)
+      assert(@root.validate)
+      assert_equal(0, @root.page_count)
+    end
+
     it "corrects faulty /Count entries" do
       define_multilevel_page_tree
       root_count = @root.page_count

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.24.2
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse