combine_pdf 1.0.23 → 1.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94a057a85d5c2709211baa3ed7d7deaf73fe93d6bb39ef76e0441a166fb36926
-  data.tar.gz: c7dc7060c7abd51d84ee871b5f818d6e23a797eb424a8a7a963b0ae7f7324921
+  metadata.gz: 4c479622755f0a124f3da336eda5869d8591068d30bd408d03c5c6ce2689d12d
+  data.tar.gz: 4591c79c64670d11c9693f7edaf61ad2361e6132ba15dc2d5507bf95207f329f
 SHA512:
-  metadata.gz: 110074ae751586009d436dd4dc997c7d6bb71480d782270fe67834458cecc7479b58effc8102745a437c718426c97ca78d9ea3d2941355ba1ce8fc6f34ab2b8a
-  data.tar.gz: 4cf409946ba651fd474f7ff8a3dbf56442afd96b35fe73b68013a9a863e01e9d766a516ea4ddd4f5af7f2c47192abc0619321a6bc01c5a4e0dcd0e192701d168
+  metadata.gz: c31f00b8ff30ed3fa2927cfc34953b48d152d98771b5a73c4534ea04d0c5f67321ffaac1dae2d052ad9f9458256d2c5d344f62e608f6d31bc923631922606760
+  data.tar.gz: 155834559ec9edd5eb4ad6f8935c12bad910918d1316f9a95963e878bf43fab3b035b2da2e5aae185188b86a5ce6261a7f0730933cb6acfe5ad23d48bd98082e

data/.github/workflows/main.yml

@@ -0,0 +1,32 @@
+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", "3.3"]
+        rubyopt: [""]
+        include:
+          - ruby: "3.3"
+            rubyopt: "--enable-frozen-string-literal --debug-frozen-string-literal"
+
+    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 RUBYOPT="${{ matrix.rubyopt }}"

data/CHANGELOG.md

@@ -1,6 +1,46 @@
 # Change Log
 
-#### Change log v.1.0.23 (2023-03-04)
+#### Change log v.1.0.31 (2025-04-08)
+
+**Fix**: RangeError: index out of range errors occurred with some malformed PDFs, when the number of bytes in a PDF `stream` didn't match the number of bytes expected according to the `Length` property. Credit to @Laykou and others for opening multiple issues (i.e., #205), as well as @julitrows, @mtwzim, and @Kaiito630, for pushing on this.
+
+**Fix**: frozen string literal lingering issues. Credit to @pauline-koch, @qdegraeve, @isaporto, @ncreuschling, @francescob, @@anthonykaufman and @ma-matsui for their input on this issue. Credit to @anthonykaufman for offering one possible solution and @Markus-Munk-Shipmondo for pushing on this. Credit to @mfazekas for opening PR #215 and for @RBIII, @juliolinarez, and @osvaldoalvaradodev for supporting it.
+
+**Fix**: possible permission issues. Credit to @davidwessman, @visini, @sander-deryckere, and @LindseySaari for exploring this.
+
+**Fix**: calling CombinePDF.parse with a frozen string literal. Credit to @lovro-bikic for offering one possible solution.
+
+**Fix**: Ruby 3.4 warning. Credit to @chaadow for offering one possible solution.
+
+#### Change log v.1.0.29 (2024-12-07)
+
+**Fix**: frozen string literal support fix. Credit to @francescob (Francesco) for PR #245.
+
+#### Change log v.1.0.28 (2024-11-12)
+
+**Fix**: use `require` to load code (instead of `load`). Credit to @casperisfine (Jean byroot Boussier) for PR #216.
+
+#### Change log v.1.0.27 (2024-11-10)
+
+**Performance**: fix performance issues with `object_id` usage in Ruby 3+. Credit to @amomchilov (Alexander Momchilov) for PR #241.
+
+**Performance**: use frozen string literals. Credit to @casperisfine (Jean byroot Boussier) for PR #239.
+
+#### 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.
 

data/README.md

