combine_pdf 0.2.27 → 0.2.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b28c525adfbcb7025e3510ede89ba70593ee92cc
-  data.tar.gz: bcd134da186dadebdc27839c2ce09f3133119763
+  metadata.gz: 7e665b1407b7f024cb4677c9e5152f7204f3a141
+  data.tar.gz: f77b60319109b23185cd6679a7225eb9e9db1ae7
 SHA512:
-  metadata.gz: a61cd27e67327472a645bccb8f4f63c7e472d65ae51b122727e7eddca4ff9d58ead490030a55dc991450df2ae2f41343845f19cf587d5aff21ca7a93dcb0ba79
-  data.tar.gz: b5bfe0b958dd21ae305698b1e4376940a1fe0055f79cfbf75d8a0d003ba7de57dfb8b2d9cd15e39fc6dcac8277ff9f766fc9163154f4b39f4ec9b67ebf5f5c55
+  metadata.gz: 1ca99906c7a250a9f23c65756b926b563d5b96df53c1532bbcd31925bcf7feda251b51c71dbbba71ce1a0685ec4787d6ad107b290a2f6367bc7d17e37dc37a99
+  data.tar.gz: 8b57956404ed802515dfac20b28e8f104e27475d7672c53e4681e1522fd013962cfb1e0f0ecd676a5a1eeac396c3837d26d5bcf933f7f508ba5d40f9e55382a7

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ***
 
+Change log v.0.2.28
+
+**Fix**: Fixed an issue related to page stumping, which was introduced when the Rubocop beautification changed the logic of an `if` statement in the Resource merger. Credit to Leon Miller-Out (@sbleon) for noticing the issue, testing and opening PR #76.
+
+***
+
 Change log v.0.2.27
 
 **Fix**: Fixed an issue where a `nil` outline count would cause PDF merger to fail.

data/README.md

@@ -18,19 +18,17 @@ Quick rundown:
 
 * When reading PDF Forms, some form data might be lost. I tried fixing this to the best of my ability, but I'm not sure it all works just yet.
 
-* When combining PDF Forms, form data might be unified. If you're combining two PDF files with form data, the data might be unified. I couldn't fix this, but frankly, I kinda liked the issue... it's almost a feature.
+* When combining PDF Forms, form data might be unified. I couldn't fix this because this is how PDF forms work (filling a feild fills in the data in any field with the same name), but frankly, I kinda liked the issue... it's almost a feature.
 
-* When unifying the same TOC data more then once, one of the references will be unified with the other.
+* When unifying the same TOC data more then once, one of the references will be unified with the other (meaning that if the pages look the same, both references will link to the same page instead of linking to two different pages). You can fix this by adding content to the pages before merging the PDF files (i.e. add empty text boxes to all the pages).
 
-* Links and named destinations (i.e., a link in the PDF to a web page or a different page in the same PDF) might break. Again, I tried fixing this, but some of it depends on the TOC and some of it is susceptible to conflicts between files.
+* Some links and data (URL links and PDF "Named Destinations") are stored at the root of a PDF and they aren't linked back to from the page. Keeping this information requires merging the PDF objects rather then their pages.
 
-    Also, some links and data (URL links and PDF "Named Destinations") are stored at the root of a PDF and they aren't linked back to from the page.
-
-    For this reason, some links will be lost when ripping pages out of PDF files and merging them with another PDF.
+    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.
 
-* 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 it is avoidable using `CombinePDF.load(pdf_file, allow_optional_content: true)`.
+* 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)`.
 
 CombinePDF is written natively in Ruby and should (presumably) work on all Ruby platforms that follow Ruby 2.0 compatibility.
 
@@ -187,3 +185,12 @@ Credit to his wonderful is given here. Please respect his license and copyright.
 License
 =======
 MIT
+
+Contributions
+=======
+
+You can look at the [GitHub Issues Page](https://github.com/boazsegev/combine_pdf/issues) and see the ["help wanted"](https://github.com/boazsegev/combine_pdf/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) tags.
+
+If you're thinking of donations or sending me money - no need. This project can sustain itself without your money.
+
+What this project needs is the time given by caring developers who keep it up to date and fix any documentation errors or issues they notice ... having said that, gifts (such as free coffee or iTunes gift cards) are always fun. But I think there are those in real need that will benefit more from your generosity.

data/lib/combine_pdf/page_methods.rb

@@ -60,19 +60,40 @@ module CombinePDF
       # following the reference chain and assigning a pointer to the correct Resouces object.
       # (assignments of Strings, Arrays and Hashes are pointers in Ruby, unless the .dup method is called)
 
-      # injecting each of the values in the injected Page
-      res = resources
+      # setup references to avoid method calls.
+      local_res = resources
+      local_val = nil
+      # setup references to avoid method calls.
+      remote_res = obj.resources
+      remote_val = nil
+
+      # add each of the new resources in the uncoming Page to the local resource Hash
       obj.resources.each do |key, new_val|
-        if !PDF::PRIVATE_HASH_KEYS.include?(key) # keep CombinePDF structual data intact.
-          next unless res[key].nil?
-          res[key] = new_val
-        elsif res[key].is_a?(Hash) && new_val.is_a?(Hash)
-          new_val = new_val[:referenced_object] || new_val
-          new_val.update (res[key][:referenced_object] || res[key]) # make sure the old values are respected
-          (res[key][:referenced_object] || res[key]).update new_val # transfer old and new values to the injected page
-          # Do nothing if array - ot is the PROC array, which is an issue
-        end
+        # keep CombinePDF structural data intact.
+        next if PDF::PRIVATE_HASH_KEYS.include?(key)
+        # review
+        if local_res[key].nil?
+          # no local data, adopt data from incoming page
+          local_res[key] = new_val
+          # go back to looping, no need to parse the rest of the Ruby
+          next
+        elsif (local_val = actual_object(local_res[key])).is_a?(Hash) && (new_val = actual_object(new_val)).is_a?(Hash)
+          # marge data with priority to the incoming page's data
+          new_val.update local_val # make sure the old values are respected
+          local_val.update new_val # transfer old and new values to the injected page
+        end # Do nothing if array or anything else
       end
+
+      # concat the Annots array? (what good are named links if the names are in the unaccessible Page Catalog?)
+      # if obj[:Annots]
+      #   if (local_val = actual_object(self[:Annots])).nil?
+      #     self[:Annots] = obj[:Annots]
+      #   elsif local_val.is_a?(Array) && (remote_val = actual_object(obj[:Annots])).is_a?(Array)
+      #     local_val.concat remote_val
+      #   end
+      # end
+
+      # set ProcSet to recommended value
       resources[:ProcSet] = [:PDF, :Text, :ImageB, :ImageC, :ImageI] # this was recommended by the ISO. 32000-1:2008
 
       if top # if this is a stamp (overlay)

data/lib/combine_pdf/version.rb

@@ -1,3 +1,3 @@
 module CombinePDF
-  VERSION = '0.2.27'.freeze
+  VERSION = '0.2.28'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 0.2.27
+  version: 0.2.28
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4