combine_pdf 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90f944411ca558412ef3b80122e28ddce34ba7a6
-  data.tar.gz: 58b1a3974d6daa5bb15000f0b4581ab0a8d12454
+  metadata.gz: e47677b33c3ffe86a4925b1deb037548461129b4
+  data.tar.gz: 90a8ad24ec4a577591cbe3db7212361579c6cab6
 SHA512:
-  metadata.gz: 485b82fe87fa1de7d4ab7d2cffa8d30fc9f863c4570a640284460c85a8dc70e31925929e8be3823e82ea4ae3dbfaad6bc3984d3ed3be53fb7379e6fc3e7ed93e
-  data.tar.gz: ae0bf2a4216d44cb518093dd136aa9af2ec0abf4aba9eec97d7b3ce5312ff445e5ae0a8f9af7d4766a2c81ceaecbe00a4c35fca057a3386c8995cb534473ba11
+  metadata.gz: f3abdab8d627943a9183016b6dfcad5e661d6f1fb054538549714b18f45945c32fe6fd36e6c711b435db7bc1f534bf262cf321f0fb8c73d2fa9a0392910235c0
+  data.tar.gz: 93d3401a065522a276e22e5049e7b4c469e02de8fc3708f02783a0605d7f7ccc1bf1ac3e41e100951c384da809be04df41e259cadcd31dc52c2ef3c92b9d7509

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ***
 
+Change log v.0.1.17
+
+**feature**: Although it was possible to create and add empty PDF pages (at any location), it is now even easier with one method call to add empty pages at the end of a PDF object. It's also possible to add text to these empty pages or stamp them with different content.
+
+**fix?**: a possible multi-threading issue might have existed where to threads saving PDF data at the same time might corrupt PDF data (although this theoretical issue was never reported and probably never encountered). The PDF streams should now be a bit more thread safe, as long as no two threads attempt to render the same PDF object at the same time.
+
+**fix?**: Thank to Roma, who reported issue #14, we are now working on a fix of a mysterious issue with textboxes which could effect page numbering and textboxes on certain PDF files. It is unknown at this time if the issue is resolved and the fix is awaiting confirmation. The issue effected only some PDF files and not others.
+
+***
+
 Change log v.0.1.16
 
 **fix?**: Compatability reports came in showing that some email servers convery new-line (\n) characters to CRLF (\r\n) - corrupting the binary code in the PDF files. This version attemps to fix this by adding more binary characters to the first comment line of the PDF file (right after the header). Most email programs and Antivirus programs should preserve the original EOL character once they recognize the file as binary.

data/lib/combine_pdf/combine_pdf_operations.rb

@@ -82,16 +82,16 @@ module CombinePDF
 
 			if top # if this is a stamp (overlay)
 				page[:Contents] = original_contents
-				page[:Contents].unshift CONTENT_CONTAINER_START.dup
-				page[:Contents].push CONTENT_CONTAINER_MIDDLE.dup
+				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 CONTENT_CONTAINER_END.dup
+				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 CONTENT_CONTAINER_START.dup
-				page[:Contents].push CONTENT_CONTAINER_MIDDLE.dup
+				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 CONTENT_CONTAINER_END.dup
+				page[:Contents].push create_deep_copy(CONTENT_CONTAINER_END)
 			end
 
 			page
@@ -198,7 +198,7 @@ module CombinePDF
 			elsif object.is_a?(String)
 				return object.dup
 			else
-				return object # objects that aren't Strings, Arrays or Hashes (such as Symbols and Fixnums) aren't pointers in Ruby and are always copied.
+				return object # objects that aren't Strings, Arrays or Hashes (such as Symbols and Fixnums) won't be edited inplace.
 			end
 		end
 		# removes id and generation number values, for better comparrison

data/lib/combine_pdf/combine_pdf_page.rb

@@ -40,14 +40,16 @@ module CombinePDF
 
 		# accessor (getter) for the :MediaBox element of the page
 		def mediabox
-			self[:MediaBox]
+			self[:MediaBox].is_a?(Array) ? self[:MediaBox] : self[:MediaBox][:referenced_object]
 		end
-		# accessor (setter) for the :MediaBox element of the page
-		# dimensions:: an Array consisting of four numbers (can be floats) setting the size of the media box.
-		def mediabox=(dimensions = [0.0, 0.0, 612.0, 792.0])
-			self[:MediaBox] = dimensions
+
+		# accessor (getter) for the :Resources element of the page
+		def resources
+			self[:Resources] ||= {}
+			self[:Resources][:referenced_object] || self[:Resources]
 		end
 
+
 		# This method adds a simple text box to the Page represented by the PDFWriter class.
 		# This function takes two values:
 		# text:: the text to potin the box.
@@ -194,7 +196,7 @@ module CombinePDF
 			# each unit (1) is 1/72 Inch
 			# create text stream
 			text_stream = ""
-			if text.to_s != "" && options[:font_size] != 0 && (options[:font_color] || options[:stroke_color])
+			if !text.to_s.empty? && options[:font_size] != 0 && (options[:font_color] || options[:stroke_color])
 				# compute x and y position for text
 				x = options[:x] + (options[:width]*options[:text_padding])
 				y = options[:y] + (options[:height]*options[:text_padding])
@@ -296,11 +298,6 @@ module CombinePDF
 		end
 
 
-		# accessor (getter) for the :Resources element of the page
-		def resources
-			self[:Resources]
-		end
-
 		# This method moves the Page[:Rotate] property into the page's data stream, so that
 		# "what you see is what you get".
 		#
@@ -324,7 +321,7 @@ module CombinePDF
 			# insert the rotation stream into the current content stream
 			insert_object "q\n#{ctm.join ' '} cm\n", 0
 			# close the rotation stream
-			insert_object CONTENT_CONTAINER_END
+			insert_object PDFOperations.create_deep_copy(CONTENT_CONTAINER_END)
 			# reset the mediabox and cropbox values - THIS IS ONLY FOR ORIENTATION CHANGE...
 			if ((self[:Rotate].to_f / 90)%2) != 0
 				self[:MediaBox] = self[:MediaBox].values_at(1,0,3,2)
@@ -390,6 +387,11 @@ module CombinePDF
 		end
 		#initializes the content stream in case it was not initialized before
 		def init_contents
+			# wrap content streams
+			insert_object 'q', 0
+			insert_object 'Q'
+
+			# Prep content
 			@contents = ''
 			insert_object @contents
 			@contents

data/lib/combine_pdf/combine_pdf_pdf.rb

@@ -314,6 +314,7 @@ module CombinePDF
 				return self
 			end
 			insert -1, data
+			self
 		end
 
 		# add the pages (or file) to the BEGINNING of the PDF (combine/merge) and RETURNS SELF for nesting operators.
@@ -357,6 +358,7 @@ module CombinePDF
 				location = page_count
 			end
 			pages_array.insert location, pages_to_add
+			pages_array.flatten!
 			pages_array
 		end
 
@@ -454,6 +456,13 @@ module CombinePDF
 			end
 		end
 
+		# adds a new page to the end of the PDF object.
+		#
+		# returns the new page object.
+		def new_page(mediabox = [0, 0, 595.3, 841.9])
+			insert(-1, PDFWriter.new(mediabox) ).last
+		end
+
 		# get the title for the pdf
 		# The title is stored in the information dictionary and isn't required
 		def title

data/lib/combine_pdf/version.rb

@@ -1,3 +1,3 @@
 module CombinePDF
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

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