@@ -7,23 +7,23 @@
 
 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
 

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"

data/lib/combine_pdf/api.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 
 module CombinePDF
   module_function

data/lib/combine_pdf/basic_writer.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 ########################################################
 ## Thoughts from reading the ISO 32000-1:2008
 ## this file is part of the CombinePDF library and the code
@@ -35,7 +36,7 @@ module CombinePDF
     # mediabox:: the PDF page size in PDF points. defaults to [0, 0, 612.0, 792.0] (US Letter)
     def initialize(mediabox = [0, 0, 612.0, 792.0])
       # indirect_reference_id, :indirect_generation_number
-      @contents = ''
+      @contents = String.new
       @base_font_name = 'Writer' + SecureRandom.hex(7) + 'PDF'
       self[:Type] = :Page
       self[:indirect_reference_id] = 0

data/lib/combine_pdf/decrypt.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 ########################################################
 ## Thoughts from reading the ISO 32000-1:2008
 ## this file is part of the CombinePDF library and the code
@@ -137,7 +138,7 @@ module CombinePDF
       object_key = @key.dup
       object_key << [encrypted_id].pack('i')[0..2]
       object_key << [encrypted_generation].pack('i')[0..1]
-      object_key << 'sAlT'.force_encoding(Encoding::ASCII_8BIT)
+      object_key << 'sAlT'.b
       key_length = object_key.length < 16 ? object_key.length : 16
 
       begin

data/lib/combine_pdf/exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CombinePDF
   class EncryptionError < StandardError
   end

data/lib/combine_pdf/filter.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 ########################################################
 ## Thoughts from reading the ISO 32000-1:2008
 ## this file is part of the CombinePDF library and the code

data/lib/combine_pdf/fonts.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 ########################################################
 ## Thoughts from reading the ISO 32000-1:2008
 ## this file is part of the CombinePDF library and the code

data/lib/combine_pdf/page_methods.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 ########################################################
 ## Thoughts from reading the ISO 32000-1:2008
 ## this file is part of the CombinePDF library and the code
@@ -214,7 +215,7 @@ module CombinePDF
       options[:text_padding] = 0 if options[:text_padding].to_f >= 1
 
       # create box stream
-      box_stream = ''
+      box_stream = +''
       # set graphic state for box
       if options[:box_color] || (options[:border_width].to_i > 0 && options[:border_color])
         # compute x and y position for text
@@ -290,7 +291,7 @@ module CombinePDF
       # reset x,y by text alignment - x,y are calculated from the bottom left
       # each unit (1) is 1/72 Inch
       # create text stream
-      text_stream = ''
+      text_stream = +''
       if !text.to_s.empty? && options[:font_size] != 0 && (options[:font_color] || options[:stroke_color])
         # compute x and y position for text
         x = options[:x] + (options[:width] * options[:text_padding])
@@ -679,7 +680,7 @@ module CombinePDF
       insert_content 'Q'
 
       # Prep content
-      @contents = ''
+      @contents = +''
       insert_content @contents
       @contents
     end
@@ -788,7 +789,7 @@ module CombinePDF
           # add to array
           if out.last.nil? || out.last[0] != fonts[i]
             out.last[1] << '>' unless out.last.nil?
-            out << [fonts[i], '<', 0, 0]
+            out << [fonts[i], (+'<'), 0, 0]
           end
           out.last[1] << (fonts_array[i].cmap.nil? ? (c.unpack('H*')[0]) : fonts_array[i].cmap[c])
           if fonts_array[i].metrics[c]

data/lib/combine_pdf/parser.rb

@@ -41,7 +41,7 @@ module CombinePDF
     # string:: the data to be parsed, as a String object.
     def initialize(string, options = {})
       raise TypeError, "couldn't parse data, expecting type String" unless string.is_a? String
-      @string_to_parse = string.force_encoding(Encoding::ASCII_8BIT)
+      @string_to_parse = (string.frozen? ? string.dup : string).force_encoding(Encoding::ASCII_8BIT)
       @literal_strings = [].dup
       @hex_strings = [].dup
       @streams = [].dup
@@ -262,7 +262,7 @@ module CombinePDF
         ##########################################
         elsif @scanner.scan(/\(/)
           # warn "Found a literal string"
-          str = ''.force_encoding(Encoding::ASCII_8BIT)
+          str = ''.b
           count = 1
           while count > 0 && @scanner.rest?
             scn = @scanner.scan_until(/[\(\)]/)
@@ -323,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
@@ -358,28 +358,30 @@ module CombinePDF
         ##########################################
         ## parse a Stream
         ##########################################
-        elsif @scanner.scan(/stream[ \t]*[\r\n]/)
-          @scanner.pos += 1 if @scanner.peek(1) == "\n".freeze && @scanner.matched[-1] != "\n".freeze
+        elsif @scanner.scan(/stream[ \t]*\r?\n?/)
           # 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
+          if(out.last.is_a?(Hash) && out.last[:Length].is_a?(Integer) && out.last[:Length])
+            @scanner.pos += out.last[:Length]
+            unless(@scanner.skip(/\r?\n?endstream/))
+              @scanner.pos = old_pos 
+              # raise error if the stream doesn't end.
+              unless @scanner.skip_until(/endstream/)
+                raise ParsingError, "Parsing Error: PDF file error - a stream object wasn't properly closed using 'endstream'!"
+              end
+            end
+          else
+            # raise error if the stream doesn't end.
+            unless @scanner.skip_until(/endstream/)
+              raise ParsingError, "Parsing Error: PDF file error - a stream object wasn't properly closed using 'endstream'!"
+            end
           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:
-          
-
-          # raise error if the stream doesn't end.
-          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) : ''
+          str = (length > 0) ? @scanner.string.slice(old_pos, length) : +''
 
           # warn "CombinePDF parser: detected Stream #{str.length} bytes long #{str[0..3]}...#{str[-4..-1]}"
 
@@ -632,17 +634,17 @@ module CombinePDF
     #
     def serialize_objects_and_references
       obj_dir = {}
-      objid_cache = {}
+      objid_cache = {}.compare_by_identity
       # create a dictionary for referenced objects (no value resolution at this point)
       # at the same time, delete duplicates and old versions when objects have multiple versions
       @parsed.uniq!
       @parsed.length.times do |i|
         o = @parsed[i]
-        objid_cache[o.object_id] = i
+        objid_cache[o] = i
         tmp_key = [o[:indirect_reference_id], o[:indirect_generation_number]]
         if tmp_found = obj_dir[tmp_key]
           tmp_found.clear
-          @parsed[objid_cache[tmp_found.object_id]] = nil
+          @parsed[objid_cache[tmp_found]] = nil
         end
         obj_dir[tmp_key] = o
       end
@@ -724,6 +726,7 @@ module CombinePDF
 
     # All Strings are one String
     def unify_string(str)
+      str = str.dup if(str.frozen?)
       str.force_encoding(Encoding::ASCII_8BIT)
       @strings_dictionary[str] ||= str
     end
@@ -765,9 +768,9 @@ module CombinePDF
     # end
 
     # # run block of code on evey PDF object (PDF objects are class Hash)
-    # def each_object(object, limit_references = true, already_visited = {}, &block)
+    # def each_object(object, limit_references = true, already_visited = {}.compare_by_identity, &block)
     # 	unless limit_references
-    # 		already_visited[object.object_id] = true
+    # 		already_visited[object] = true
     # 	end
     # 	case
     # 	when object.is_a?(Array)
@@ -776,7 +779,7 @@ module CombinePDF
     # 		yield(object)
     # 		unless limit_references && object[:is_reference_only]
     # 			object.each do |k,v|
-    # 				each_object(v, limit_references, already_visited, &block) unless already_visited[v.object_id]
+    # 				each_object(v, limit_references, already_visited, &block) unless already_visited[v]
     # 			end
     # 		end
     # 	end

