origamindee 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 593f3f22174161d77e20e75ff2a7a9ae577662861a59881073f78f2c51ac89df
-  data.tar.gz: fe531fa4cc790be0639dcc9703c782bb4f64d9f38ff29a468950fbc131369e52
+  metadata.gz: 45413662e5fb14c50c4dd206522be8e187950c6119b3f8a3a1c2632f363d797d
+  data.tar.gz: 6a016143c0898b649e1b386af4daf117e3c023f7acb414f7a48dbc578ec0afdc
 SHA512:
-  metadata.gz: 92eb2ab3d99b12da581091ecc5958ac21e3a692294d1c41cca586aa38be18f9d0c91a667cdaeee40be40cd3bd8f593747b03bf6528c675d9dd5df91fa671a4b0
-  data.tar.gz: 9aef422a383150380c49a548429d48cd34905982fae8ef1a0a88f782e5103f5d95944f0c22b037ea2c9781575314f73e84a0f6a780b1164047806a79177cba9d
+  metadata.gz: 3612b2edae8776c43acb2715a38e16e47a0416d83b11568136b053ad4f9137f1d827b371d26a25861dfdd12fcd92af871ae02c8ba714ce915fcd0191f6134bf2
+  data.tar.gz: 8bacd88b9cb1020e1986aaafe75520f1ec993d299b3dbfb98e70f0041609e57c954a8ca8a14752e3cd6b2091507282570c15f263c9edfe590509846288774bff

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+4.0.0
+-----
+* Add running tests on Ruby 3.4
+* Drop support for Ruby < 3.0.0
+* Accept Elliptic Curve (EC) private key
+
+3.1.0
+-----
+* Add page deletion methods
+* Add running tests on Ruby 3.2
+
 3.0.0
 -----
 * Replaced Colorize with Rainbow for LGPL compatibility

data/README.md

@@ -27,7 +27,9 @@ Origami is able to parse PDF, FDF and PPKLite (Adobe certificate store) files.
 
 Requirements
 ------------
-The following Ruby versions are tested and supported: 2.6, 2.7, 3.0, 3.1
+The following Ruby versions are tested and supported: 3.0, 3.1, 3.2, 3.3, 3.4
+
+(It could maybe, possibly, in some cases run on Ruby 2.7, but no guarantees. Update your stack.)
 
 Some optional features require additional gems:
 
@@ -114,7 +116,7 @@ It was therefore replaced by `Rainbow` which has similar functionality, and is l
 
 Furthermore, we are now in a better position to fix any problems related to PDF parsing that are encountered by our users. 
 
-As such it is our intention to support functionalities within the scope of our client library.
+As such it is our intention to support functionalities within the scope of our Ruby client library.
 
 **We do not claim to be an official successor to Origami.**
 

data/bin/shell/console.rb

