hexapdf 0.26.2 → 0.28.0

data/test/hexapdf/type/test_page.rb

@@ -94,6 +94,11 @@ describe HexaPDF::Type::Page do
       @page = @doc.pages.add
     end
 
+    it "returns the crop box by default" do
+      @page[:CropBox] = [0, 0, 100, 200]
+      assert_equal([0, 0, 100, 200], @page.box)
+    end
+
     it "returns the correct media box" do
       @page[:MediaBox] = :media
       assert_equal(:media, @page.box(:media))
@@ -150,15 +155,25 @@ describe HexaPDF::Type::Page do
       @page = @doc.pages.add
     end
 
-    it "returns :portrait for appropriate media boxes and rotation values" do
-      @page.box(:media, [0, 0, 100, 300])
+    it "uses the crop box by default" do
+      @page[:CropBox] = [0, 0, 200, 100]
+      assert_equal(:landscape, @page.orientation)
+    end
+
+    it "uses the specified box for determining the orientation" do
+      @page[:ArtBox] = [0, 0, 200, 100]
+      assert_equal(:landscape, @page.orientation(:art))
+    end
+
+    it "returns :portrait for appropriate boxes and rotation values" do
+      @page.box(:crop, [0, 0, 100, 300])
       assert_equal(:portrait, @page.orientation)
       @page[:Rotate] = 0
       assert_equal(:portrait, @page.orientation)
       @page[:Rotate] = 180
       assert_equal(:portrait, @page.orientation)
 
-      @page.box(:media, [0, 0, 300, 100])
+      @page.box(:crop, [0, 0, 300, 100])
       @page[:Rotate] = 90
       assert_equal(:portrait, @page.orientation)
       @page[:Rotate] = 270
@@ -166,14 +181,14 @@ describe HexaPDF::Type::Page do
     end
 
     it "returns :landscape for appropriate media boxes and rotation values" do
-      @page.box(:media, [0, 0, 300, 100])
+      @page.box(:crop, [0, 0, 300, 100])
       assert_equal(:landscape, @page.orientation)
       @page[:Rotate] = 0
       assert_equal(:landscape, @page.orientation)
       @page[:Rotate] = 180
       assert_equal(:landscape, @page.orientation)
 
-      @page.box(:media, [0, 0, 100, 300])
+      @page.box(:crop, [0, 0, 100, 300])
       @page[:Rotate] = 90
       assert_equal(:landscape, @page.orientation)
       @page[:Rotate] = 270
@@ -204,36 +219,72 @@ describe HexaPDF::Type::Page do
 
     describe "flatten" do
       it "adjust all page boxes" do
-        @page.box(:crop, @page.box)
-        @page.box(:bleed, @page.box)
-        @page.box(:trim, @page.box)
-        @page.box(:art, @page.box)
+        @page.box(:crop, [0, 0, 1, 2])
+        @page.box(:bleed, [0, 0, 2, 3])
+        @page.box(:trim, [0, 0, 3, 4])
+        @page.box(:art, [0, 0, 4, 5])
 
         @page.rotate(90, flatten: true)
-        box = [-300, 50, -100, 200]
-        assert_equal(box, @page.box(:media).value)
-        assert_equal(box, @page.box(:crop).value)
-        assert_equal(box, @page.box(:bleed).value)
-        assert_equal(box, @page.box(:trim).value)
-        assert_equal(box, @page.box(:art).value)
+        assert_equal([-298, 50, -98, 200], @page.box(:media).value)
+        assert_equal([0, 0, 2, 1], @page.box(:crop).value)
+        assert_equal([-1, 0, 2, 2], @page.box(:bleed).value)
+        assert_equal([-2, 0, 2, 3], @page.box(:trim).value)
+        assert_equal([-3, 0, 2, 4], @page.box(:art).value)
       end
 
       it "works correctly for 90 degrees" do
         @page.rotate(90, flatten: true)
-        assert_equal([-300, 50, -100, 200], @page.box(:media).value)
-        assert_equal(" q 0 1 -1 0 0 0 cm   Q ", @page.contents)
+        assert_equal([0, 0, 200, 150], @page.box(:media).value)
+        assert_equal(" q 0 1 -1 0 300 -50 cm   Q ", @page.contents)
       end
 
       it "works correctly for 180 degrees" do
         @page.rotate(180, flatten: true)