data/lib/combine_pdf/pdf_protected.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 ########################################################
 ## Thoughts from reading the ISO 32000-1:2008
 ## this file is part of the CombinePDF library and the code
@@ -21,19 +22,19 @@ module CombinePDF
     # this is used for internal operations, such as injectng data using the << operator.
     def add_referenced()
       # an existing object map
-      resolved = {}.dup
-      existing = {}.dup
-      should_resolve = [].dup
+      resolved = {}.compare_by_identity
+      existing = {}
+      should_resolve = []
       #set all existing objects as resolved and register their children for future resolution
-      @objects.each { |obj| existing[obj] = obj ; resolved[obj.object_id] = obj; should_resolve << obj.values}
+      @objects.each { |obj| existing[obj] = obj ; resolved[obj] = obj; should_resolve << obj.values}
       # loop until should_resolve is empty
       while should_resolve.any?
         obj = should_resolve.pop
-        next if resolved[obj.object_id] # the object exists
+        next if resolved[obj] # the object exists
         if obj.is_a?(Hash)
           referenced = obj[:referenced_object]
           if referenced && referenced.any?
-            tmp = resolved[referenced.object_id]
+            tmp = resolved[referenced]
             if !tmp && referenced[:raw_stream_content]
               tmp = existing[referenced[:raw_stream_content]]
               # Avoid endless recursion by limiting it to a number of layers (default == 2)
@@ -42,18 +43,18 @@ module CombinePDF
             if tmp
               obj[:referenced_object] = tmp
             else
-              resolved[obj.object_id] = referenced
+              resolved[obj] = referenced
               #        existing[referenced] = referenced
               existing[referenced[:raw_stream_content]] = referenced
               should_resolve << referenced
               @objects << referenced
             end
           else
-            resolved[obj.object_id] = obj
-            obj.keys.each { |k| should_resolve << obj[k] unless !obj[k].is_a?(Enumerable) || resolved[obj[k].object_id] }
+            resolved[obj] = obj
+            obj.keys.each { |k| should_resolve << obj[k] unless !obj[k].is_a?(Enumerable) || resolved[obj[k]] }
           end
         elsif obj.is_a?(Array)
-          resolved[obj.object_id] = obj
+          resolved[obj] = obj
           should_resolve.concat obj
         end
       end
@@ -78,14 +79,14 @@ module CombinePDF
       page_list.concat(with_pages) unless with_pages.empty?
 
       # duplicate any non-unique pages - This is a special case to resolve Adobe Acrobat Reader issues (see issues #19 and #81)
-      uniqueness = {}.dup
-      page_list.each { |page| page = page[:referenced_object] || page; page = page.dup if uniqueness[page.object_id]; uniqueness[page.object_id] = page }
+      uniqueness = {}.compare_by_identity
+      page_list.each { |page| page = page[:referenced_object] || page; page = page.dup if uniqueness[page]; uniqueness[page] = page }
       page_list.clear
       page_list = uniqueness.values
       uniqueness.clear
 
       # build new Pages object
-      page_object_kids = [].dup
+      page_object_kids = []
       pages_object = { Type: :Pages, Count: page_list.length, Kids: page_object_kids }
       pages_object_reference = { referenced_object: pages_object, is_reference_only: true }
       page_list.each { |pg| pg[:Parent] = pages_object_reference; page_object_kids << ({ referenced_object: pg, is_reference_only: true }) }
@@ -186,17 +187,18 @@ module CombinePDF
     POSSIBLE_NAME_TREES = [:Dests, :AP, :Pages, :IDS, :Templates, :URLS, :JavaScript, :EmbeddedFiles, :AlternatePresentations, :Renditions].to_set.freeze
 
     def rebuild_names(name_tree = nil, base = 'CombinePDF_0000000')
+      base = +base
       if name_tree
         return nil unless name_tree.is_a?(Hash)
         name_tree = name_tree[:referenced_object] || name_tree
         dic = []
         # map a names tree and return a valid name tree. Do not recourse.
         should_resolve = [name_tree[:Kids], name_tree[:Names]]
