combine_pdf 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d032a7ab4e8768046189f88860518e5de8f977f
-  data.tar.gz: 65c57d46be5f5cb0ec5a0fcbfbcfef207c3336cf
+  metadata.gz: 84c4c10854fe1876f80ef97367f22ac2ea60e2b1
+  data.tar.gz: 6ebc1e28df2124ceb2f845532601e48f962b908e
 SHA512:
-  metadata.gz: 0d9482bb42b38330f701644bdf41461ddf625a55625c7e1073b1e76fd09d9bada40c643c573b6a9c60fd4a6c6b6365642863b0e524100916755918973133820f
-  data.tar.gz: 79f5bc78ccbf0cafcb11a5c38a9bf16ac23d1123d0cfc307397dd42baeb23facc82f015556614f7195cfaf43072d2961fc148e03901661099bb446a8c0a8fb39
+  metadata.gz: 4779c64b3e923500c2e0aaab1e655763b9b055e5c85b44d00d304fc5e39f851ac075b8530453b55e3565c3ee540e584c518744de7e516b0dbceaa3109b2a30ae
+  data.tar.gz: 567e5a818742da6e0b76e5eb647cde9b8b98ed184b557e0b1c6718f289559097b145f34647c4a5cac12521f42027c97184aa973af2bb18a0b3742423d73444c3

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ***
 
+Change log v.0.2.3
+
+**update**: a better general error message for CombinePDF.new
+
+**fix**: the `make_secure` now correctly sets the secure copy flag, as expected. For performance reasons it is better to use page.copy(true) for renaming conflicting resource identifiers, but if multiple secure copies are needed for some reason, using `make_secure` will now make sure each copy is secured independently.
+
+**fix**: the secure copy now worked as expected (it had issue with referenced resource dictionaries that was resolved by following the references).
+
+**fix**: fixed an object numbering issue introduced by duplicating pages as part of the Adobe Reader bug workaround. The issue was thought to have been fixed before but some PDF structures were not proprly addressed.
+
+***
+
 Change log v.0.2.2
 
 **fix**: fixed the default value for the :location attribute of PDF#stamp_pages(String, options). Now, instead of the default stamp being written at [:top, :bottom], it's default location will be set to [:center].

data/lib/combine_pdf/api.rb

@@ -25,7 +25,12 @@ module CombinePDF
 	def new(string = false)
 		return PDF.new unless string
 		raise TypeError, "couldn't create PDF object, expecting type String" unless string.is_a?(String) || string.is_a?(Pathname)
-		(File.file? string rescue false) ? load(string) : parse(string)
+		begin
+			(File.file? string rescue false) ? load(string) : parse(string)
+		rescue => e
+			raise 'General PDF error - Use CombinePDF.load or CombinePDF.parse for a non-general error message (the requested file was not found OR the string received is not a valid PDF stream OR the file was found but not valid).'
+		end
+		
 	end
 
 	# Create a PDF object from a raw PDF data (parsing the data).

data/lib/combine_pdf/page_methods.rb

@@ -542,9 +542,10 @@ module CombinePDF
 			self
 		end
 
+		# creates a copy of the page. if the :secure flag is set to true, the resource indentifiers (fonts etc') will be renamed in order to secure their uniqueness.
+		def copy(secure = false)
 		# since only the Content streams are modified (Resource hashes are created anew),
 		# it should be safe (and a lot faster) to create a deep copy only for the content hashes and streams.
-		def copy(secure = false)
 			delete :Parent
 			prep_content_array
 			page_copy = self.clone
@@ -555,15 +556,15 @@ module CombinePDF
 				obj
 			end
 			if page_copy[:Resources]
-				page_copy[:Resources] = page_copy[:Resources].dup
-				page_copy[:Resources][:referenced_object] = page_copy[:Resources][:referenced_object].dup if page_copy[:Resources][:referenced_object]
-				page_res = page_copy.resources
+				page_res = page_copy[:Resources] = page_copy[:Resources].dup
+				page_res = page_copy[:Resources][:referenced_object] = page_copy[:Resources][:referenced_object].dup if page_copy[:Resources][:referenced_object]
 				page_res.each do |k, v|
-					page_res[k] = v.dup if v.is_a?(Array) || v.is_a?(Hash)
-					v[:referenced_object] = v[:referenced_object].dup if v.is_a?(Hash) && v[:referenced_object]
+					v = page_res[k] = v.dup if v.is_a?(Array) || v.is_a?(Hash)
+					v = v[:referenced_object] = v[:referenced_object].dup if v.is_a?(Hash) && v[:referenced_object]
+					v = v[:referenced_object] = v[:referenced_object].dup if v.is_a?(Hash) && v[:referenced_object]
 				end
 			end
-			return page_copy.instance_exec(secure) { |s| secure_for_copy if s ; init_contents; self }
+			return page_copy.instance_exec(secure || @secure_injection) { |s| secure_for_copy if s ; init_contents; self }
 		end
 
 		###################################
@@ -749,8 +750,13 @@ module CombinePDF
 			names_dictionary = {}
 
 			# travel every dictionary to pick up names (keys), change them and add them to the dictionary
-			self[:Resources].each do |k,v|
+			res = self.resources
+			res.each do |k,v|
 				if v.is_a?(Hash)
+					# if k == :XObject
+					# 	self[:Resources][k] = v.dup
+					# 	next
+					# end
 					new_dictionary = {}
 					new_name = "Combine" + SecureRandom.hex(7) + "PDF"
 					i = 1
@@ -760,7 +766,7 @@ module CombinePDF
 						new_dictionary[new_key] = value
 						i += 1
 					end
-					self[:Resources][k] = new_dictionary
+					res[k] = new_dictionary
 				end
 			end
 

data/lib/combine_pdf/parser.rb

@@ -349,7 +349,7 @@ module CombinePDF
 
 
 		# resets cataloging and pages
-		def catalog_pages(catalogs = nil, secure_injection = true, inheritance_hash = {})
+		def catalog_pages(catalogs = nil, secure_injection = false, inheritance_hash = {})
 			unless catalogs
 
 				if root_object[:Root]

data/lib/combine_pdf/pdf_protected.rb

@@ -35,7 +35,7 @@ module CombinePDF
 				# first if statement is actually a workaround for a bug in Acrobat Reader, regarding duplicate pages.
 				if object[:is_reference_only] && object[:referenced_object] && object[:referenced_object].is_a?(Hash) && object[:referenced_object][:Type] == :Page
 					if @objects.find_index object[:referenced_object]
-						@objects << object[:referenced_object].dup
+						@objects << (object[:referenced_object] = object[:referenced_object].dup)
 					else
 						@objects << object[:referenced_object]
 					end

data/lib/combine_pdf/pdf_public.rb

@@ -303,6 +303,7 @@ module CombinePDF
 				warn "Shouldn't add objects to the file unless they are PDF objects or PDF pages (an Array or a single PDF page)."
 				return false # return false, which will also stop any chaining.
 			end
+			# pages_to_add.map! {|page| page.copy }
 			catalog = rebuild_catalog
 			pages_array = catalog[:Pages][:referenced_object][:Kids]
 			page_count = pages_array.length
@@ -363,6 +364,11 @@ module CombinePDF
 			just_center = [:center]
 			small_font_size = opt[:font_size] || 12
 
+			# some common computations can be done only once.
+			from_height = opt[:margin_from_height]
+			from_side = opt[:margin_from_side]
+			left_position = from_side
+
 			(opt[:page_range] ? pages[opt[:page_range]] : pages).each do |page|
 				# Get page dimensions
 				mediabox = page[:CropBox] || page[:MediaBox] || [0, 0, 595.3, 841.9]
@@ -384,20 +390,20 @@ module CombinePDF
 					add_opt = { font_size: small_font_size }.merge(opt)
 					# text = opt[:number_format] % page_number
 					# compute locations for text boxes
-					text_dimantions = page.dimensions_of( text, opt[:font], small_font_size )
+					text_dimantions = Fonts.dimensions_of( text, opt[:font], small_font_size )
 					box_width = text_dimantions[0] * 1.2
 					box_height = text_dimantions[1] * 2
-					add_opt[:width] ||= box_width
-					add_opt[:height] ||= box_height
-					from_height = add_opt[:margin_from_height]
-					from_side = add_opt[:margin_from_side]
 					page_width = mediabox[2]
 					page_height = mediabox[3]
+
+					add_opt[:width] ||= box_width
+					add_opt[:height] ||= box_height
+
 					center_position = (page_width - box_width)/2
-					left_position = from_side
 					right_position = page_width - from_side - box_width
 					top_position = page_height - from_height
 					bottom_position = from_height + box_height
+					
 					if opt[:location].include? :top
 						 page.textbox text, {x: center_position, y: top_position }.merge(add_opt)
 					end

data/lib/combine_pdf/version.rb

@@ -1,3 +1,4 @@
 module CombinePDF
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4