combine_pdf 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 882c3cbaa5d88da789bcaea83b70092ed318b566
-  data.tar.gz: 0670e7d2bb00e7b348cae105ff4f0b3a9f9327e5
+  metadata.gz: 836492be159026a99d02304d504ddbf5fa2fb842
+  data.tar.gz: 518dc2a996a97b25c4143ee4be147fef1dd65e94
 SHA512:
-  metadata.gz: 665ace02cacbc19a0fc3b782ac0e21e87d63bfab9a59ae74340ed57e833cda0f7d0ebfb7163772621ff74691f8e7a3b4a10d62fa7a04ad514160eaa462909e26
-  data.tar.gz: 6891d293f8a2ebab0f84cfb7e99dd7578b3ff14f7971d63c3dabde41bff4aa1007bc44deb394611b9eb62a89ea534d8d35e9e7283891273bd6d41a5e8489deae
+  metadata.gz: c8c55e40b2f752757fe8588ec30b9a29767d6c28a9957d2a94ecf869b08c8ab07aa8560cc3d81590a2fa8721a5f547ca95d2aa9f721c2af50cfd6611131da617
+  data.tar.gz: fd0be69a79f8048b39cdcdd45aabce11439cba505ae1703e54f1b135eaa8cd5d0697df8bfb08357556afa5ea2eb99f4fa9177f45adcad4ee83312c9e19369482

data/CHANGELOG.md

@@ -2,12 +2,17 @@
 
 ***
 
+Change log v.0.1.13
+
+**fix**: fix for Acrobat Reader compatablity (by removing color-space declarations). Should solve issue #13 , reported originaly by Imanol and Diyei Gomi.
+
+***
+
 Change log v.0.1.12
 
 **fix**: fix for page rotation inheritance.
 
-**fix**: fix for the issue reported by Diyei Gomi that showed how certain PDF files, when stamped one on top of the other, can result in a malformed PDF being Rendered. The issue was probably caused by parsing errors introduced while parsing hex strings (a case sensitive method was used by mistake and this is now corrected). This release contains a patch, but it is yet unknown if the issue is fully fxed.
-
+**fix**: fix for the issue was discovered while observing issue #13, reported originaly by Imanol and Diyei Gomi. The issue was probably caused by parsing errors introduced while parsing hex strings (a case sensitive method was used by mistake and this is now corrected).
 ***
 
 Change log v.0.1.11

data/lib/combine_pdf/combine_pdf_basic_writer.rb

@@ -41,7 +41,7 @@ module CombinePDF
 		def initialize(mediabox = [0, 0, 595.3, 841.9])
 			# indirect_reference_id, :indirect_generation_number
 			@contents = ""
-			@base_font_name = "Writer" + SecureRandom.urlsafe_base64(7) + "PDF"
+			@base_font_name = "Writer" + SecureRandom.hex(7) + "PDF"
 			self[:Type] = :Page
 			self[:indirect_reference_id] = 0
 			self[:Resources] = {}
@@ -141,7 +141,10 @@ module CombinePDF
 				end
 				box_graphic_state = graphic_state box_graphic_state # adds the graphic state to Resources and gets the reference
 				box_stream << "#{PDFOperations._object_to_pdf box_graphic_state} gs\n"
-				box_stream << "DeviceRGB CS\nDeviceRGB cs\n"
+
+				# the following line was removed for Acrobat Reader compatability
+				# box_stream << "DeviceRGB CS\nDeviceRGB cs\n"
+
 				if options[:box_color]
 					box_stream << "#{options[:box_color].join(' ')} rg\n"
 				end
@@ -231,7 +234,10 @@ module CombinePDF
 				text_stream << "q\n"
 				text_graphic_state = graphic_state({ca: options[:opacity], CA: options[:opacity], LW: options[:stroke_width].to_f, LC: 2, LJ: 1,  LD: 0, CTM: options[:ctm]})
 				text_stream << "#{PDFOperations._object_to_pdf text_graphic_state} gs\n"
-				text_stream << "DeviceRGB CS\nDeviceRGB cs\n"
+
+				# the following line was removed for Acrobat Reader compatability
+				# text_stream << "DeviceRGB CS\nDeviceRGB cs\n"
+
 				# set text render mode
 				if options[:font_color]
 					text_stream << "#{options[:font_color].join(' ')} rg\n"
@@ -253,7 +259,7 @@ module CombinePDF
 				encode(text, fonts).each do |encoded|
 					text_stream << "BT\n" # the Begine Text marker			
 					text_stream << PDFOperations._format_name_to_pdf(set_font encoded[0]) # Set font name
-					text_stream << " #{font_size} Tf\n" # set font size and add font operator
+					text_stream << " #{font_size.round 3} Tf\n" # set font size and add font operator
 					text_stream << "#{x.round 4} #{y.round 4} Td\n" # set location for text object
 					text_stream << (  encoded[1] ) # insert the encoded string to the stream
 					text_stream << " Tj\n" # the Text object operator and the End Text marker
@@ -345,7 +351,7 @@ module CombinePDF
 			#return name
 			name
 		end
-		# register or get a registered graphoc state dictionary.
+		# register or get a registered graphic state dictionary.
 		# the method returns the name of the graphos state, for use in a content stream.
 		def graphic_state(graphic_state_dictionary = {})
 			# if the graphic state exists, return it's name
@@ -358,7 +364,7 @@ module CombinePDF
 			# set graphic state type
 			graphic_state_dictionary[:Type] = :ExtGState
 			# set a secure name for the graphic state
-			name = (SecureRandom.urlsafe_base64(9)).to_sym
+			name = (SecureRandom.hex(9)).to_sym
 			# add object to reasource
 			resources[:ExtGState][name] = graphic_state_dictionary
 			#return name

data/lib/combine_pdf/combine_pdf_fonts.rb

@@ -85,6 +85,12 @@ module CombinePDF
 	module Fonts
 		module_function
 
+		# returns a list containing the registered font names
+		def fonts_list
+			initiate_library
+			FONTS_LIBRARY.keys			
+		end
+
 		# gets a font from the fonts library
 		def get_font(name = :Helvetica)
 			initiate_library

data/lib/combine_pdf/combine_pdf_operations.rb

@@ -129,7 +129,7 @@ module CombinePDF
 			resources.each do |k,v|
 				if v.is_a?(Hash)
 					new_dictionary = {}
-					new_name = "Combine" + SecureRandom.urlsafe_base64() + "PDF"
+					new_name = "Combine" + SecureRandom.hex(7) + "PDF"
 					i = 1
 					v.each do |old_key, value|
 						new_key = (new_name + i.to_s).to_sym
@@ -153,7 +153,8 @@ module CombinePDF
 				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]
-				stream[:raw_stream_content] = "q\nq\nq\nDeviceRGB CS\nDeviceRGB cs\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]
+				# 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

data/lib/combine_pdf/version.rb

@@ -1,3 +1,3 @@
 module CombinePDF
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Boaz Segev