combine_pdf 0.2.33 → 0.2.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc3b58971778d716ab9693eb7198523eff597e6a
-  data.tar.gz: 33bfb23329e6f0ba2917bd1eb5c120c401fe91a6
+  metadata.gz: 978b43d9e325d4e5eba06ceebb396565c0413bc1
+  data.tar.gz: b3f85e2ff8d5fa57643f4aa516c620a0b9dadafc
 SHA512:
-  metadata.gz: f314e20def37c16e4cdf35375cf214a5785ca3ab5b8a3ca07a8096f12d7601f1d0e5a4319ca7b4c0649dc488c668361a92058d4866aab54170d12b9ba4b8cd2b
-  data.tar.gz: b688dc96f6de9d79028170efdb26341bd45d2a947389b250b3795513946756267b00b4bcbbe0e41fa002881f0605f228a5d5048cf928c2655c7dca16d051ce65
+  metadata.gz: f0b111a144fe3b0c8ea54bb7a138d1d97e3d0f59af48e296e6286ea40dfb575c7f1573061e526f278c84765c75c6d56c1ee8d96dccb7c93c2972e296c568fd24
+  data.tar.gz: 0bfbf5060a5f5210fd2349acf898b2feced9e2610cf9c734cb9a20c5c969dfbd361f81ac769e48e4274b23c7217e4476d651daf608ce8a25c139288deecbab03

data/lib/combine_pdf/parser.rb

@@ -120,9 +120,6 @@ module CombinePDF
         end
       end
 
-      # Strings were unified, we can let them go..
-      @strings_dictionary.clear
-
       # serialize_objects_and_references.catalog_pages
 
       # Benchmark.bm do |bm|
@@ -135,6 +132,9 @@ module CombinePDF
 
       catalog_pages
 
+      # Strings were unified, we can let them go..
+      @strings_dictionary.clear
+
       # collect any missing objects from the forms_data
       unless @forms_object.nil? || @forms_object.empty?
         @forms_object[:related_objects] = (@parsed.select { |o| o[:FT] }).map! { |o| { is_reference_only: true, referenced_object: o } }
@@ -222,6 +222,8 @@ module CombinePDF
             out << { indirect_without_dictionary: out.pop, indirect_generation_number: out.pop, indirect_reference_id: out.pop }
           end
           fresh = true
+          # fix wkhtmltopdf use of PDF 1.1 Dest using symbols instead of strings
+          out.last[:Dest] = unify_string(out.last[:Dest].to_s) if out.last[:Dest] && out.last[:Dest].is_a?(Symbol)
         # puts "!!!!!!!!! Error with :indirect_reference_id\n\nObject #{out.last}  :indirect_reference_id = #{out.last[:indirect_reference_id]}" unless out.last[:indirect_reference_id].is_a?(Integer)
         ##########################################
         ## parse a Hex String
@@ -394,6 +396,8 @@ module CombinePDF
             else
               out << { indirect_without_dictionary: out.pop, indirect_generation_number: out.pop, indirect_reference_id: out.pop }
             end
+            # fix wkhtmltopdf use of PDF 1.1 Dest using symbols instead of strings
+            out.last[:Dest] = unify_string(out.last[:Dest].to_s) if out.last[:Dest] && out.last[:Dest].is_a?(Symbol)
             warn "'endobj' keyword was missing for Object ID: #{out.last[:indirect_reference_id]}, trying to auto-fix issue, but might fail."
 
             out << keep.pop
@@ -489,6 +493,11 @@ module CombinePDF
             @forms_object.update((catalogs[:AcroForm][:referenced_object] || catalogs[:AcroForm]), &self.class.method(:hash_update_proc_for_new)) if catalogs[:AcroForm]
             @names_object.update((catalogs[:Names][:referenced_object] || catalogs[:Names]), &self.class.method(:hash_update_proc_for_new)) if catalogs[:Names]
             @outlines_object.update((catalogs[:Outlines][:referenced_object] || catalogs[:Outlines]), &self.class.method(:hash_update_proc_for_new)) if catalogs[:Outlines]
+            if catalogs[:Dests] # convert PDF 1.1 Dests to PDF 1.2+ Dests
+              dests_arry = (@names_object[:Dests] ||= {})
+              dests_arry = ((dests_arry[:referenced_object] || dests_arry)[:Names] ||= [])
+              ((catalogs[:Dests][:referenced_object] || catalogs[:Dests])[:referenced_object] || (catalogs[:Dests][:referenced_object] || catalogs[:Dests])).each {|k,v| next if CombinePDF::PDF::PRIVATE_HASH_KEYS.include?(k); dests_arry << unify_string(k.to_s); dests_arry << v; }
+            end
             catalog_pages(catalogs[:Pages], inheritance_hash.dup) unless catalogs[:Pages].nil?
           end
         end

data/lib/combine_pdf/pdf_protected.rb

@@ -191,6 +191,7 @@ module CombinePDF
             if pos[0].is_a? String
               (pos.length / 2).times do |i|
                 dic << (pos[i * 2].clear << base.next!)
+                pos[(i * 2) + 1][0] = {is_reference_only: true, referenced_object: pages[pos[(i * 2) + 1][0]]} if(pos[(i * 2) + 1].is_a?(Array) && pos[(i * 2) + 1][0].is_a?(Integer))
                 dic << (pos[(i * 2) + 1].is_a?(Array) ? { is_reference_only: true, referenced_object: { indirect_without_dictionary: pos[(i * 2) + 1] } } : pos[(i * 2) + 1])
                 # dic << pos[(i * 2) + 1]
               end

data/lib/combine_pdf/pdf_public.rb

@@ -100,6 +100,8 @@ module CombinePDF
       @names = parser.names_object || {}
       @forms_data = parser.forms_object || {}
       @outlines = parser.outlines_object || {}
+      # rebuild the catalo, to fix wkhtmltopdf's use of static page numbers
+      rebuild_catalog
 
       # general globals
       @set_start_id = 1

data/lib/combine_pdf/version.rb

@@ -1,3 +1,3 @@
 module CombinePDF
-  VERSION = '0.2.33'.freeze
+  VERSION = '0.2.34'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 0.2.33
+  version: 0.2.34
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4