combine_pdf 1.0.16 → 1.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d071703a8903bc5a11d7beb5a0bcb284a8bced5763705de3a7dd9ae6be35b64d
-  data.tar.gz: 898069ad7ec79ad4fadea5383a721f28c5dfc3632fc20aaa40624954bfe70170
+  metadata.gz: fc482ee9da31ce7fc01e92da3936e44407e4879c7058817bb4a57ba0fc0a4165
+  data.tar.gz: 1dd52423ee639783510a9ad9aa347e9597e2e14d38a11914d05a03b5116006f2
 SHA512:
-  metadata.gz: d52868ff7a021801207ff17a1e87aca8fa1bd82e6fd0dacf91d39d57695b07b87238898238fa90755bfaaec65cb4df384b6db97f3f4e3bf70da7d3d808e55daa
-  data.tar.gz: f68133d14d5eb5f0428097b4421976da49471eed61f4ac0e574c4718b588458f6971fd107ccc397be004997f3c31ac6bfc122675992412fd521a7910d6f2abd9
+  metadata.gz: f6ac66c289762c5f2b6473f450e8808e79d9ca9f927b68f083204a93b7f213a433a6fc4076cd3241ff1a17ac7c08297087ab1bf76e58b0dad12e7a0eebc34628
+  data.tar.gz: a39c619af345d61d7d40ba0d0b0a32438caace2b05512273afe1f21b737de6324dcc483f34234c5123c9ed0508a0db481b4bf90ffc06fce2484922f2c6c7abe0

data/.github/workflows/main.yml

@@ -0,0 +1,28 @@
+name: Main
+on:
+  push:
+
+jobs:
+  tests:
+    name: Tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7", "3.0", "3.1", "3.2"]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Generate lockfile
+        run: bundle lock
+
+      - name: Run tests
+        run: bundle exec rake test

data/.travis.yml

@@ -0,0 +1 @@
+language: ruby

data/CHANGELOG.md

@@ -1,6 +1,52 @@
 # Change Log
 