@@ -1,128 +1,128 @@
-=begin
-
-    This file is part of Origami, PDF manipulation framework for Ruby
-    Copyright (C) 2016	Guillaume Delugré.
-
-    Origami is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Origami is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with Origami.  If not, see <http://www.gnu.org/licenses/>.
-
-=end
-
-require 'tempfile'
-require 'hexdump'
-require 'colorize'
-
-String.disable_colorization(false)
-
-module Origami
-    module Object
-        def inspect
-            to_s
-        end
-    end
-
-    class Stream
-        def edit(editor = ENV['EDITOR'])
-            Tempfile.open("origami") do |tmpfile|
-                tmpfile.write(self.data)
-                tmpfile.flush
-
-                Process.wait Kernel.spawn "#{editor} #{tmpfile.path}"
-
-                self.data = File.read(tmpfile.path)
-                tmpfile.unlink
-            end
-
-            true
-        end
-
-        def inspect
-            self.data.hexdump
-        end
-    end
-
-    class Page < Dictionary
-        def edit
-            each_content_stream do |stream|
-                stream.edit
-            end
-        end
-    end
-
-    class PDF
-        if defined?(PDF::JavaScript::Engine)
-            class JavaScript::Engine
-                def shell
-                    loop do
-                        print "js > ".magenta
-                        break if (line = gets).nil?
-
-                        begin
-                            puts exec(line)
-                        rescue V8::JSError => e
-                            puts "Error: #{e.message}"
-                        end
-                    end
-                end
-            end
-        end
-
-        class Revision
-            def to_s
-                puts "----------  Body  ----------".white.bold
-                @body.each_value do |obj|
-                    print "#{obj.reference.to_s.rjust(8,' ')}".ljust(10).magenta
-                    puts "#{obj.type}".yellow
-                end
-
-                puts "---------- Trailer ---------".white.bold
-                if not @trailer.dictionary
-                    puts "  [x] No trailer found.".blue
-                else
-                    @trailer.dictionary.each_pair do |entry, value|
-                        print "  [*] ".magenta
-                        print "#{entry}: ".yellow
-                        puts "#{value}".red
-                    end
-
-                    print "  [+] ".magenta
-                    print "startxref: ".yellow
-                    puts "#{@trailer.startxref}".red
-                end
-            end
-
-            def inspect
-                to_s
-            end
-        end
-
-        def to_s
-            puts
-
-            puts "---------- Header ----------".white.bold
-            print "  [+] ".magenta
-            print "Version: ".yellow
-            puts "#{@header.major_version}.#{@header.minor_version}".red
-
-            @revisions.each do |revision|
-                revision.to_s
-            end
-            puts
-        end
-
-        def inspect
-            to_s
-        end
-    end
-
-end
+=begin
+
+    This file is part of Origami, PDF manipulation framework for Ruby
+    Copyright (C) 2016	Guillaume Delugré.
+
+    Origami is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Origami is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with Origami.  If not, see <http://www.gnu.org/licenses/>.
+
+=end
+
+require 'tempfile'
+require 'hexdump'
+require 'colorize'
+
+String.disable_colorization(false)
+
+module Origami
+    module Object
+        def inspect
+            to_s
+        end
+    end
+
+    class Stream
+        def edit(editor = ENV['EDITOR'])
+            Tempfile.open("origami") do |tmpfile|
+                tmpfile.write(self.data)
+                tmpfile.flush
+
+                Process.wait Kernel.spawn "#{editor} #{tmpfile.path}"
+
+                self.data = File.read(tmpfile.path)
+                tmpfile.unlink
+            end
+
+            true
+        end
+
+        def inspect
+            self.data.hexdump
+        end
+    end
+
+    class Page < Dictionary
+        def edit
+            each_content_stream do |stream|
+                stream.edit
+            end
+        end
+    end
+
+    class PDF
+        if defined?(PDF::JavaScript::Engine)
+            class JavaScript::Engine
+                def shell
+                    loop do
+                        print "js > ".magenta
+                        break if (line = gets).nil?
+
+                        begin
+                            puts exec(line)
+                        rescue V8::JSError => e
+                            puts "Error: #{e.message}"
+                        end
+                    end
+                end
+            end
+        end
+
+        class Revision
+            def to_s
+                puts "----------  Body  ----------".white.bold
+                @body.each_value do |obj|
+                    print "#{obj.reference.to_s.rjust(8,' ')}".ljust(10).magenta
+                    puts "#{obj.type}".yellow
+                end
+
+                puts "---------- Trailer ---------".white.bold
+                if not @trailer.dictionary
+                    puts "  [x] No trailer found.".blue
+                else
+                    @trailer.dictionary.each_pair do |entry, value|
+                        print "  [*] ".magenta
+                        print "#{entry}: ".yellow
+                        puts "#{value}".red
+                    end
+
+                    print "  [+] ".magenta
+                    print "startxref: ".yellow
+                    puts "#{@trailer.startxref}".red
+                end
+            end
+
+            def inspect
+                to_s
+            end
+        end
+
+        def to_s
+            puts
+
+            puts "---------- Header ----------".white.bold
+            print "  [+] ".magenta
+            print "Version: ".yellow
+            puts "#{@header.major_version}.#{@header.minor_version}".red
+
+            @revisions.each do |revision|
+                revision.to_s
+            end
+            puts
+        end
+
+        def inspect
+            to_s
+        end
+    end
+
+end