-        assert_equal([-200, -300, -50, -100], @page.box(:media).value)
-        assert_equal(" q -1 0 0 -1 0 0 cm   Q ", @page.contents)
+        assert_equal([0, 0, 150, 200], @page.box(:media).value)
+        assert_equal(" q -1 0 0 -1 200 300 cm   Q ", @page.contents)
       end
 
       it "works correctly for 270 degrees" do
         @page.rotate(270, flatten: true)
-        assert_equal([100, -200, 300, -50], @page.box(:media).value)
-        assert_equal(" q 0 -1 1 0 0 0 cm   Q ", @page.contents)
+        assert_equal([0, 0, 200, 150], @page.box(:media).value)
+        assert_equal(" q 0 -1 1 0 -100 200 cm   Q ", @page.contents)
+      end
+
+      describe "annotations" do
+        before do
+          @appearance = @doc.add({Type: :XObject, Subtype: :Form, BBox: [-10, -5, 50, 20]}, stream: "")
+          @annot = @doc.add({Type: :Annot, Subtype: :Widget, Rect: [100, 100, 160, 125],
+                             QuadPoints: [0, 0, 100, 200, 300, 400, 500, 600],
+                             AP: {N: @appearance}})
+          @page[:Annots] = [@annot]
+        end
+
+        it "rotates the /Rect entry" do
+          @page.rotate(90, flatten: true)
+          assert_equal([175, 50, 200, 110], @annot[:Rect].value)
+        end
+
+        it "rotates all (x,y) pairs in the /QuadPoints entry" do
+          @page.rotate(90, flatten: true)
+          assert_equal([300, -50, 100, 50, -100, 250, -300, 450],
+                       @annot[:QuadPoints])
+        end
+
+        it "applies the needed matrix to the annotation's appearance stream's /Matrix entry" do
+          @page.rotate(90, flatten: true)
+          assert_equal([0, 1, -1, 0, 300, -50], @appearance[:Matrix])
+
+          @page.rotate(90, flatten: true)
+          assert_equal([-1, 0, 0, -1, 200, 300], @appearance[:Matrix])
+        end
+
+        it "modified the /R entry in the appearance characteristics dictionary of a widget annotation" do
+          @page.rotate(90, flatten: true)
+          assert_equal(90, @annot[:MK][:R])
+
+          @page.rotate(90, flatten: true)
+          assert_equal(180, @annot[:MK][:R])
+        end
       end
     end
 
@@ -405,8 +456,8 @@ describe HexaPDF::Type::Page do
                                     [:restore_graphics_state]])
     end
 
-    it "works correctly if the page has its origin not at (0,0)" do
-      @page.box(:media, [-10, -5, 100, 300])
+    it "works correctly if the page has its crop box origin not at (0,0)" do
+      @page.box(:crop, [-10, -5, 100, 300])
       @page.canvas(type: :underlay).line_width = 2
       @page.canvas(type: :page).line_width = 2
       @page.canvas(type: :overlay).line_width = 2
@@ -427,6 +478,13 @@ describe HexaPDF::Type::Page do
                                     [:restore_graphics_state]])
     end
 
+    it "allows disabling the origin translation" do
+      @page.box(:crop, [-10, -5, 100, 300])
+      @page.canvas(translate_origin: false).line_width = 2
+
+      assert_page_operators(@page, [[:set_line_width, [2]]])
+    end
+
     it "fails if the page canvas is requested for a page with existing contents" do
       @page.contents = "q Q"
       assert_raises(HexaPDF::Error) { @page.canvas }
@@ -473,25 +531,30 @@ describe HexaPDF::Type::Page do
       @canvas = @page.canvas(type: :overlay)
     end
 
-    it "does nothing if the page doesn't have any annotations" do
+    it "does nothing and returns the argument as array if the page doesn't have any annotations" do
+      annots = @page[:Annots]
+
       @page.delete(:Annots)
       result = @page.flatten_annotations
       assert(result.empty?)
       assert_operators(@canvas.contents, [])