-***
+#### Change log v.1.0.26 (2023-12-22)
+
+**Performance**: possible performance bump. Credit to @denislavski (Denislav Naydenov) for opening PR #235.
+
+#### Change log v.1.0.25 (2023-12-19)
+
+**Fix**: possible improve memory usage. Credit to @denislavski (Denislav Naydenov) for opening PR #233 and suggesting this change.
+
+#### Change log v.1.0.24 (2023-10-19)
+
+**Fix**: possible `nil` in loop. Credit to @jkowens for PR #231 and adding a quick fix using a simple guard.
+
+**Fix**: preserve file creation date metadata where relevant.
+
+#### Change log v.1.0.23 (2023-04-04)
+
+**Feature**: merged PR #177 for the `raise_on_encrypted: true` option support. Credit to @leviwilson and @kimyu92 for the PR.
+
+#### Change log v.1.0.22
+
+**Fix**: fix `fonts` dereferencing issue (#203), credit to @MarcWeber (Marc Weber) for identifying the issue.
+
+**Fix**: fix `metrix` dependency, credit to @casperisfine (Jean byroot Boussier) for PR #195.
+
+#### Change log v.1.0.21
+
+**Fix**: possible fix for issue #184, where nested PDF files within an object stream could break the parser. Credit to Greg Sparrow (@hazelsparrow) for exposng the issue.
+
+#### Change log v.1.0.20
+
+**Fix**: merges PR #180, `TypeError: can't dup NilClass`. Credit to Adam Trepanier (@adam-e-trepanier) for the merge.
+
+#### Change log v.1.0.19
+
+**Fix**: fixes font height and width detection issue. Issue #179. Credit to @5anchezzz for opening the issue.
+
+**Fix**: fixes an indentation warning. Issue #173. Credit to @rubyFeedback for exposing this issue.
+
+#### Change log v.1.0.18
+
+**Fix**: fixed issue with the 1.0.17 release where `ProcSet` PDF Arrays should have been expected but where ignored and a PDF Object was assumed instead (issue #171) - credit to @chuchiperriman (Jesús Barbero Rodríguez).
+
+#### Change log v.1.0.17
+
+NB: yanked from RubyGems.org.
+
+**Fix**: fixed issue where nested structure equality tests might provide false positives, resulting in lost data (issue #166) - credit to @cschilbe (Conrad Schilbe).
 
 #### Change log v.1.0.16
 

data/README.md

@@ -1,27 +1,29 @@
 # CombinePDF - the ruby way for merging PDF files
 [![Gem Version](https://badge.fury.io/rb/combine_pdf.svg)](http://badge.fury.io/rb/combine_pdf)
 [![GitHub](https://img.shields.io/badge/GitHub-Open%20Source-blue.svg)](https://github.com/boazsegev/combine_pdf)
+[![Documentation](http://inch-ci.org/github/boazsegev/combine_pdf.svg?branch=master)](https://www.rubydoc.info/github/boazsegev/combine_pdf)
 [![Maintainers Wanted](https://img.shields.io/badge/maintainers-wanted-red.svg)](https://github.com/pickhardt/maintainers-wanted)
 
+
 CombinePDF is a nifty model, written in pure Ruby, to parse PDF files and combine (merge) them with other PDF files, watermark them or stamp them (all using the PDF file format and pure Ruby code).
 
-## Install
+## Unmaintained - Help Wanted(!)
 
-Install with ruby gems:
+I decided to stop maintaining this gem and hope someone could take over the PR reviews and maintenance of this gem (or simply open a successful fork).
 
-```ruby
-gem install combine_pdf
-```
+I wrote this gem because I needed to solve an issue with bates-numbering existing PDF documents.
 
-## Help Wanted
+However, since 2014 I have been maintaining the gem for free and for no reason at all, except that I enjoyed sharing it with the community.
 
-I need help maintaining the CombinePDF Ruby gem.
+I love this gem, but I cannot keep maintaining it as I have my own projects to focus own and I need both the time and (more importantly) the mindspace.
 
-I wrote this gem because I needed to solve an issue with bates-numbering existing PDF documents. However, during the last three years or so I have been maintaining the project for no reason at all, except that I enjoyed sharing it with the community.
+## Install
 
-I love this gem, but I feel it's time I took a step back from maintaining it and concentrate on my music and other things I want to develop.
+Install with ruby gems:
 
-Please hit me up if you would like to join in and eventually take over.
+```ruby
+gem install combine_pdf
+```
 
 ## Known Limitations
 
@@ -37,10 +39,12 @@ Quick rundown:
 
     Some links will be lost when ripping pages out of PDF files and merging them with another PDF.
 
-* Some encrypted PDF files (usually the ones you can't view without a password) will fail quietly instead of noisily.
+* Some encrypted PDF files (usually the ones you can't view without a password) will fail quietly instead of noisily. If you prefer to choose the noisy route, you can specify the `raise_on_encrypted` option using `CombinePDF.load(pdf_file, raise_on_encrypted: true)` which will raise a `CombinePDF::EncryptionError`.
 
 * Sometimes the CombinePDF will raise an exception even if the PDF could be parsed (i.e., when PDF optional content exists)... I find it better to err on the side of caution, although for optional content PDFs an exception is avoidable using `CombinePDF.load(pdf_file, allow_optional_content: true)`.
 
+* The CombinePDF gem runs recursive code to both parse and format the PDF files. Hence, PDF files that have heavily nested objects, as well as those that where combined in a way that results in cyclic nesting, might explode the stack - resulting in an exception or program failure.
+
 CombinePDF is written natively in Ruby and should (presumably) work on all Ruby platforms that follow Ruby 2.0 compatibility.
 
 However, PDF files are quite complex creatures and no guaranty is provided.
@@ -112,7 +116,42 @@ pdf.number_pages
 pdf.save "file_with_numbering.pdf"
 ```
 
-Numbering can be done with many different options, with different formating, with or without a box object, and even with opacity values - see documentation.
+Numbering can be done with many different options, with different formating, with or without a box object, and even with opacity values - [see documentation](https://www.rubydoc.info/github/boazsegev/combine_pdf/CombinePDF/PDF#number_pages-instance_method).
+
+For example, should you prefer to place the page number on the bottom right side of all PDF pages, do:
+
+```ruby
+pdf.number_pages(location: [:bottom_right])
+```
+
+As another example, the dashes around the number are removed and a box is placed around it. The numbering is semi-transparent and the first 3 pages are numbered using letters (a,b,c) rather than numbers:
+
+
+```ruby
+# number first 3 pages as "a", "b", "c"
+pdf.number_pages(number_format: " %s ",
+                 location: [:top, :bottom, :top_left, :top_right, :bottom_left, :bottom_right],
+                 start_at: "a",
+                 page_range: (0..2),
+                 box_color: [0.8,0.8,0.8],
+                 border_color: [0.4, 0.4, 0.4],
+                 border_width: 1,
+                 box_radius: 6,
+                 opacity: 0.75)
+# number the rest of the pages as 4, 5, ... etc'
+pdf.number_pages(number_format: " %s ",
+                 location: [:top, :bottom, :top_left, :top_right, :bottom_left, :bottom_right],
+                 start_at: 4,
+                 page_range: (3..-1),
+                 box_color: [0.8,0.8,0.8],
+                 border_color: [0.4, 0.4, 0.4],
+                 border_width: 1,
+                 box_radius: 6,
+                 opacity: 0.75)
+```
+
+    pdf.number_pages(number_format: " %s ", location: :bottom_right, font_size: 44)
+
 
 ## Loading and Parsing PDF data
 

data/Rakefile

@@ -1,2 +1,9 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+task default: 'test'
+
+Rake::TestTask.new do |t|
+  t.test_files = FileList['test/**/*_test.rb']
+end
 

data/combine_pdf.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "combine_pdf"
   spec.version       = CombinePDF::VERSION
   spec.authors       = ["Boaz Segev"]
-  spec.email         = ["boaz@2be.co.il"]
+  spec.email         = ["bo@bowild.com"]
   spec.summary       = %q{Combine, stamp and watermark PDF files in pure Ruby.}
   spec.description   = %q{A nifty gem, in pure Ruby, to parse PDF files and combine (merge) them with other PDF files, number the pages, watermark them or stamp them, create tables, add basic text objects etc` (all using the PDF file format).}
   spec.homepage      = "https://github.com/boazsegev/combine_pdf"
@@ -19,8 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'ruby-rc4', '>= 0.1.5'
+  spec.add_runtime_dependency 'matrix'
 
   # spec.add_development_dependency "bundler", ">= 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-around"
 end

data/lib/combine_pdf/api.rb

@@ -24,11 +24,11 @@ module CombinePDF
     raise TypeError, "couldn't create PDF object, expecting type String" unless string.is_a?(String) || string.is_a?(Pathname)
     begin
       (begin
-     File.file? string
-   rescue
-     false
-   end) ? load(string) : parse(string)
-   rescue => _e
+        File.file? string
+      rescue
+        false
+      end) ? load(string) : parse(string)
+    rescue => _e
       raise 'General PDF error - Use CombinePDF.load or CombinePDF.parse for a non-general error message (the requested file was not found OR the string received is not a valid PDF stream OR the file was found but not valid).'
     end
   end

data/lib/combine_pdf/fonts.rb

@@ -138,12 +138,21 @@ module CombinePDF
       text.each_char do |c|
         metrics_array << (merged_metrics[c] || { wx: 0, boundingbox: [0, 0, 0, 0] })
       end
-      height = metrics_array.map { |m| m ? m[:boundingbox][3] : 0 } .max
-      height -= (metrics_array.map { |m| m ? m[:boundingbox][1] : 0 }).min
+      metrics_array_mapped_top = [].dup
+      metrics_array_mapped_bottom = [].dup
       width = 0.0
       metrics_array.each do |m|
-        width += (m[:wx] || m[:wy])
+        if (m && m[:boundingbox])
+          metrics_array_mapped_top << m[:boundingbox][3]
+          metrics_array_mapped_bottom << m[:boundingbox][1]
+        else
+          metrics_array_mapped_top << 0
+          metrics_array_mapped_bottom << 0
+        end
+        width += (m[:wx] || m[:wy] || 0) if m
       end
+      height = metrics_array_mapped_top.max
+      height -=metrics_array_mapped_bottom.min
       return [height.to_f / 1000 * size, width.to_f / 1000 * size] if metrics_array[0][:wy]
       [width.to_f / 1000 * size, height.to_f / 1000 * size]
     end

data/lib/combine_pdf/page_methods.rb

@@ -94,7 +94,7 @@ module CombinePDF
       # end
 
       # set ProcSet to recommended value
-      resources[:ProcSet] = [:PDF, :Text, :ImageB, :ImageC, :ImageI] # this was recommended by the ISO. 32000-1:2008
+      resources[:ProcSet] ||= [:PDF, :Text, :ImageB, :ImageC, :ImageI] # this was recommended by the ISO. 32000-1:2008
 
       if top # if this is a stamp (overlay)
         insert_content CONTENT_CONTAINER_START, 0
@@ -147,7 +147,7 @@ module CombinePDF
 
     # This method adds a simple text box to the Page represented by the PDFWriter class.
     # This function takes two values:
-    # text:: the text to potin the box.
+    # text:: the text to write in the box.
     # properties:: a Hash of box properties.
     # the symbols and values in the properties Hash could be any or all of the following:
     # x:: the left position of the box.

data/lib/combine_pdf/parser.rb

@@ -33,7 +33,7 @@ module CombinePDF
     # they are mainly to used to know if the file is (was) encrypted and to get more details.
     attr_reader :info_object, :root_object, :names_object, :forms_object, :outlines_object, :metadata
 
-    attr_reader :allow_optional_content
+    attr_reader :allow_optional_content, :raise_on_encrypted
     # when creating a parser, it is important to set the data (String) we wish to parse.
     #
     # <b>the data is required and it is not possible to set the data at a later stage</b>
@@ -58,6 +58,7 @@ module CombinePDF
       @version = nil
       @scanner = nil
       @allow_optional_content = options[:allow_optional_content]
+      @raise_on_encrypted = options[:raise_on_encrypted]
     end
 
     # parse the data in the new parser (the data already set through the initialize / new method)
@@ -96,6 +97,7 @@ module CombinePDF
       end
 
       if @root_object[:Encrypt]
+        raise EncryptionError, 'the file is encrypted' if @raise_on_encrypted
         # change_references_to_actual_values @root_object
         warn 'PDF is Encrypted! Attempting to decrypt - not yet fully supported.'
         decryptor = PDFDecrypt.new @parsed, @root_object
@@ -233,16 +235,18 @@ module CombinePDF
         # all characters that aren't white space or special: /[^\x00\x09\x0a\x0c\x0d\x20\x28\x29\x3c\x3e\x5b\x5d\x7b\x7d\x2f\x25]+
         elsif str = @scanner.scan(/\/[^\x00\x09\x0a\x0c\x0d\x20\x28\x29\x3c\x3e\x5b\x5d\x7b\x7d\x2f\x25]*/)
           out << (str[1..-1].gsub(/\#[0-9a-fA-F]{2}/) { |a| a[1..2].hex.chr }).to_sym
+          # warn "CombinePDF detected name: #{out.last.to_s}"
         ##########################################
         ## Parse a Number
         ##########################################
         elsif str = @scanner.scan(/[\+\-\.\d]+/)
           str =~ /\./ ? (out << str.to_f) : (out << str.to_i)
+          # warn "CombinePDF detected number: #{out.last.to_s}"
         ##########################################
         ## parse a Hex String
         ##########################################
         elsif str = @scanner.scan(/\<[0-9a-fA-F]*\>/)
-          # warn "Found a hex string"
+          # warn "Found a hex string #{str}"
           str = str.slice(1..-2).force_encoding(Encoding::ASCII_8BIT)
           # str = "0#{str}" if str.length.odd?
           out << unify_string([str].pack('H*').force_encoding(Encoding::ASCII_8BIT))
@@ -319,8 +323,8 @@ module CombinePDF
                 str << 12
               when 48..57 # octal notation for byte?
                 rep -= 48
-                rep = (rep << 3) + (str_bytes.shift-48) if str_bytes[0].between?(48, 57)
-                rep = (rep << 3) + (str_bytes.shift-48) if str_bytes[0].between?(48, 57) && (((rep << 3) + (str_bytes[0] - 48)) <= 255)
+                rep = (rep << 3) + (str_bytes.shift-48) if str_bytes[0]&.between?(48, 57)
+                rep = (rep << 3) + (str_bytes.shift-48) if str_bytes[0]&.between?(48, 57) && (((rep << 3) + (str_bytes[0] - 48)) <= 255)
                 str << rep
               when 10 # new line, ignore
                 str_bytes.shift if str_bytes[0] == 13
@@ -336,6 +340,7 @@ module CombinePDF
             end
           end
           out << unify_string(str.pack('C*').force_encoding(Encoding::ASCII_8BIT))
+          # warn "Found Literal String: #{out.last}"
         ##########################################
         ## parse a Dictionary
         ##########################################
@@ -348,29 +353,42 @@ module CombinePDF
         ## return content of array or dictionary
         ##########################################
         elsif @scanner.scan(/\]/) || @scanner.scan(/>>/)
+          # warn "Dictionary / Array ended with #{@scanner.peek(5)}"
           return out
         ##########################################
         ## parse a Stream
         ##########################################
         elsif @scanner.scan(/stream[ \t]*[\r\n]/)
           @scanner.pos += 1 if @scanner.peek(1) == "\n".freeze && @scanner.matched[-1] != "\n".freeze
+          # advance by the publshed stream length (if any)
+          old_pos = @scanner.pos
+          if(out.last.is_a?(Hash) && out.last[:Length].is_a?(Integer) && out.last[:Length] > 2)
+            @scanner.pos += out.last[:Length] - 2
+          end
+
           # the following was dicarded because some PDF files didn't have an EOL marker as required
           # str = @scanner.scan_until(/(\r\n|\r|\n)endstream/)
           # instead, a non-strict RegExp is used:
-          str = @scanner.scan_until(/endstream/)
+          
 
           # raise error if the stream doesn't end.
-          unless str
+          unless @scanner.skip_until(/endstream/)
             raise ParsingError, "Parsing Error: PDF file error - a stream object wasn't properly closed using 'endstream'!"
           end
+          length = @scanner.pos - (old_pos + 9)
+          length = 0 if(length < 0)
+          length -= 1 if(@scanner.string[old_pos + length - 1] == "\n") 
+          length -= 1 if(@scanner.string[old_pos + length - 1] == "\r") 
+          str = (length > 0) ? @scanner.string.slice(old_pos, length) : ''
+
+          # warn "CombinePDF parser: detected Stream #{str.length} bytes long #{str[0..3]}...#{str[-4..-1]}"
 
           # need to remove end of stream
           if out.last.is_a? Hash
-            # out.last[:raw_stream_content] = str[0...-10] #cuts only one EON char (\n or \r)
-            out.last[:raw_stream_content] = unify_string str.sub(/(\r\n|\n|\r)?endstream\z/, '').force_encoding(Encoding::ASCII_8BIT)
+            out.last[:raw_stream_content] = unify_string str.force_encoding(Encoding::ASCII_8BIT)
           else
             warn 'Stream not attached to dictionary!'
-            out << str.sub(/(\r\n|\n|\r)?endstream\z/, '').force_encoding(Encoding::ASCII_8BIT)
+            out << str.force_encoding(Encoding::ASCII_8BIT)
           end
         ##########################################
         ## parse an Object after finished
@@ -528,6 +546,14 @@ module CombinePDF
               inheritance_hash[:Resources] ||= { referenced_object: {}, is_reference_only: true }.dup
               (inheritance_hash[:Resources][:referenced_object] || inheritance_hash[:Resources]).update((catalogs[:Resources][:referenced_object] || catalogs[:Resources]), &HASH_UPDATE_PROC_FOR_OLD)
             end
+            if catalogs[:ProcSet].is_a?(Array)
+              if(inheritance_hash[:ProcSet])
+                inheritance_hash[:ProcSet][:referenced_object].concat(catalogs[:ProcSet])
+                inheritance_hash[:ProcSet][:referenced_object].uniq!
+              else
+                inheritance_hash[:ProcSet] ||= { referenced_object: catalogs[:ProcSet], is_reference_only: true }.dup
+              end
+            end
             if catalogs[:ColorSpace]
               inheritance_hash[:ColorSpace] ||= { referenced_object: {}, is_reference_only: true }.dup
               (inheritance_hash[:ColorSpace][:referenced_object] || inheritance_hash[:ColorSpace]).update((catalogs[:ColorSpace][:referenced_object] || catalogs[:ColorSpace]), &HASH_UPDATE_PROC_FOR_OLD)
@@ -556,6 +582,18 @@ module CombinePDF
               catalogs[:ColorSpace] = { referenced_object: catalogs[:ColorSpace], is_reference_only: true } unless catalogs[:ColorSpace][:referenced_object]
               catalogs[:ColorSpace][:referenced_object].update((inheritance_hash[:ColorSpace][:referenced_object] || inheritance_hash[:ColorSpace]), &HASH_UPDATE_PROC_FOR_OLD)
             end
+            if inheritance_hash[:ProcSet]
+              if(catalogs[:ProcSet])
+                if catalogs[:ProcSet].is_a?(Array)
+                  catalogs[:ProcSet] = { referenced_object: catalogs[:ProcSet], is_reference_only: true }
+                end
+                catalogs[:ProcSet][:referenced_object].concat(inheritance_hash[:ProcSet][:referenced_object])
+                catalogs[:ProcSet][:referenced_object].uniq!
+              else
+                catalogs[:ProcSet] = { is_reference_only: true }.dup
+                catalogs[:ProcSet][:referenced_object] = []
+              end
+            end
             # (catalogs[:ColorSpace] ||= {}).update(inheritance_hash[:ColorSpace], &HASH_UPDATE_PROC_FOR_OLD) if inheritance_hash[:ColorSpace]
             # catalogs[:Order] ||= inheritance_hash[:Order] if inheritance_hash[:Order]
             # catalogs[:AS] ||= inheritance_hash[:AS] if inheritance_hash[:AS]

data/lib/combine_pdf/pdf_protected.rb

@@ -373,16 +373,19 @@ module CombinePDF
     private
 
     def equal_layers obj1, obj2, layer = CombinePDF.eq_depth_limit
-      return true   if(layer == 0)
       return true if obj1.object_id == obj2.object_id
       if obj1.is_a? Hash
         return false unless obj2.is_a? Hash
+        return false unless obj1.length == obj2.length
         keys = obj1.keys;
-        return false if (keys - obj2.keys).any?
+        keys2 = obj2.keys;
+        return false if (keys - keys2).any? || (keys2 - keys).any?
+        return (warn("CombinePDF nesting limit reached") || true) if(layer == 0)
         keys.each {|k| return false unless equal_layers( obj1[k], obj2[k], layer-1) }
       elsif obj1.is_a? Array
         return false unless obj2.is_a? Array
-        (obj1-obj2).any?
+        return false unless obj1.length == obj2.length
+        (obj1-obj2).any? || (obj2-obj1).any?
       else
         obj1 == obj2
       end

data/lib/combine_pdf/pdf_public.rb

@@ -96,6 +96,7 @@ module CombinePDF
       parser ||= PDFParser.new('')
       raise TypeError, "initialization error, expecting CombinePDF::PDFParser or nil, but got #{parser.class.name}" unless parser.is_a? PDFParser
       @objects = parser.parse
+
       # remove any existing id's
       remove_old_ids
       # set data from parser
@@ -174,8 +175,12 @@ module CombinePDF
     def to_pdf(options = {})
       # reset version if not specified
       @version = 1.5 if @version.to_f == 0.0
+
       # set info for merged file
-      @info[:ModDate] = @info[:CreationDate] = Time.now.strftime "D:%Y%m%d%H%M%S%:::z'00"
+      unless(@info[:CreationDate].is_a?(String))
+        @info[:CreationDate] = Time.now unless @info[:CreationDate].is_a?(Time)
+        @info[:CreationDate] = @info[:CreationDate].getgm.strftime("D:%Y%m%d%H%M%S%:::z'00")
+      end
       @info[:Subject] = options[:subject] if options[:subject]
       @info[:Producer] = options[:producer] if options[:producer]
       # rebuild_catalog
@@ -201,9 +206,9 @@ module CombinePDF
       xref_location = loc
       # xref_location = 0
       # out.each { |line| xref_location += line.bytesize + 1}
-      out << "xref\n0 #{indirect_object_count}\n0000000000 65535 f \n"
-      xref.each { |offset| out << (out.pop + ("%010d 00000 n \n" % offset)) }
-      out << out.pop + 'trailer'
+      out << "xref\n0 #{indirect_object_count}\n0000000000 65535 f "
+      xref.each { |offset| out << ("%010d 00000 n ".freeze % offset) }
+      out << 'trailer'.freeze
       out << "<<\n/Root #{false || "#{catalog[:indirect_reference_id]} #{catalog[:indirect_generation_number]} R"}"
       out << "/Size #{indirect_object_count}"
       out << "/Info #{@info[:indirect_reference_id]} #{@info[:indirect_generation_number]} R"
@@ -257,12 +262,18 @@ module CombinePDF
     def fonts(limit_to_type0 = false)
       fonts_array = []
       pages.each do |pg|
-        if pg[:Resources][:Font]
-          pg[:Resources][:Font].values.each do |f|
-            f = f[:referenced_object] if f[:referenced_object]
-            if (limit_to_type0 || f[:Subtype] == :Type0) && f[:Type] == :Font && !fonts_array.include?(f)
-              fonts_array << f
-            end
+        r = pg[:Resources]
+        next if !r
+        r = r[:referenced_object] if r[:referenced_object]
+        r = r[:Font]
+        next if !r
+        r = r[:referenced_object] if r[:referenced_object]
+        r.values.each do |f|
+          next if f.class != Hash
+          f = f[:referenced_object] if f[:referenced_object]
+          next if f.class != Hash
+          if (limit_to_type0 || f[:Subtype] == :Type0) && f[:Type] == :Font && !fonts_array.include?(f)
+            fonts_array << f
           end
         end
       end

data/lib/combine_pdf/version.rb

@@ -1,3 +1,3 @@
 module CombinePDF
-  VERSION = '1.0.16'.freeze
+  VERSION = '1.0.26'.freeze
 end

data/lib/combine_pdf.rb

@@ -5,6 +5,7 @@ require 'securerandom'
 require 'strscan'
 require 'matrix'
 require 'set'
+require 'digest'
 
 # require the RC4 Gem
 require 'rc4'

data/test/automated

@@ -3,9 +3,10 @@
 $VERBOSE = true
 
 require 'benchmark'
-$LOAD_PATH.unshift File.expand_path(File.join('..', '..', 'lib'), __FILE__)
+Dir.chdir File.expand_path(File.join('..', '..', 'lib'), __FILE__)
+$LOAD_PATH.unshift Dir.pwd
 require 'combine_pdf'
-require 'bundler/setup'
+# require 'bundler/setup'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -14,54 +15,54 @@ require 'bundler/setup'
 # require "pry"
 # Pry.start
 
-pdf = CombinePDF.load "./Ruby/test\ pdfs/filled_form.pdf"
-pdf.save '01_check_radio_buttuns.pdf'
-pdf = CombinePDF.load "./Ruby/test\ pdfs/filled_form.pdf"
-pdf << CombinePDF.load("./Ruby/test\ pdfs/empty_form.pdf")
-pdf << CombinePDF.load("./Ruby/test\ pdfs/filled_form.pdf")
-pdf.save '02_check_form_unification_middle_is_empty.pdf'
+pdf = CombinePDF.load "../../test\ pdfs/filled_form.pdf"
+pdf.save '../tmp/01_check_radio_buttuns.pdf'
+pdf = CombinePDF.load "../../test\ pdfs/filled_form.pdf"
+pdf << CombinePDF.load("../../test\ pdfs/empty_form.pdf")
+pdf << CombinePDF.load("../../test\ pdfs/filled_form.pdf")
+pdf.save '../tmp/02_check_form_unification_middle_is_empty.pdf'
 
-pdf = CombinePDF.load "./Ruby/test\ pdfs/check_form_data__objstreams_w_versions.pdf"
-pdf.save '02_01_check_form_data_ordering_issue.pdf'
+pdf = CombinePDF.load "../../test\ pdfs/check_form_data__objstreams_w_versions.pdf"
+pdf.save '../tmp/02_01_check_form_data_ordering_issue.pdf'
 
 
-pdf = CombinePDF.load './Ruby/test pdfs/share-font-background.pdf'
-pdf2 = CombinePDF.load './Ruby/test pdfs/share-font-foreground.pdf'
+pdf = CombinePDF.load '../../test pdfs/share-font-background.pdf'
+pdf2 = CombinePDF.load '../../test pdfs/share-font-foreground.pdf'
 i = 0
 pdf.pages.each { |pg| pg << pdf2.pages[i] }
-pdf.save '03_check_font_conflict.pdf'
+pdf.save '../tmp/03_check_font_conflict.pdf'
 
-pdf = CombinePDF.load './Ruby/test pdfs/nil_1.pdf'
-pdf2 = CombinePDF.load './Ruby/test pdfs/nil_2.pdf'
+pdf = CombinePDF.load '../../test pdfs/nil_1.pdf'
+pdf2 = CombinePDF.load '../../test pdfs/nil_2.pdf'
 pdf << pdf2
-pdf.save '03_01_nil_value_conflict.pdf'
+pdf.save '../tmp/03_01_nil_value_conflict.pdf'
 
-pdf = CombinePDF.load './Ruby/test pdfs/space_after_streram_keyword.pdf'
-pdf.save '03_02_extra_space_after_stream_keyword.pdf'
+pdf = CombinePDF.load '../../test pdfs/space_after_streram_keyword.pdf'
+pdf.save '../tmp/03_02_extra_space_after_stream_keyword.pdf'
 
-pdf = CombinePDF.load './Ruby/test pdfs/nested_difference.pdf'
-pdf.save '03_03_nested_difference.pdf'
+pdf = CombinePDF.load '../../test pdfs/nested_difference.pdf'
+pdf.save '../tmp/03_03_nested_difference.pdf'
 
-pdf = CombinePDF.load './Ruby/test pdfs/names_go_haywire_0.pdf'
-pdf << CombinePDF.load('./Ruby/test pdfs/names_go_haywire_1.pdf')
-pdf.save '04_check_view_and_names_reference.pdf'
+pdf = CombinePDF.load '../../test pdfs/names_go_haywire_0.pdf'
+pdf << CombinePDF.load('../../test pdfs/names_go_haywire_1.pdf')
+pdf.save '../tmp/04_check_view_and_names_reference.pdf'
 
-pdf = CombinePDF.load('./Ruby/test pdfs/outlines/self_merge_err.pdf')
-pdf.save '05_x1_scribus_test.pdf'
-pdf = CombinePDF.load('./Ruby/test pdfs/outlines/self_merge_err.pdf')
-pdf << CombinePDF.load('./Ruby/test pdfs/outlines/self_merge_err.pdf')
-pdf.save '05_x2_scribus_test.pdf'
-# pdf = CombinePDF.load "./Ruby/test pdfs/named_dest.pdf";nil
-# pdf.save '05_check_named_dest_links.pdf' # this will take a while
-# pdf = CombinePDF.load "./Ruby/test pdfs/named_dest.pdf";nil
-pdf << CombinePDF.load('./Ruby/test pdfs/named_dest.pdf'); nil
-pdf.save '05_1_timeless_check_named_dest_links.pdf' # never ends... :-(
+pdf = CombinePDF.load('../../test pdfs/outlines/self_merge_err.pdf')
+pdf.save '../tmp/05_x1_scribus_test.pdf'
+pdf = CombinePDF.load('../../test pdfs/outlines/self_merge_err.pdf')
+pdf << CombinePDF.load('../../test pdfs/outlines/self_merge_err.pdf')
+pdf.save '../tmp/05_x2_scribus_test.pdf'
+pdf = CombinePDF.load "../../test pdfs/outlines/named_dest.pdf";nil
+pdf.save '../tmp/05_check_named_dest_links.pdf' # this will take a while
+pdf = CombinePDF.load "../../test pdfs/outlines/named_dest.pdf";nil
+pdf << CombinePDF.load('../../test pdfs/outlines/named_dest.pdf'); nil
+pdf.save '../tmp/05_1_timeless_check_named_dest_links.pdf' # never ends... :-(
 
-pdf = CombinePDF.load './Ruby/test pdfs/outline_small.pdf'
-pdf << CombinePDF.load('./Ruby/test pdfs/outline_small.pdf')
-pdf.save '06_check_links_to_second_copy.pdf'
+pdf = CombinePDF.load '../../test pdfs/outline_small.pdf'
+pdf << CombinePDF.load('../../test pdfs/outline_small.pdf')
+pdf.save '../tmp/06_check_links_to_second_copy.pdf'
 
-lists = %w(./Ruby/test\ pdfs/outlines/self_merge_err.pdf ./Ruby/test\ pdfs/outlines/big_toc.pdf ./Ruby/test\ pdfs/outlines/bigger_toc.pdf ./Ruby/test\ pdfs/outlines/named_dest_no_toc.pdf ./Ruby/test\ pdfs/outlines/named_dest_no_toc2.pdf ./Ruby/test\ pdfs/outlines/named_dest.pdf ./Ruby/test\ pdfs/outlines/named_dest2.pdf)
+lists = %w(../../test\ pdfs/outlines/self_merge_err.pdf ../../test\ pdfs/outlines/big_toc.pdf ../../test\ pdfs/outlines/bigger_toc.pdf ../../test\ pdfs/outlines/named_dest_no_toc.pdf ../../test\ pdfs/outlines/named_dest_no_toc2.pdf ../../test\ pdfs/outlines/named_dest.pdf ../../test\ pdfs/outlines/named_dest2.pdf)
 
 i = 0
 lists.each do |n|
@@ -76,7 +77,7 @@ lists.each do |n|
 end
 pdf = CombinePDF.new
 lists.each { |n| pdf << CombinePDF.load(n) }
-pdf.save('07_named destinations.pdf')
+pdf.save('../tmp/07_named destinations.pdf')
 
 pdf = CombinePDF.new
 lists.each { |n| pdf << CombinePDF.load(n) }
@@ -90,26 +91,26 @@ pdf.number_pages(start_at: 1,
                            number_location: [:top, :bottom],
                            opacity: 0.75)
 
-pdf.save('07_named destinations_numbered.pdf')
+pdf.save('../tmp/07_named destinations_numbered.pdf')
 
-CombinePDF.load("./Ruby/test\ pdfs/Scribus-unknown_err.pdf").save '08_1-unknown-err-empty-str.pdf'
-CombinePDF.load("./Ruby/test\ pdfs/Scribus-unknown_err2.pdf").save '08_2-unknown-err-empty-str.pdf'
-CombinePDF.load("./Ruby/test\ pdfs/Scribus-unknown_err3.pdf").save '08_3-unknown-err-empty-str.pdf'
-CombinePDF.load("./Ruby/test\ pdfs/xref_in_middle.pdf").save '08_4-xref-in-middle.pdf'
-CombinePDF.load("./Ruby/test\ pdfs/xref_split.pdf").save '08_5-xref-fragmented.pdf'
+CombinePDF.load("../../test\ pdfs/Scribus-unknown_err.pdf").save '../tmp/08_1-unknown-err-empty-str.pdf'
+CombinePDF.load("../../test\ pdfs/Scribus-unknown_err2.pdf").save '../tmp/08_2-unknown-err-empty-str.pdf'
+CombinePDF.load("../../test\ pdfs/Scribus-unknown_err3.pdf").save '../tmp/08_3-unknown-err-empty-str.pdf'
+CombinePDF.load("../../test\ pdfs/xref_in_middle.pdf").save '../tmp/08_4-xref-in-middle.pdf'
+CombinePDF.load("../../test\ pdfs/xref_split.pdf").save '../tmp/08_5-xref-fragmented.pdf'
 
-CombinePDF.load("/Users/2Be/Ruby/test\ pdfs/nil_object.pdf").save('09_nil_in_parsed_array.pdf')
+CombinePDF.load("../../test\ pdfs/nil_object.pdf").save('../tmp/09_nil_in_parsed_array.pdf')
 
-encrypted = [ "./Ruby/test\ pdfs/pdf-reader/encrypted_version4_revision4_128bit_aes_user_pass_apples_enc_metadata.pdf",
-              "./Ruby/test\ pdfs/AESv2\ encrypted.pdf",
-              "./Ruby/test\ pdfs/pdf-reader/encrypted_version2_revision3_128bit_rc4_blank_user_pass.pdf",
-              "./Ruby/test\ pdfs/AES\ enc.pdf",
-              "./Ruby/test\ pdfs/RC4\ enc.pdf"]
+encrypted = [ "../../test\ pdfs/pdf-reader/encrypted_version4_revision4_128bit_aes_user_pass_apples_enc_metadata.pdf",
+              "../../test\ pdfs/AESv2\ encrypted.pdf",
+              "../../test\ pdfs/pdf-reader/encrypted_version2_revision3_128bit_rc4_blank_user_pass.pdf",
+              "../../test\ pdfs/AES\ enc.pdf",
+              "../../test\ pdfs/RC4\ enc.pdf"]
 
 encrypted.length.times do |i|
   fname = File.basename encrypted[i]
   begin
-    CombinePDF.load(encrypted[i]).save "10_#{i}_#{fname}"
+    CombinePDF.load(encrypted[i]).save "../tmp/10_#{i}_#{fname}"
   rescue => e
     puts e.class.name, e.message
     if(i == 0)
@@ -125,24 +126,24 @@ IO.binwrite '11_prawn.pdf', (Prawn::Document.new { text 'Hello World!' }).render
 page = CombinePDF.parse((Prawn::Document.new { text 'Hello World!' }).render)
 pdf = CombinePDF.new
 pdf << page
-pdf.save '11_parsed_from_prawn.pdf'
+pdf.save '../tmp/11_parsed_from_prawn.pdf'
 pdf = CombinePDF.new
 pdf << page << page
-pdf.save('11_AcrobatReader_is_unique_page.pdf')
+pdf.save('../tmp/11_AcrobatReader_is_unique_page.pdf')
 
 puts GC.stat.inspect
 # unify = [
-#   "./Ruby/test\ pdfs/AESv2\ encrypted.pdf",
-#   "./Ruby/test\ pdfs/data-in-comment.pdf",
-#   "./Ruby/test\ pdfs/file_name.pdf",
-#   "./Ruby/test\ pdfs/garbage_after_eof.pdf",
-#   "./Ruby/test\ pdfs/Many\ comments.pdf",
-#   "./Ruby/test\ pdfs/nested\ contents\ array.PDF",
-#   "./Ruby/test\ pdfs/nested_resources.pdf",
-#   "./Ruby/test\ pdfs/original-missing-endobje.pdf",
-#   "./Ruby/test\ pdfs/original-multi-issue.pdf",
-#   "./Ruby/test\ pdfs/page_stap_nil_secure.pdf",
-#   "./Ruby/test\ pdfs/referenced\ decryption.pdf",
+#   "../../test\ pdfs/AESv2\ encrypted.pdf",
+#   "../../test\ pdfs/data-in-comment.pdf",
+#   "../../test\ pdfs/file_name.pdf",
+#   "../../test\ pdfs/garbage_after_eof.pdf",
+#   "../../test\ pdfs/Many\ comments.pdf",
+#   "../../test\ pdfs/nested\ contents\ array.PDF",
+#   "../../test\ pdfs/nested_resources.pdf",
+#   "../../test\ pdfs/original-missing-endobje.pdf",
+#   "../../test\ pdfs/original-multi-issue.pdf",
+#   "../../test\ pdfs/page_stap_nil_secure.pdf",
+#   "../../test\ pdfs/referenced\ decryption.pdf",
 #   '',
 #   '',
 #   '',

data/test/combine_pdf/load_test.rb

@@ -0,0 +1,48 @@
+require 'bundler/setup'
+require 'minitest/autorun'
+require 'minitest/around/spec'
+require 'combine_pdf'
+
+describe 'CombinePDF.load' do
+  let(:options) { {} }
+
+  subject { CombinePDF.load "test/fixtures/files/#{file}", options }
+
+  describe 'raise_on_encrypted option' do
+    let(:file) { 'sample_encrypted_pdf.pdf' }
+    let(:options) { { raise_on_encrypted: raise_on_encrypted } }
+
+    describe 'when raise_on_encrypted: true' do
+      let(:raise_on_encrypted) { true }
+
+      describe 'with encrypted file' do
+        it('raises an CombinePDF::EncryptionError') do
+          error = assert_raises(CombinePDF::EncryptionError) { subject }
+          assert_match 'the file is encrypted', error.message
+        end
+      end
+
+      describe 'with unencrypted file' do
+        let(:file) { 'sample_pdf.pdf' }
+
+        it('has a PDF') { assert_instance_of CombinePDF::PDF, subject }
+      end
+    end
+
+    describe 'when raise_on_encrypted: false' do
+      let(:raise_on_encrypted) { false }
+
+      describe 'with encrypted file' do
+        it('does not raise an CombinePDF::EncryptionError') do
+          assert_instance_of CombinePDF::PDF, subject
+        end
+      end
+
+      describe 'with unencrypted file' do
+        let(:file) { 'sample_pdf.pdf' }
+
+        it('has a PDF') { assert_instance_of CombinePDF::PDF, subject }
+      end
+    end
+  end
+end

data/test/combine_pdf/renderer_test.rb

@@ -1,6 +1,4 @@
-require 'bundler/setup'
 require 'minitest/autorun'
-require 'combine_pdf/renderer'
 
 class CombinePDFRendererTest < Minitest::Test
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.26
 platform: ruby
 authors:
 - Boaz Segev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2023-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4
@@ -24,20 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.5
+- !ruby/object:Gem::Dependency
+  name: matrix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -52,16 +66,32 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-around
+  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: A nifty gem, in pure Ruby, to parse PDF files and combine (merge) them
   with other PDF files, number the pages, watermark them or stamp them, create tables,
   add basic text objects etc` (all using the PDF file format).
 email:
-- boaz@2be.co.il
+- bo@bowild.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -82,14 +112,17 @@ files:
 - lib/combine_pdf/renderer.rb
 - lib/combine_pdf/version.rb
 - test/automated
+- test/combine_pdf/load_test.rb
 - test/combine_pdf/renderer_test.rb
 - test/console
+- test/fixtures/files/sample_encrypted_pdf.pdf
+- test/fixtures/files/sample_pdf.pdf
 - test/named_dest
 homepage: https://github.com/boazsegev/combine_pdf
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -104,12 +137,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Combine, stamp and watermark PDF files in pure Ruby.
 test_files:
 - test/automated
+- test/combine_pdf/load_test.rb
 - test/combine_pdf/renderer_test.rb
 - test/console
+- test/fixtures/files/sample_encrypted_pdf.pdf
+- test/fixtures/files/sample_pdf.pdf
 - test/named_dest