data/lib/origami/graphics/instruction.rb

@@ -28,7 +28,7 @@ module Origami
         attr_reader :operator
         attr_accessor :operands
 
-        @insns = Hash.new(operands: [], render: lambda{})
+        @insns = Hash.new({ operands: [], render: lambda{} })
 
         def initialize(operator, *operands)
             @operator = operator

data/lib/origami/page.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 =begin
 
     This file is part of Origami, PDF manipulation framework for Ruby
@@ -57,6 +59,28 @@ module Origami
             self
         end
 
+        #
+        # Deletes a page at position _index_ from the document.
+        # _index_:: Page index (starting from one).
+        #
+        def delete_page_at(index)
+            init_page_tree
+
+            self.Catalog.Pages.delete_page_at(index)
+            self
+        end
+
+        #
+        # Deletes a page at position _index_ from the document.
+        # _index_:: Page index (starting from one).
+        #
+        def delete_pages_at(delete_idx)
+            init_page_tree
+
+            self.Catalog.Pages.delete_pages_at(delete_idx)
+            self
+        end
+
         #
         # Returns an Enumerator of Page
         #
@@ -107,7 +131,7 @@ module Origami
             end
 
             unless self.Catalog.Pages.is_a?(PageTreeNode)
-                raise InvalidPageTreeError, "Root page node is not a PageTreeNode"
+                raise InvalidPageTreeError, 'Root page node is not a PageTreeNode'
             end
         end
     end
@@ -250,11 +274,11 @@ module Origami
         field   EXTGSTATE,    :Type => Dictionary
         field   COLORSPACE,   :Type => Dictionary
         field   PATTERN,      :Type => Dictionary
-        field   SHADING,      :Type => Dictionary, :Version => "1.3"
+        field   SHADING,      :Type => Dictionary, :Version => '1.3'
         field   XOBJECT,      :Type => Dictionary
         field   FONT,         :Type => Dictionary
         field   :ProcSet,     :Type => Array.of(Name)
-        field   PROPERTIES,   :Type => Dictionary, :Version => "1.2"
+        field   PROPERTIES,   :Type => Dictionary, :Version => '1.2'
 
         def pre_build
             add_font(Font::Type1::Standard::Helvetica.new.pre_build) unless self.Font
@@ -294,11 +318,11 @@ module Origami
         # Inserts a page into the node at a specified position (starting from 1).
         #
         def insert_page(n, page)
-            raise IndexError, "Page numbers are referenced starting from 1" if n < 1
+            raise IndexError, 'Page numbers are referenced starting from 1' if n < 1
 
             kids = self.Kids
             unless kids.is_a?(Array)
-                raise InvalidPageTreeError, "Kids must be an Array"
+                raise InvalidPageTreeError, 'Kids must be an Array'
             end
 
             count = 0
@@ -323,15 +347,87 @@ module Origami
                         return self
                     end
                 else
-                    raise InvalidPageTreeError, "not a Page or PageTreeNode"
+                    raise InvalidPageTreeError, 'not a Page or PageTreeNode'
                 end
             end
 
-            raise IndexError, "Out of order page index" unless count + 1 == n
+            raise IndexError, 'Out of order page index' unless count + 1 == n
 
             self.append_page(page)
         end
 
+        #
+        # Delete a page in the node at the specified position (starting from 1).
+        #
+        def delete_page_at(n)
+            raise IndexError, 'Page numbers are referenced starting from 1' if n < 1
+
+            kids = self.Kids
+            unless kids.is_a?(Array)
+                raise InvalidPageTreeError, 'Kids must be an Array'
+            end
+
+            count = 0
+            kids.each_with_index do |kid, index|
+                node = kid.solve
+
+                case node
+                when Page
+                    count = count + 1
+                    if count == n
+                        kids.delete_at(index)
+                        self.Count -= 1
+                        return self
+                    end
+
+                when PageTreeNode
+                    count = count + node.Count
+                    if count >= n
+                        node.delete_page_at(n - count + node.Count)
+                        self.Count -= 1
+                        return self
+                    end
+                else
+                    raise InvalidPageTreeError, 'not a Page or PageTreeNode'
+                end
+            end
+
+            raise IndexError, 'Out of order page index' unless count + 1 == n
+        end
+
+        #
+        # Delete a set of page in the node at the specified positions (starting from 0).
+        #
+        def delete_pages_at(delete_idx, offset = 0)
+            kids = self.Kids
+            unless kids.is_a?(Array)
+                raise InvalidPageTreeError, 'Kids must be an Array'
+            end
+
+            deleted = 0
+            kids.delete_if.with_index do |kid, idx|
+                node = kid.solve
+                idx = idx + offset
+
+                case node
+                when Page
+                    if delete_idx.include?(idx)
+                        deleted += 1
+                        true
+                    else
+                        false
+                    end
+                when PageTreeNode
+                    deleted += node.delete_pages_at(delete_idx, idx)
+                    false
+                else
+                    raise InvalidPageTreeError, 'not a Page or PageTreeNode'
+                end
+            end
+            self.Count -= deleted
+            deleted
+        end
+
         #
         # Returns an Array of Pages inheriting this tree node.
         #
@@ -346,11 +442,11 @@ module Origami
             return enum_for(__method__) { self.Count.to_i } unless block_given?
 
             if browsed_nodes.any?{|node| node.equal?(self)}
-                raise InvalidPageTreeError, "Cyclic tree graph detected"
+                raise InvalidPageTreeError, 'Cyclic tree graph detected'
             end
 
             unless self.Kids.is_a?(Array)
-                raise InvalidPageTreeError, "Kids must be an Array"
+                raise InvalidPageTreeError, 'Kids must be an Array'
             end
 
             browsed_nodes.push(self)
@@ -363,7 +459,7 @@ module Origami
                     when PageTreeNode then node.each_page(browsed_nodes: browsed_nodes, &block)
                     when Page then yield(node)
                     else
-                        raise InvalidPageTreeError, "not a Page or PageTreeNode"
+                        raise InvalidPageTreeError, 'not a Page or PageTreeNode'
                     end
                 end
             end
@@ -375,10 +471,10 @@ module Origami
         # Get the n-th Page object in this node, starting from 1.
         #
         def get_page(n)
-            raise IndexError, "Page numbers are referenced starting from 1" if n < 1
-            raise IndexError, "Page not found" if n > self.Count.to_i
+            raise IndexError, 'Page numbers are referenced starting from 1' if n < 1
+            raise IndexError, 'Page not found' if n > self.Count.to_i
 
-            self.each_page.lazy.drop(n - 1).first or raise IndexError, "Page not found"
+            self.each_page.lazy.drop(n - 1).first or raise IndexError, 'Page not found'
         end
 
         #
@@ -481,8 +577,8 @@ module Origami
         class AdditionalActions < Dictionary
             include StandardObject
 
-            field   :O,   :Type => Dictionary, :Version => "1.2" # Page Open
-            field   :C,   :Type => Dictionary, :Version => "1.2" # Page Close
+            field   :O,   :Type => Dictionary, :Version => '1.2' # Page Open
+            field   :C,   :Type => Dictionary, :Version => '1.2' # Page Close
         end
 
         module Format
@@ -513,34 +609,34 @@ module Origami
 
         field   :Type,                  :Type => Name, :Default => :Page, :Required => true
         field   :Parent,                :Type => PageTreeNode, :Required => true
-        field   :LastModified,          :Type => String, :Version => "1.3"
+        field   :LastModified,          :Type => String, :Version => '1.3'
         field   :Resources,             :Type => Resources, :Required => true
         field   :MediaBox,              :Type => Rectangle, :Default => Format::A4, :Required => true
         field   :CropBox,               :Type => Rectangle