-        resolved = [].to_set
+        resolved = Set.new.compare_by_identity
         while should_resolve.any?
           pos = should_resolve.pop
           if pos.is_a? Array
-            next if resolved.include?(pos.object_id)
+            next if resolved.include?(pos)
             if pos[0].is_a? String
               (pos.length / 2).times do |i|
                 dic << (pos[i * 2].clear << base.next!)
@@ -209,16 +211,16 @@ module CombinePDF
             end
           elsif pos.is_a? Hash
             pos = pos[:referenced_object] || pos
-            next if resolved.include?(pos.object_id)
+            next if resolved.include?(pos)
             should_resolve << pos[:Kids] if pos[:Kids]
             should_resolve << pos[:Names] if pos[:Names]
           end
-          resolved << pos.object_id
+          resolved << pos
         end
         return { referenced_object: { Names: dic }, is_reference_only: true }
       end
       @names ||= @names[:referenced_object]
-      new_names = { Type: :Names }.dup
+      new_names = { Type: :Names }
       POSSIBLE_NAME_TREES.each do |ntree|
         if @names[ntree]
           new_names[ntree] = rebuild_names(@names[ntree], base)
@@ -373,7 +375,7 @@ module CombinePDF
     private
 
     def equal_layers obj1, obj2, layer = CombinePDF.eq_depth_limit
-      return true if obj1.object_id == obj2.object_id
+      return true if obj1.equal?(obj2)
       if obj1.is_a? Hash
         return false unless obj2.is_a? Hash
         return false unless obj1.length == obj2.length

data/lib/combine_pdf/pdf_public.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-########################################################
+## frozen_string_literal: true
+#######################################################
 ## Thoughts from reading the ISO 32000-1:2008
 ## this file is part of the CombinePDF library and the code
 ## is subject to the same license.
@@ -93,7 +94,7 @@ module CombinePDF
       @version = 0
       @viewer_preferences = {}
       @info = {}
-      parser ||= PDFParser.new('')
+      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
 
@@ -175,8 +176,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
@@ -202,9 +207,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"
@@ -212,7 +217,7 @@ module CombinePDF
       # when finished, remove the numbering system and keep only pointers
       remove_old_ids
       # output the pdf stream
-      out.join("\n".force_encoding(Encoding::ASCII_8BIT)).force_encoding(Encoding::ASCII_8BIT)
+      out.join("\n".b).force_encoding(Encoding::ASCII_8BIT)
     end
 
     # this method returns all the pages cataloged in the catalog.

data/lib/combine_pdf/renderer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CombinePDF
   ################################################################
   ## These are common functions, used within the different classes
@@ -51,7 +52,7 @@ module CombinePDF
       if object.length == 0 || obj_bytes.min <= 31 || obj_bytes.max >= 127 # || (obj_bytes[0] != 68  object.match(/[^D\:\d\+\-Z\']/))
         # A hexadecimal string shall be written as a sequence of hexadecimal digits (0-9 and either A-F or a-f)
         # encoded as ASCII characters and enclosed within angle brackets (using LESS-THAN SIGN (3Ch) and GREATER- THAN SIGN (3Eh)).
-        "<#{object.unpack('H*')[0]}>".force_encoding(Encoding::ASCII_8BIT)
+        "<#{object.unpack('H*')[0]}>"
       else
         # a good fit for a Literal String or the string is a date (MUST be literal)
         ('(' + ([].tap { |out| obj_bytes.each { |byte| out.concat(STRING_REPLACEMENT_ARRAY[byte]) } } ).pack('C*') + ')').force_encoding(Encoding::ASCII_8BIT)
@@ -100,7 +101,7 @@ module CombinePDF
         end
         object[:indirect_reference_id] ||= 0
         object[:indirect_generation_number] ||= 0
-        return "#{object[:indirect_reference_id]} #{object[:indirect_generation_number]} R".force_encoding(Encoding::ASCII_8BIT)
+        return "#{object[:indirect_reference_id]} #{object[:indirect_generation_number]} R"
       end
 
       # if the object is indirect...
@@ -108,7 +109,7 @@ module CombinePDF
       if object[:indirect_reference_id]
         object[:indirect_reference_id] ||= 0
         object[:indirect_generation_number] ||= 0
-        out << "#{object[:indirect_reference_id]} #{object[:indirect_generation_number]} obj\n".force_encoding(Encoding::ASCII_8BIT)
+        out << "#{object[:indirect_reference_id]} #{object[:indirect_generation_number]} obj\n"
         if object[:indirect_without_dictionary]
           out << object_to_pdf(object[:indirect_without_dictionary])
           out << "\nendobj\n"
@@ -123,13 +124,13 @@ module CombinePDF
       # if the object is not a simple object, it is a dictionary
       # A dictionary shall be written as a sequence of key-value pairs enclosed in double angle brackets (<<...>>)
       # (using LESS-THAN SIGNs (3Ch) and GREATER-THAN SIGNs (3Eh)).
-      out << "<<\n".force_encoding(Encoding::ASCII_8BIT)
+      out << "<<\n".b
       object.each do |key, value|
-        out << "#{object_to_pdf key} #{object_to_pdf value}\n".force_encoding(Encoding::ASCII_8BIT) unless PDF::PRIVATE_HASH_KEYS.include? key
+        out << "#{object_to_pdf key} #{object_to_pdf value}\n" unless PDF::PRIVATE_HASH_KEYS.include? key
       end
       object.delete :Length
-      out << '>>'.force_encoding(Encoding::ASCII_8BIT)
-      out << "\nstream\n#{object[:raw_stream_content]}\nendstream".force_encoding(Encoding::ASCII_8BIT) if object[:raw_stream_content]
+      out << '>>'.b
+      out << "\nstream\n#{object[:raw_stream_content]}\nendstream" if object[:raw_stream_content]
       out << "\nendobj\n" if object[:indirect_reference_id]
       out.join.force_encoding(Encoding::ASCII_8BIT)
     end

data/lib/combine_pdf/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CombinePDF
-  VERSION = '1.0.23'.freeze
+  VERSION = '1.0.31'
 end

data/lib/combine_pdf.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 
 require 'zlib'
 require 'securerandom'
@@ -10,21 +11,21 @@ require 'digest'
 # require the RC4 Gem
 require 'rc4'
 
-load 'combine_pdf/api.rb'
-load 'combine_pdf/renderer.rb'
-load 'combine_pdf/page_methods.rb'
-load 'combine_pdf/basic_writer.rb'
-load 'combine_pdf/decrypt.rb'
-load 'combine_pdf/fonts.rb'
-load 'combine_pdf/filter.rb'
-load 'combine_pdf/parser.rb'
-load 'combine_pdf/pdf_public.rb'
-load 'combine_pdf/pdf_protected.rb'
-load 'combine_pdf/exceptions.rb'
+require 'combine_pdf/api'
+require 'combine_pdf/renderer'
+require 'combine_pdf/page_methods'
+require 'combine_pdf/basic_writer'
+require 'combine_pdf/decrypt'
+require 'combine_pdf/fonts'
+require 'combine_pdf/filter'
+require 'combine_pdf/parser'
+require 'combine_pdf/pdf_public'
+require 'combine_pdf/pdf_protected'
+require 'combine_pdf/exceptions'
 
-# load "combine_pdf/operations.rb"
+# require 'combine_pdf/operations'
 
-load 'combine_pdf/version.rb'
+require 'combine_pdf/version'
 
 # This is a pure ruby library to combine/merge, stmap/overlay and number PDF files - as well as to create tables (ment for indexing combined files).
 #

data/test/automated

@@ -3,7 +3,8 @@
 $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'
 
@@ -15,51 +16,51 @@ require 'combine_pdf'
 # Pry.start
 
 pdf = CombinePDF.load "../../test\ pdfs/filled_form.pdf"
-pdf.save '01_check_radio_buttuns.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 '02_check_form_unification_middle_is_empty.pdf'
+pdf.save '../tmp/02_check_form_unification_middle_is_empty.pdf'
 
 pdf = CombinePDF.load "../../test\ pdfs/check_form_data__objstreams_w_versions.pdf"
-pdf.save '02_01_check_form_data_ordering_issue.pdf'
+pdf.save '../tmp/02_01_check_form_data_ordering_issue.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 '../../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 '../../test pdfs/space_after_streram_keyword.pdf'
-pdf.save '03_02_extra_space_after_stream_keyword.pdf'
+pdf.save '../tmp/03_02_extra_space_after_stream_keyword.pdf'
 
 pdf = CombinePDF.load '../../test pdfs/nested_difference.pdf'
-pdf.save '03_03_nested_difference.pdf'
+pdf.save '../tmp/03_03_nested_difference.pdf'
 
 pdf = CombinePDF.load '../../test pdfs/names_go_haywire_0.pdf'
 pdf << CombinePDF.load('../../test pdfs/names_go_haywire_1.pdf')
-pdf.save '04_check_view_and_names_reference.pdf'
+pdf.save '../tmp/04_check_view_and_names_reference.pdf'
 
 pdf = CombinePDF.load('../../test pdfs/outlines/self_merge_err.pdf')
-pdf.save '05_x1_scribus_test.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 '05_x2_scribus_test.pdf'
+pdf.save '../tmp/05_x2_scribus_test.pdf'
 pdf = CombinePDF.load "../../test pdfs/outlines/named_dest.pdf";nil
-pdf.save '05_check_named_dest_links.pdf' # this will take a while
+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 '05_1_timeless_check_named_dest_links.pdf' # never ends... :-(
+pdf.save '../tmp/05_1_timeless_check_named_dest_links.pdf' # never ends... :-(
 
 pdf = CombinePDF.load '../../test pdfs/outline_small.pdf'
 pdf << CombinePDF.load('../../test pdfs/outline_small.pdf')
-pdf.save '06_check_links_to_second_copy.pdf'
+pdf.save '../tmp/06_check_links_to_second_copy.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)
 
@@ -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,15 +91,15 @@ 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("../../test\ pdfs/Scribus-unknown_err.pdf").save '08_1-unknown-err-empty-str.pdf'
-CombinePDF.load("../../test\ pdfs/Scribus-unknown_err2.pdf").save '08_2-unknown-err-empty-str.pdf'
-CombinePDF.load("../../test\ pdfs/Scribus-unknown_err3.pdf").save '08_3-unknown-err-empty-str.pdf'
-CombinePDF.load("../../test\ pdfs/xref_in_middle.pdf").save '08_4-xref-in-middle.pdf'
-CombinePDF.load("../../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("../../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 = [ "../../test\ pdfs/pdf-reader/encrypted_version4_revision4_128bit_aes_user_pass_apples_enc_metadata.pdf",
               "../../test\ pdfs/AESv2\ encrypted.pdf",
@@ -109,7 +110,7 @@ encrypted = [ "../../test\ pdfs/pdf-reader/encrypted_version4_revision4_128bit_a
 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,10 +126,10 @@ 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 = [

data/test/combine_pdf/renderer_test.rb

@@ -12,7 +12,7 @@ class CombinePDFRendererTest < Minitest::Test
 
   def test_numeric_array_to_pdf
     input = [1.234567, 0.000054, 5, -0.000099]
-    expected = "[1.234567 0.000054 5 -0.000099]".force_encoding('BINARY')
+    expected = "[1.234567 0.000054 5 -0.000099]".b
     actual = TestRenderer.new.test_object(input)
 
     assert_equal(expected, actual)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.0.31
 platform: ruby
 authors:
 - Boaz Segev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4
@@ -84,11 +84,12 @@ description: A nifty gem, in pure Ruby, to parse PDF files and combine (merge) t
   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
@@ -136,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Combine, stamp and watermark PDF files in pure Ruby.