combine_pdf 1.0.23 → 1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94a057a85d5c2709211baa3ed7d7deaf73fe93d6bb39ef76e0441a166fb36926
-  data.tar.gz: c7dc7060c7abd51d84ee871b5f818d6e23a797eb424a8a7a963b0ae7f7324921
+  metadata.gz: 54586af58c21708b23e6c368b9a0841b4363ebd8113103d9d37deb045032485f
+  data.tar.gz: 121335c835d1902872e6b53de3b8bfc798dce9c83c0fdfaa0927c47e2771d0cc
 SHA512:
-  metadata.gz: 110074ae751586009d436dd4dc997c7d6bb71480d782270fe67834458cecc7479b58effc8102745a437c718426c97ca78d9ea3d2941355ba1ce8fc6f34ab2b8a
-  data.tar.gz: 4cf409946ba651fd474f7ff8a3dbf56442afd96b35fe73b68013a9a863e01e9d766a516ea4ddd4f5af7f2c47192abc0619321a6bc01c5a4e0dcd0e192701d168
+  metadata.gz: a52629b113303a5df9000ac65d33fa5d7843ee74d8977ee7005ae43a476e63917fb462265915b25f8b5b7c6e902cf9a0f4d36f504dbc47651015c058b322c96b
+  data.tar.gz: 6fb00ab0f0ad9e482a850402e83183e9c1fbc0603093d069930a42ba51d704a4cad5cfb8086a27123cbe06f8b735dade401dc014b843b542cb8b1f84d0a680e0

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/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Change Log
 
-#### Change log v.1.0.23 (2023-03-04)
+#### Change log v.1.0.25 (2023-12-19)
+
+**Fix**: possible improve memory usage. Credit to @denislavski (Denislav Naydenov) for opening PR #223 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/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/parser.rb

@@ -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

data/lib/combine_pdf/pdf_public.rb

@@ -175,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
@@ -202,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 " % 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"

data/lib/combine_pdf/version.rb

@@ -1,3 +1,3 @@
 module CombinePDF
-  VERSION = '1.0.23'.freeze
+  VERSION = '1.0.25'.freeze
 end

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 = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.0.25
 platform: ruby
 authors:
 - Boaz Segev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2023-12-19 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