-        field   :BleedBox,              :Type => Rectangle, :Version => "1.3"
-        field   :TrimBox,               :Type => Rectangle, :Version => "1.3"
-        field   :ArtBox,                :Type => Rectangle, :Version => "1.3"
-        field   :BoxColorInfo,          :Type => BoxColorInformation, :Version => "1.4"
+        field   :BleedBox,              :Type => Rectangle, :Version => '1.3'
+        field   :TrimBox,               :Type => Rectangle, :Version => '1.3'
+        field   :ArtBox,                :Type => Rectangle, :Version => '1.3'
+        field   :BoxColorInfo,          :Type => BoxColorInformation, :Version => '1.4'
         field   :Contents,              :Type => [ ContentStream, Array.of(ContentStream) ]
         field   :Rotate,                :Type => Integer, :Default => 0
-        field   :Group,                 :Type => Dictionary, :Version => "1.4"
+        field   :Group,                 :Type => Dictionary, :Version => '1.4'
         field   :Thumb,                 :Type => Graphics::ImageXObject
-        field   :B,                     :Type => Array, :Version => "1.1"
-        field   :Dur,                   :Type => Integer, :Version => "1.1"
-        field   :Trans,                 :Type => Dictionary, :Version => "1.1"
+        field   :B,                     :Type => Array, :Version => '1.1'
+        field   :Dur,                   :Type => Integer, :Version => '1.1'
+        field   :Trans,                 :Type => Dictionary, :Version => '1.1'
         field   :Annots,                :Type => Array.of(Annotation)
-        field   :AA,                    :Type => AdditionalActions, :Version => "1.2"
-        field   :Metadata,              :Type => MetadataStream, :Version => "1.4"
-        field   :PieceInfo,             :Type => Dictionary, :Version => "1.2"
-        field   :StructParents,         :Type => Integer, :Version => "1.3"
+        field   :AA,                    :Type => AdditionalActions, :Version => '1.2'
+        field   :Metadata,              :Type => MetadataStream, :Version => '1.4'
+        field   :PieceInfo,             :Type => Dictionary, :Version => '1.2'
+        field   :StructParents,         :Type => Integer, :Version => '1.3'
         field   :ID,                    :Type => String
         field   :PZ,                    :Type => Number
-        field   :SeparationInfo,        :Type => Dictionary, :Version => "1.3"
-        field   :Tabs,                  :Type => Name, :Version => "1.5"
-        field   :TemplateAssociated,    :Type => Name, :Version => "1.5"
-        field   :PresSteps,             :Type => NavigationNode, :Version => "1.5"
-        field   :UserUnit,              :Type => Number, :Default => 1.0, :Version => "1.6"
-        field   :VP,                    :Type => Dictionary, :Version => "1.6"
+        field   :SeparationInfo,        :Type => Dictionary, :Version => '1.3'
+        field   :Tabs,                  :Type => Name, :Version => '1.5'
+        field   :TemplateAssociated,    :Type => Name, :Version => '1.5'
+        field   :PresSteps,             :Type => NavigationNode, :Version => '1.5'
+        field   :UserUnit,              :Type => Number, :Default => 1.0, :Version => '1.6'
+        field   :VP,                    :Type => Dictionary, :Version => '1.6'
 
         def initialize(hash = {}, parser = nil)
             super(hash, parser)

data/lib/origami/signature.rb

@@ -70,7 +70,7 @@ module Origami
         #
         # Sign the document with the given key and x509 certificate.
         # _certificate_:: The X509 certificate containing the public key.
-        # _key_:: The private key associated with the certificate.
+        # _key_:: The RSA or EC private key associated with the certificate.
         # _method_:: The PDF signature identifier.
         # _ca_:: Optional CA certificates used to sign the user certificate.
         # _annotation_:: Annotation associated with the signature.
@@ -89,19 +89,19 @@ module Origami
                  reason: nil)
 
             unless certificate.is_a?(OpenSSL::X509::Certificate)