+
+      result = @page.flatten_annotations(annots)
+      assert_kind_of(Array, result)
+      assert_equal([@annot1, @annot2], result)
+      assert_operators(@canvas.contents, [])
     end
 
     it "flattens all annotations of the page by default" do
       result = @page.flatten_annotations
       assert(result.empty?)
       assert_operators(@canvas.contents, [[:save_graphics_state],
-                                          [:save_graphics_state],
                                           [:concatenate_matrix, [1.0, 0, 0, 1.0, 110, 105]],
                                           [:paint_xobject, [:XO1]],
                                           [:restore_graphics_state],
                                           [:save_graphics_state],
                                           [:concatenate_matrix, [1.0, 0, 0, 1.0, 20, 15]],
                                           [:paint_xobject, [:XO1]],
-                                          [:restore_graphics_state],
                                           [:restore_graphics_state]])
       assert(@annot1.null?)
       assert(@annot2.null?)
@@ -521,10 +584,8 @@ describe HexaPDF::Type::Page do
       assert(result.empty?)
       assert(@annot1.null?)
       assert_operators(@canvas.contents, [[:save_graphics_state],
-                                          [:save_graphics_state],
                                           [:concatenate_matrix, [1.0, 0, 0, 1.0, 20, 15]],
                                           [:paint_xobject, [:XO1]],
-                                          [:restore_graphics_state],
                                           [:restore_graphics_state]])
     end
 
@@ -534,10 +595,8 @@ describe HexaPDF::Type::Page do
       assert(result.empty?)
       assert(@annot1.null?)
       assert_operators(@canvas.contents, [[:save_graphics_state],
-                                          [:save_graphics_state],
                                           [:concatenate_matrix, [1.0, 0, 0, 1.0, 20, 15]],
                                           [:paint_xobject, [:XO1]],
-                                          [:restore_graphics_state],
                                           [:restore_graphics_state]])
     end
 
@@ -547,56 +606,55 @@ describe HexaPDF::Type::Page do
       assert_equal([@annot1], result)
       refute(@annot1.empty?)
       assert_operators(@canvas.contents, [[:save_graphics_state],
-                                          [:save_graphics_state],
                                           [:concatenate_matrix, [1.0, 0, 0, 1.0, 20, 15]],
                                           [:paint_xobject, [:XO1]],
-                                          [:restore_graphics_state],
                                           [:restore_graphics_state]])
     end
 
-    it "adjusts the position to counter the translation in #canvas based on the page's media box" do
-      @page[:MediaBox] = [-15, -15, 100, 100]
+    it "potentially adjusts the origin so that it is always in (0,0)" do
+      @canvas.translate(-15, -15)
       @page.flatten_annotations
-      assert_operators(@canvas.contents, [:concatenate_matrix, [1, 0, 0, 1, 15, 15]], range: 1)
+      assert_operators(@canvas.contents, [:concatenate_matrix, [1, 0, 0, 1, 15, 15]], range: 2)
     end
 
     it "adjusts the position in case the form /Matrix has an offset" do
       @appearance[:Matrix] = [1, 0, 0, 1, 15, 15]
       @page.flatten_annotations
-      assert_operators(@canvas.contents, [:concatenate_matrix, [1, 0, 0, 1, 95, 90]], range: 2)
+      assert_operators(@canvas.contents, [:concatenate_matrix, [1, 0, 0, 1, 95, 90]], range: 1)
     end
 
     it "adjusts the position for an appearance with a 90 degree rotation" do
       @appearance[:Matrix] = [0, 1, -1, 0, 0, 0]
       @annot1[:Rect] = [100, 100, 125, 160]
       @page.flatten_annotations
-      assert_operators(@canvas.contents, [:concatenate_matrix, [1, 0, 0, 1, 120, 110]], range: 2)
+      assert_operators(@canvas.contents, [:concatenate_matrix, [1, 0, 0, 1, 120, 110]], range: 1)
     end
 
     it "adjusts the position for an appearance with a -90 degree rotation" do
       @appearance[:Matrix] = [0, -1, 1, 0, 0, 0]
       @annot1[:Rect] = [100, 100, 125, 160]
       @page.flatten_annotations
-      assert_operators(@canvas.contents, [:concatenate_matrix, [1, 0, 0, 1, 105, 150]], range: 2)
+      assert_operators(@canvas.contents, [:concatenate_matrix, [1, 0, 0, 1, 105, 150]], range: 1)
     end
 
     it "adjusts the position for an appearance with a 180 degree rotation" do
       @appearance[:Matrix] = [-1, 0, 0, -1, 0, 0]
       @page.flatten_annotations
-      assert_operators(@canvas.contents, [:concatenate_matrix, [1, 0, 0, 1, 150, 120]], range: 2)
+      assert_operators(@canvas.contents, [:concatenate_matrix, [1, 0, 0, 1, 150, 120]], range: 1)
     end
 
-    it "ignores an appearance with a rotation that is not a mulitple of 90" do
-      @appearance[:Matrix] = [-1, 0.5, 0.5, -1, 0, 0]
-      result = @page.flatten_annotations
-      assert_equal([@annot1, @annot2], result)
-      assert_operators(@canvas.contents, [[:save_graphics_state], [:restore_graphics_state]])
+    it "correctly positions and scales an appearance with a custom rotation" do
+      @appearance[:Matrix] = [0.707106, 0.707106, -0.707106, 0.707106, 10, 30]
+      @page.flatten_annotations
+      assert_operators(@canvas.contents,
+                       [:concatenate_matrix, [0.998269, 0.0, 0.0, 0.415946, 111.21318, 80.60659]],
+                       range: 1)
     end
 
     it "scales the appearance to fit into the annotations's rectangle" do
       @annot1[:Rect] = [100, 100, 130, 150]
       @page.flatten_annotations
-      assert_operators(@canvas.contents, [:concatenate_matrix, [0.5, 0, 0, 2, 110, 105]], range: 2)
+      assert_operators(@canvas.contents, [:concatenate_matrix, [0.5, 0, 0, 2, 110, 105]], range: 1)
     end
   end
 

data/test/hexapdf/type/test_page_tree_node.rb

@@ -241,11 +241,13 @@ describe HexaPDF::Type::PageTreeNode do
 
     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_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_equal([@pages[0], @pages[1], @pages[3], @pages[2], @pages[4], *@pages[5..-1]],
+                   @root.each_page.to_a)
       assert(@root.validate)
     end
 

data/test/hexapdf/type/test_resources.rb

@@ -189,11 +189,6 @@ describe HexaPDF::Type::Resources do
   end
 
   describe "validation" do
-    it "assigns the default value if ProcSet is not set" do
-      @res.validate
-      assert_equal([:PDF, :Text, :ImageB, :ImageC, :ImageI], @res[:ProcSet].value)
-    end
-
     it "handles an invalid ProcSet containing a single value instead of an array" do
       @res[:ProcSet] = :PDF
       @res.validate

data/test/hexapdf/type/test_signature.rb

@@ -128,4 +128,12 @@ describe HexaPDF::Type::Signature do
     assert_kind_of(OpenSSL::X509::Store, store)
     assert(kwargs[:allow_self_signed])
   end
+
+  describe "perform_validation" do
+    it "upgrades the version to 2.0 if the /SubFilter needs it" do
+      refute(@sig.validate(auto_correct: false))
+      assert(@sig.validate(auto_correct: true))
+      assert_equal('2.0', @doc.version)
+    end
+  end
 end

data/test/test_helper.rb

@@ -3,7 +3,7 @@
 begin
   require 'simplecov'
   SimpleCov.start do
-    minimum_coverage line: 100
+    minimum_coverage line: 100 unless ENV['NO_SIMPLECOV']
     add_filter '/test/'
     add_filter '/fast_arc4.rb'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.28.0
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-21 00:00:00.000000000 Z
+date: 2022-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
@@ -44,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +114,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   HexaPDF is a pure Ruby library with an accompanying application for working with PDF
   files.
@@ -234,6 +290,7 @@ files:
 - examples/020-column_box.rb
 - examples/021-list_box.rb
 - examples/022-outline.rb
+- examples/023-images.rb
 - examples/emoji-smile.png
 - examples/emoji-wink.png
 - examples/machupicchu.jpg
@@ -699,14 +756,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby