combine_pdf 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1379a60fa97dde419575868f841a676254f61cd
-  data.tar.gz: e55e8f95eaefa828499d393147a13ace92fbd70b
+  metadata.gz: b5162b002d09ae2f68f9d9075cdaf3d426145dcf
+  data.tar.gz: 931f19e236ec1bdad706132fa54a916eca003d4b
 SHA512:
-  metadata.gz: 2cd478b21fe7634e7abb4552fa1b0770465c7e097b00c7ba842d19e243a529667e8b48fdeb7bae64117e30419e9d7fd7a9aeca39d35f342910df4656f887f6c6
-  data.tar.gz: 72d49c89926cb106d133fb17746ec2374225c2d5e5e72c8a4f1c38779d9f6abc188a82c1aa610ebb15ce8adf6da9419ae6ef175dd3b3fb84e6bc8cb938cd9680
+  metadata.gz: 21eb86cceba04206594dcc87051eabb8af42b3217bb07484686837e4c024c81073864da715af5a8aa5a3b1095bbdc521b0ad02b8f87b6d4d579cde8d4037f614
+  data.tar.gz: 76e795a4209d9176c068ee0f158cc54150b6100a832daf4e53a676b686e20dfc350e909e4f0e08b5d289ed36c38ec0ab93b00d7b2289f95e0626c31a7c22544b

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ***
 
+Change log v.0.2.8
+
+* **Fix/Feature**:
+
+     Experience shows that it's very difficult to know when to use `page.copy` v.s. `page.copy(true)` before stamping one pdf pages on top (or under) another... So...
+
+     Now there is no longer any need for the guesswork. The process is automated for you.
+
+     The moment CombinePDF recognizes a resource name conflice between two pages (such as both pages using one font name to reference two different fonts), CombinePDF will intrusively rename the incoming page's resources. 
+
+     It is true that the intrusive resource renaming is somewhat risky and might require the inflation of some comperssed page data (resulting in bigger file sizes), but this is the only way to attempt and prevent PDF data curruption.
+
+***
+
 Change log v.0.2.7
 
 **Fix**: Fixed an issue where a malformed PDF String could cause the parser to hang.

data/README.md

@@ -1,5 +1,6 @@
 # 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)
 
 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).
 

data/lib/combine_pdf/page_methods.rb

@@ -55,7 +55,7 @@ module CombinePDF
 			
 			raise TypeError, "couldn't inject data, expecting a PDF page (Hash type)" unless obj.is_a?(Page_Methods)
 
-			obj = obj.copy #obj.copy(secure_injection)
+			obj = obj.copy( should_secure?(obj) ) #obj.copy(secure_injection)
 
 			# 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)
@@ -821,133 +821,14 @@ module CombinePDF
 			self
 		end
 
-
-
-# ################
-# ##
-
-# 		def inject_to_page page = {Type: :Page, MediaBox: [0,0,612.0,792.0], Resources: {}, Contents: []}, stream = nil, top = true
-# 			# make sure both the page reciving the new data and the injected page are of the correct data type.
-# 			return false unless page.is_a?(Hash) && stream.is_a?(Hash)
-
-# 			# 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)
-# 			page[:Resources] ||= {}
-# 			original_resources = page[:Resources]
-# 			if original_resources[:is_reference_only]
-# 				original_resources = original_resources[:referenced_object]
-# 				raise "Couldn't tap into resources dictionary, as it is a reference and isn't linked." unless original_resources
-# 			end
-# 			original_contents = page[:Contents]
-# 			original_contents = [original_contents] unless original_contents.is_a? Array
-
-# 			stream[:Resources] ||= {}
-# 			stream_resources = stream[:Resources]
-# 			if stream_resources[:is_reference_only]
-# 				stream_resources = stream_resources[:referenced_object]
-# 				raise "Couldn't tap into resources dictionary, as it is a reference and isn't linked." unless stream_resources
-# 			end
-# 			stream_contents = stream[:Contents]
-# 			stream_contents = [stream_contents] unless stream_contents.is_a? Array
-
-# 			# collect keys as objects - this is to make sure that
-# 			# we are working on the actual resource data, rather then references
-# 			flatten_resources_dictionaries stream_resources
-# 			flatten_resources_dictionaries original_resources
-
-# 			# injecting each of the values in the injected Page
-# 			stream_resources.each do |key, new_val|
-# 				unless PRIVATE_HASH_KEYS.include? key # keep CombinePDF structual data intact.
-# 					if original_resources[key].nil?
-# 						original_resources[key] = new_val
-# 					elsif original_resources[key].is_a?(Hash) && new_val.is_a?(Hash)
-# 						new_val.update original_resources[key] # make sure the old values are respected
-# 						original_resources[key].update new_val # transfer old and new values to the injected page
-# 					end #Do nothing if array - ot is the PROC array, which is an issue
-# 				end
-# 			end
-# 			original_resources[:ProcSet] = [:PDF, :Text, :ImageB, :ImageC, :ImageI] # this was recommended by the ISO. 32000-1:2008
-
-# 			if top # if this is a stamp (overlay)
-# 				page[:Contents] = original_contents
-# 				page[:Contents].unshift create_deep_copy(CONTENT_CONTAINER_START)
-# 				page[:Contents].push create_deep_copy(CONTENT_CONTAINER_MIDDLE)
-# 				page[:Contents].push *stream_contents
-# 				page[:Contents].push create_deep_copy(CONTENT_CONTAINER_END)
-# 			else #if this was a watermark (underlay? would be lost if the page was scanned, as white might not be transparent)
-# 				page[:Contents] = stream_contents
-# 				page[:Contents].unshift create_deep_copy(CONTENT_CONTAINER_START)
-# 				page[:Contents].push create_deep_copy(CONTENT_CONTAINER_MIDDLE)
-# 				page[:Contents].push *original_contents
-# 				page[:Contents].push create_deep_copy(CONTENT_CONTAINER_END)
-# 			end
-
-# 			page
-# 		end
-# 		# copy_and_secure_for_injection(page)
-# 		# - page is a page in the pages array, i.e.
-# 		#   pdf.pages[0]
-# 		# takes a page object and:
-# 		#
-# 		# makes a deep copy of the page (Ruby defaults to pointers, so this will copy the memory).
-# 		#
-# 		# then it will rewrite the content stream with renamed resources, so as to avoid name conflicts.
-# 		def copy_and_secure_for_injection(page)
-# 			# copy page
-# 			new_page = create_deep_copy page
-
-# 			# initiate dictionary from old names to new names
-# 			names_dictionary = {}
-
-# 			# itirate through all keys that are name objects and give them new names (add to dic)
-# 			# this should be done for every dictionary in :Resources
-# 			# this is a few steps stage:
-
-# 			# 1. get resources object
-# 			resources = new_page[:Resources]
-# 			if resources[:is_reference_only]
-# 				resources = resources[:referenced_object]
-# 				raise "Couldn't tap into resources dictionary, as it is a reference and isn't linked." unless resources
-# 			end
-
-# 			# 2. establich direct access to dictionaries and remove reference values
-# 			flatten_resources_dictionaries resources
-
-# 			# 3. travel every dictionary to pick up names (keys), change them and add them to the dictionary
-# 			resources.each do |k,v|
-# 				if v.is_a?(Hash)
-# 					new_dictionary = {}
-# 					new_name = "Combine" + SecureRandom.hex(7) + "PDF"
-# 					i = 1
-# 					v.each do |old_key, value|
-# 						new_key = (new_name + i.to_s).to_sym
-# 						names_dictionary[old_key] = new_key
-# 						new_dictionary[new_key] = value
-# 						i += 1
-# 					end
-# 					resources[k] = new_dictionary
-# 				end
-# 			end
-
-# 			# now that we have replaced the names in the resources dictionaries,
-# 			# it is time to replace the names inside the stream
-# 			# we will need to make sure we have access to the stream injected
-# 			# we will user PDFFilter.inflate_object
-# 			(new_page[:Contents].is_a?(Array) ? new_page[:Contents] : [new_page[:Contents] ]).each do |c|
-# 				stream = c[:referenced_object]
-# 				PDFFilter.inflate_object stream
-# 				names_dictionary.each do |old_key, new_key|
-# 					stream[:raw_stream_content].gsub! _object_to_pdf(old_key), _object_to_pdf(new_key)  ##### PRAY(!) that the parsed datawill be correctly reproduced! 
-# 				end
-# 				# patch back to PDF defaults, for OCRed PDF files.
-# 				# stream[:raw_stream_content] = "q\nq\nq\nDeviceRGB CS\nDeviceRGB cs\n0 0 0 rg\n0 0 0 RG\n0 Tr\n%s\nQ\nQ\nQ\n" % stream[:raw_stream_content]
-# 				# the following was removed for Acrobat Reader compatability: DeviceRGB CS\nDeviceRGB cs\n
-# 				stream[:raw_stream_content] = "q\nq\nq\n0 0 0 rg\n0 0 0 RG\n0 Tr\n1 0 0 1 0 0 cm\n%s\nQ\nQ\nQ\n" % stream[:raw_stream_content]
-# 			end
-
-# 			new_page
-# 		end
-
+		# @return [true, false] returns true if there are two different resources sharing the same named reference.
+		def should_secure?(page)
+			# travel every dictionary to pick up names (keys), change them and add them to the dictionary
+			res = self.resources
+			foreign_res = page.resources
+			res.each {|k,v| v.keys.each {|name| return true if foreign_res[k][name] && foreign_res[k][name] != v[name]} if v.is_a?(Hash) }
+			false
+		end
 
 	end
 	

data/lib/combine_pdf/version.rb

@@ -1,4 +1,4 @@
 module CombinePDF
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4