-                raise TypeError, "A OpenSSL::X509::Certificate object must be passed."
+                raise TypeError, 'A OpenSSL::X509::Certificate object must be passed.'
             end
 
-            unless key.is_a?(OpenSSL::PKey::RSA)
-                raise TypeError, "A OpenSSL::PKey::RSA object must be passed."
+            unless (key.is_a?(OpenSSL::PKey::RSA) || key.is_a?(OpenSSL::PKey::EC))
+                raise TypeError, 'An OpenSSL::PKey::RSA or OpenSSL::PKey::EC object must be passed.'
             end
 
             unless ca.is_a?(::Array)
-                raise TypeError, "Expected an Array of CA certificates."
+                raise TypeError, 'Expected an Array of CA certificates.'
             end
 
             unless annotation.nil? or annotation.is_a?(Annotation::Widget::Signature)
-                raise TypeError, "Expected a Annotation::Widget::Signature object."
+                raise TypeError, 'Expected a Annotation::Widget::Signature object.'
             end
 
             #
@@ -125,7 +125,8 @@ module Origami
                 InteractiveForm::SigFlags::SIGNATURES_EXIST | InteractiveForm::SigFlags::APPEND_ONLY
 
             digsig.Type = :Sig
-            digsig.Contents = HexaString.new("\x00" * Signature::required_size(method, certificate, key, ca))
+            placeholder_size = Signature::required_size(method, certificate, key, ca) + 128
+            digsig.Contents = HexaString.new("\x00" * placeholder_size)
             digsig.Filter = :"Adobe.PPKLite"
             digsig.SubFilter = Name.new(method)
             digsig.ByteRange = [0, 0, 0, 0]
@@ -327,7 +328,7 @@ module Origami
                 r1.end != start_sig or
                 r2.begin != end_sig
 
-                raise SignatureError, "Invalid signature byte range"
+                raise SignatureError, 'Invalid signature byte range'
             end
 
             self.original_data[r1] + self.original_data[r2]
@@ -589,7 +590,7 @@ module Origami
                 byte_range = self.ByteRange
 
                 unless byte_range.is_a?(Array) and byte_range.length == 4 and byte_range.all? {|i| i.is_a?(Integer) }
-                    raise SignatureError, "Invalid ByteRange field value"
+                    raise SignatureError, 'Invalid ByteRange field value'
                 end
 
                 byte_range.map(&:to_i).each_slice(2).map do |start, length|
@@ -608,7 +609,7 @@ module Origami
 
                 chain = self.Cert
                 unless chain.is_a?(String) or (chain.is_a?(Array) and chain.all?{|cert| cert.is_a?(String)})
-                    return SignatureError, "Invalid embedded certificate chain"
+                    return SignatureError, 'Invalid embedded certificate chain'
                 end
 
                 [ chain ].flatten.map! {|str| OpenSSL::X509::Certificate.new(str) }

data/lib/origami/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 =begin
 
     This file is part of Origami, PDF manipulation framework for Ruby
@@ -19,5 +21,5 @@
 =end
 
 module Origami
-    VERSION   = "3.0.0"
+    VERSION   = '4.0.0'
 end 

data/lib/origami.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 =begin
 
     This file is part of Origami, PDF manipulation framework for Ruby

data/test/test_actions.rb

@@ -1,6 +1,6 @@
 require 'minitest/autorun'
 
-class TestActions < MiniTest::Test
+class TestActions < Minitest::Test
     def setup
         @target = PDF.new
         @page = Page.new

data/test/test_pages.rb

@@ -51,10 +51,33 @@ class TestPages < Minitest::Test
         assert_raises(IndexError) { @target.insert_page(1000, Page.new) }
     end
 
-    def test_example_write_page
+    def test_example_write_delete_page
         @target.append_page
-        @target.pages.first.write 'Hello, world!', size: 30
+        @target.pages.last.write 'Hello, page 1 world!', size: 30
+        @target.append_page
+        @target.pages.last.write 'Hello, page 2 world!', size: 30
+        @target.save(@output)
+        assert_equal @target.Catalog.Pages.Count, 2
+
+        @target.delete_page_at(1)
         @target.save(@output)
         assert_equal @target.Catalog.Pages.Count, 1
     end
+
+    def test_delete_pages_generated
+        to_append = [Page.new, Page.new, Page.new, PageTreeNode.new, Page.new, Page.new, Page.new]
+        to_append.each { |page| @target.append_page(page) }
+        to_del = [0,1]
+        assert_equal @target.Catalog.Pages.Count, to_append.length
+        @target.delete_pages_at(to_del)
+        assert_equal @target.Catalog.Pages.Count, to_append.length - to_del.length
+    end
+
+    def test_delete_pages_parsed
+        file = File.join(__dir__, 'dataset', '3_pages.pdf')
+        pdf = PDF.read(file, ignore_errors: false, verbosity: Parser::VERBOSE_QUIET)
+        assert_equal pdf.Catalog.Pages.Count, 3
+        pdf.delete_pages_at([0,2])
+        assert_equal pdf.Catalog.Pages.Count, 1
+    end
 end

data/test/test_pdf_parse.rb

@@ -1,18 +1,11 @@
 require 'minitest/autorun'
 
 class TestPDFParser < Minitest::Test
-    def setup
-        @files =
-            %w{
-              dataset/empty.pdf
-              dataset/calc.pdf
-              dataset/crypto.pdf
-              }
-    end
 
     def test_parse_pdf
-        @files.each do |file|
-            pdf = PDF.read(File.join(__dir__, file), ignore_errors: false, verbosity: Parser::VERBOSE_QUIET)
+        dir = File.join(__dir__, 'dataset')
+        Dir.children(dir).each do | filename |
+            pdf = PDF.read(File.join(dir, filename), ignore_errors: false, verbosity: Parser::VERBOSE_QUIET)
 
             assert_instance_of PDF, pdf
 

data/test/test_pdf_sign.rb

@@ -4,9 +4,7 @@ require 'openssl'
 
 class TestSign < Minitest::Test
 
-    def create_self_signed_ca_certificate(key_size, expires)
-        key = OpenSSL::PKey::RSA.new key_size
-
+    def create_self_signed_ca_certificate(key, expires)
         name = OpenSSL::X509::Name.parse 'CN=origami/DC=example'
 
         cert = OpenSSL::X509::Certificate.new
@@ -14,8 +12,7 @@ class TestSign < Minitest::Test
         cert.serial = 0
         cert.not_before = Time.now
         cert.not_after = Time.now + expires
-
-        cert.public_key = key.public_key
+        cert.public_key = key
         cert.subject = name
 
         extension_factory = OpenSSL::X509::ExtensionFactory.new
@@ -29,12 +26,28 @@ class TestSign < Minitest::Test
         cert.issuer = name
         cert.sign key, OpenSSL::Digest::SHA256.new
 
-        [ cert, key ]
+        cert
+    end
+
+    def ec_test_data(curve_name)
+        key = OpenSSL::PKey::EC.generate(curve_name)
+        other_key = OpenSSL::PKey::EC.generate(curve_name)
+        cert = create_self_signed_ca_certificate(key, 3600)
+        other_cert = create_self_signed_ca_certificate(other_key, 3600)
+        [ cert, key, other_cert ]
+    end
+
+    def rsa_test_data(key_size)
+        key = OpenSSL::PKey::RSA.new(key_size)
+        other_key = OpenSSL::PKey::RSA.new(key_size)
+        cert = create_self_signed_ca_certificate(key, 3600)
+        other_cert = create_self_signed_ca_certificate(other_key, 3600)
+        [ cert, key, other_cert ]
     end
 
     def setup
-        @cert, @key = create_self_signed_ca_certificate(1024, 3600)
-        @other_cert, @other_key = create_self_signed_ca_certificate(1024, 3600)
+        @rsa_1024_data = rsa_test_data(1024)
+        @ec_prime256v1_data = ec_test_data('prime256v1')
     end
 
     def setup_document_with_annotation
@@ -51,10 +64,10 @@ class TestSign < Minitest::Test
         [ document, annotation ]
     end
 
-    def sign_document_with_method(method)
+    def sign_document_with_method(method, cert, key, other_cert)
         document, annotation = setup_document_with_annotation
 
-        document.sign(@cert, @key,
+        document.sign(cert, key,
             method: method,
             annotation: annotation,
             issuer: "Guillaume Delugré",
@@ -73,25 +86,37 @@ class TestSign < Minitest::Test
 
         refute document.verify
         assert document.verify(allow_self_signed: true)
-        assert document.verify(trusted_certs: [@cert])
-        refute document.verify(trusted_certs: [@other_cert])
+        assert document.verify(trusted_certs: [cert])
+        refute document.verify(trusted_certs: [other_cert])
 
         result = document.verify do |ctx|
-            ctx.error == OpenSSL::X509::V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT and ctx.current_cert.to_pem == @cert.to_pem
+            ctx.error == OpenSSL::X509::V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT and ctx.current_cert.to_pem == cert.to_pem
         end
 
         assert result
     end
 
-    def test_sign_pkcs7_sha1
-        sign_document_with_method(Signature::PKCS7_SHA1)
+    def test_rsa_sign_pkcs7_sha1
+        sign_document_with_method(Signature::PKCS7_SHA1, *@rsa_1024_data)
+    end
+
+    def test_rsa_sign_pkcs7_detached
+        sign_document_with_method(Signature::PKCS7_DETACHED, *@rsa_1024_data)
+    end
+
+    def test_rsa_sign_x509_sha1
+        sign_document_with_method(Signature::PKCS1_RSA_SHA1, *@rsa_1024_data)
+    end
+
+    def test_ec_sign_pkcs7_sha1
+        sign_document_with_method(Signature::PKCS7_SHA1, *@ec_prime256v1_data)
     end
 
-    def test_sign_pkcs7_detached
-        sign_document_with_method(Signature::PKCS7_DETACHED)
+    def test_ec_sign_pkcs7_detached
+        sign_document_with_method(Signature::PKCS7_DETACHED, *@ec_prime256v1_data)
     end
 
-    def test_sign_x509_sha1
-        sign_document_with_method(Signature::PKCS1_RSA_SHA1)
+    def test_ec_sign_x509_sha1
+        sign_document_with_method(Signature::PKCS1_RSA_SHA1, *@ec_prime256v1_data)
     end
 end

data/test/test_xrefs.rb

@@ -2,7 +2,7 @@ require 'minitest/autorun'
 require 'stringio'
 require 'strscan'
 
-class TestXrefs < MiniTest::Test
+class TestXrefs < Minitest::Test
 
     def setup
         @target = PDF.new

metadata

@@ -1,16 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: origamindee
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Guillaume Delugré
 - Mindee, SA
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-26 00:00:00.000000000 Z
+date: 2025-02-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -82,23 +96,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0.9'
 description: Mindee's fork of Origami, a pure Ruby library to parse, modify and generate
   PDF documents.
 email:
-- devrel@mindee.co
+- opensource@mindee.co
 executables:
 - pdfsh
 - pdf2pdfa
@@ -232,9 +246,12 @@ files:
 - lib/origami/xfa/xfdf.rb
 - lib/origami/xfa/xmpmeta.rb
 - lib/origami/xreftable.rb
+- test/dataset/3_pages.pdf
 - test/dataset/calc.pdf
 - test/dataset/crypto.pdf
 - test/dataset/empty.pdf
+- test/dataset/image_only.pdf
+- test/dataset/invoice.pdf
 - test/test_actions.rb
 - test/test_annotations.rb
 - test/test_forms.rb
@@ -257,7 +274,7 @@ metadata:
   source_code_uri: https://github.com/mindee/origamindee
   changelog_uri: https://github.com/mindee/origamindee/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -265,15 +282,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Ruby framework to manipulate PDF documents
 test_files: