combine_pdf 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f66dc648f9871931fd703730cb5f876d41f17f95
-  data.tar.gz: f0e29ec0a4fdc4950c5f85f48ec5ea7eb556c03d
+  metadata.gz: 1bfb2a58c87c43e094eda71bc971b99aac3675ac
+  data.tar.gz: 0f6bcfd43bab6cfefb7d27683fe034df25af740b
 SHA512:
-  metadata.gz: fefebcb9e77a306f4099e91f05fc60efa2596b33afc2ff484562d82cda06494d86e11349c00e6724ad5978b4795cf999236fa273d933df25a93e9975f91e9e65
-  data.tar.gz: 8f2e46ba6d0b3f136d80a38b95d85b6271b433216fa59faea82bf668835a356b65399d87a35fda7e095e3d03d210768fb2b659df3546ddafb4df734fbc8517a7
+  metadata.gz: f1fe8e6cc9a5c0f2643c6500b4560c1818bf02f894c9d995443f38416f4839e0fdb551a2c96ee298bbedb3d2968a69230a9fd330efd1e7bbf3349a897c3b0e79
+  data.tar.gz: 155bacd58c22e799dc3db655fc89e4fe03d536287a71883edb2ce8ce7deb051d538773c34e51e4d1cd8a553feaf6c934675510bd37529cfd81a16a614faf0dd5

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ***
 
+Change log v.0.2.13
+
+**Fix** fixed issue # 37 reported by @sega (thank you for reporting!), regarding the insability to stamp one PDF page over another when one PDF page used a resource directory propegated with data and another page used a resource directory propegated with references. This was now resolved by checking for references before merging the data.
+
+**Compatability**: fixed an issue where PrimoPDF would ommit the required EOL marker before the `endstream`. This would cause malformed PDF files to be written and it is now resolved by allowing the required EOL to be optional.
+
+**Minor**: a minor improvement on the compatability fix related to salvaging PDF data that was misplaced within a PDF comment. This improvement relates to the possibility that there might not be an EOL marker after the `obj` keyword (PaperPort does use an EOL after the `obj` keyword, so this isn't critical).
+
+***
+
 Change log v.0.2.12
 
 **Compatability**: fixed issue #36 reported by @vitstradal (thank you for reporting!) regarding PDF files composed by PaperPort. PaperPort (at least version 12) has an issue where PDF data will be placed within a PDF comment. PDF comments start with a "%" sign and end with an EOL marker ("\r" or "\n"). PaperPort ommitted the EOL marker, placing critical data within the comment. A work-around was found by parsing the comment's data and attempting to salvage the misplaced data. This workaround assumes that comments would not contain PDF parsable data at the very end of the comment's line... which is an unsafe assumption. hence, **please let me know if you find _any_ PDF files that worked before the workaround was introduced**.

data/lib/combine_pdf/filter.rb

@@ -50,6 +50,8 @@ module CombinePDF
 			unless params_array.is_a?(Array)
 				params_array = [params_array]
 			end
+			object[:Filter] = filter_array
+			object[:DecodeParms] = params_array
 			while filter_array[0]
 				case filter_array[0]
 				when :FlateDecode
@@ -61,9 +63,11 @@ module CombinePDF
 						if (2..9).include? params_array[0][:Predictor].to_i
 							####
 							# prepare TIFF group
+							raise_unsupported_error params_array[0]
 						elsif (10..15).include? params_array[0][:Predictor].to_i == 2
 							####
 							# prepare PNG group
+							raise_unsupported_error params_array[0]
 						end
 					else
 						inflator = Zlib::Inflate.new
@@ -84,7 +88,8 @@ module CombinePDF
 				params_array.shift
 				filter_array.shift
 			end
-			object.delete(:Filter)
+			object.delete :Filter
+			object.delete :DecodeParms
 			true
 		end
 		

data/lib/combine_pdf/page_methods.rb

@@ -67,8 +67,9 @@ module CombinePDF
 					if res[key].nil?
 						res[key] = new_val
 					elsif res[key].is_a?(Hash) && new_val.is_a?(Hash)
-						new_val.update resources[key] # make sure the old values are respected
-						res[key].update new_val # transfer old and new values to the injected page
+						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
 					end #Do nothing if array - ot is the PROC array, which is an issue
 				end
 			end
@@ -670,19 +671,20 @@ module CombinePDF
 		def set_font(font = :Helvetica)
 			# if the font exists, return it's name
 			resources[:Font] ||= {}
-			resources[:Font].each do |k,v|
+			fonts_res = resources[:Font][:referenced_object] || resources[:Font]
+			fonts_res.each do |k,v|
 				if v.is_a?(Fonts::Font) && v.name && v.name == font
 					return k
 				end
 			end
 			# set a secure name for the font
-			name = (base_font_name + (resources[:Font].length + 1).to_s).to_sym
+			name = (base_font_name + (fonts_res.length + 1).to_s).to_sym
 			# get font object
 			font_object = Fonts.get_font(font)
 			# return false if the font wan't found in the library.
 			return false unless font_object
 			# add object to reasource
-			resources[:Font][name] = font_object
+			fonts_res[name] = font_object
 			#return name
 			name
 		end
@@ -691,7 +693,8 @@ module CombinePDF
 		def graphic_state(graphic_state_dictionary = {})
 			# if the graphic state exists, return it's name
 			resources[:ExtGState] ||= {}
-			resources[:ExtGState].each do |k,v|
+			gs_res = resources[:ExtGState][:referenced_object] || resources[:ExtGState]
+			gs_res.each do |k,v|
 				if v.is_a?(Hash) && v == graphic_state_dictionary
 					return k
 				end
@@ -701,7 +704,7 @@ module CombinePDF
 			# set a secure name for the graphic state
 			name = (SecureRandom.hex(9)).to_sym
 			# add object to reasource
-			resources[:ExtGState][name] = graphic_state_dictionary
+			gs_res[name] = graphic_state_dictionary
 			#return name
 			name
 		end
@@ -796,7 +799,7 @@ module CombinePDF
 					new_dictionary = {}
 					new_name = "Combine" + SecureRandom.hex(7) + "PDF"
 					i = 1
-					v.each do |old_key, value|
+					actual_object(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
@@ -828,7 +831,7 @@ module CombinePDF
 			# 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] && foreign_res[k][name] && foreign_res[k][name] != v[name]} if v.is_a?(Hash) }
+			res.each {|k,v| v.keys.each {|name| return true if foreign_res[k] && (foreign_res[k][:referenced_object] || foreign_res[k])[name] && (foreign_res[k][:referenced_object] || foreign_res[k])[name] != (v[:referenced_object] || v)[name]} if v.is_a?(Hash) }
 			false
 		end
 

data/lib/combine_pdf/parser.rb

@@ -203,10 +203,10 @@ module CombinePDF
 					# need to remove end of stream
 					if out.last.is_a? Hash
 						# out.last[:raw_stream_content] = str[0...-10] #cuts only one EON char (\n or \r)
-						out.last[:raw_stream_content] = unify_string str.sub(/[\n\r]?[\n\r]endstream\z/, "").force_encoding(Encoding::ASCII_8BIT)
+						out.last[:raw_stream_content] = unify_string str.sub(/(\r\n|\n|\r)?endstream\z/, "").force_encoding(Encoding::ASCII_8BIT)
 					else
 						warn "Stream not attached to dictionary!"
-						out << str.sub(/[\n\r]?[\n\r]endstream\z/, "").force_encoding(Encoding::ASCII_8BIT)
+						out << str.sub(/(\r\n|\n|\r)?endstream\z/, "").force_encoding(Encoding::ASCII_8BIT)
 					end
 				##########################################
 				## parse an Object after finished
@@ -316,7 +316,7 @@ module CombinePDF
 					#is a comment, skip until new line
 					loop do
 						break unless @scanner.scan(/[^\d\r\n]+/)
-						break if @scanner.check(/([\d]+ [\d]+ obj)?[\n\r]+/)
+						break if @scanner.check(/([\d]+[\s]+[\d]+[\s]+obj[\n\r\s]+\<\<)|([\n\r]+)/)
 						break if @scanner.eos?
 						@scanner.pos += 1
 					end

data/lib/combine_pdf/renderer.rb

@@ -112,6 +112,8 @@ module CombinePDF
 					return out.join().force_encoding(Encoding::ASCII_8BIT)
 				end
 			end
+			# remove extra page references.
+			object[:Contents].delete({ is_reference_only: true , referenced_object: {indirect_reference_id: 0, raw_stream_content: ''} }) if object[:Type] == :Page
 			# correct stream length, if the object is a stream.
 			object[:Length] = object[:raw_stream_content].bytesize if object[:raw_stream_content]
 
@@ -122,6 +124,7 @@ module CombinePDF
 			object.each do |key, value|
 				out << "#{object_to_pdf key} #{object_to_pdf value}\n".force_encoding(Encoding::ASCII_8BIT) unless PDF::PRIVATE_HASH_KEYS.include? key
 			end
+			object.delete :Length
 			out << ">>".force_encoding(Encoding::ASCII_8BIT)
 			out << "\nstream\n#{object[:raw_stream_content]}\nendstream".force_encoding(Encoding::ASCII_8BIT) if object[:raw_stream_content]
 			out << "\nendobj\n" if object[:indirect_reference_id]

data/lib/combine_pdf/version.rb

@@ -1,4 +1,4 @@
 module CombinePDF
-  VERSION = "0.2.12"
+  VERSION = "0.2.13"
 end
 

metadata

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