combine_pdf 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40bc13d0d602d989d06580fd8d18d4bff8fd825b
-  data.tar.gz: 5c516b4f7f241018ace628f5b30df65074f416d4
+  metadata.gz: 882c3cbaa5d88da789bcaea83b70092ed318b566
+  data.tar.gz: 0670e7d2bb00e7b348cae105ff4f0b3a9f9327e5
 SHA512:
-  metadata.gz: d0a892d29ba0e918ea707a1e0206768450966a35643ed4bab825fe5ce1fea24091b9de8e0d033dba70b3cc5f8052c95f3f58238fc06b644c0ac8c63f85008ce4
-  data.tar.gz: bc3d9c23a738c4f282fd00b213fb0352fe4cf9275f1b54c9b9d92c0f63d0a1bacffd1faa2151310f91bbbb01e2e7244f1c5303b423135659f84a5424f33beccf
+  metadata.gz: 665ace02cacbc19a0fc3b782ac0e21e87d63bfab9a59ae74340ed57e833cda0f7d0ebfb7163772621ff74691f8e7a3b4a10d62fa7a04ad514160eaa462909e26
+  data.tar.gz: 6891d293f8a2ebab0f84cfb7e99dd7578b3ff14f7971d63c3dabde41bff4aa1007bc44deb394611b9eb62a89ea534d8d35e9e7283891273bd6d41a5e8489deae

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ***
 
+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.
+
+***
+
 Change log v.0.1.11
 
 **fix**: fixed a bug where Page Resources and ColorSpace data wouldn't be inherited correctly from the Catalog and Pages parent objects. This issue could cause pages to render without all their content intact. This issue is now fixed (although more testing should be done for multiple inheritance).

data/lib/combine_pdf/combine_pdf_parser.rb

@@ -176,7 +176,7 @@ module CombinePDF
 				##########################################
 				## parse a Hex String
 				##########################################
-				when str = @scanner.scan(/<[0-9a-f]+>/)
+				when str = @scanner.scan(/<[0-9a-fA-F]+>/)
 					# warn "Found a hex string"
 					out << [str[1..-2]].pack('H*')
 				##########################################

data/lib/combine_pdf/combine_pdf_pdf.rb

@@ -216,9 +216,16 @@ module CombinePDF
 					end
 				else
 					unless catalogs[:Type] == :Page
-						# set inheritance, when applicable
+						# # set inheritance, when applicable, and delete older data
+						# inheritance_hash[:MediaBox] = catalogs.delete(:MediaBox) if catalogs[:MediaBox]
+						# inheritance_hash[:CropBox] = catalogs.delete(:CropBox) if catalogs[:CropBox]
+						# inheritance_hash[:Rotate] = catalogs.delete(:Rotate) if catalogs[:Rotate]
+						# (inheritance_hash[:Resources] ||= {}).update( ( catalogs[:Resources][:referenced_object] ? catalogs.delete(:Resources)[:referenced_object] : catalogs.delete(:Resources) ), &self.class.method(:hash_update_proc_for_new) ) if catalogs[:Resources]
+						# (inheritance_hash[:ColorSpace] ||= {}).update( ( catalogs[:ColorSpace][:referenced_object] ? catalogs.delete(:ColorSpace)[:referenced_object] : catalogs.delete(:ColorSpace) ), &self.class.method(:hash_update_proc_for_new) ) if catalogs[:ColorSpace]
+						# old - set inheritance, when applicable
 						inheritance_hash[:MediaBox] = catalogs[:MediaBox] if catalogs[:MediaBox]
 						inheritance_hash[:CropBox] = catalogs[:CropBox] if catalogs[:CropBox]
+						inheritance_hash[:Rotate] = catalogs[:Rotate] if catalogs[:Rotate]
 						(inheritance_hash[:Resources] ||= {}).update( (catalogs[:Resources][:referenced_object] || catalogs[:Resources]), &self.class.method(:hash_update_proc_for_new) ) if catalogs[:Resources]
 						(inheritance_hash[:ColorSpace] ||= {}).update( (catalogs[:ColorSpace][:referenced_object] || catalogs[:ColorSpace]), &self.class.method(:hash_update_proc_for_new) ) if catalogs[:ColorSpace]
 					end
@@ -245,13 +252,15 @@ module CombinePDF
 						# inheritance 
 						catalogs[:MediaBox] ||= inheritance_hash[:MediaBox] if inheritance_hash[:MediaBox]
 						catalogs[:CropBox] ||= inheritance_hash[:CropBox] if inheritance_hash[:CropBox]
+						catalogs[:Rotate] ||= inheritance_hash[:Rotate] if inheritance_hash[:Rotate]
 						(catalogs[:Resources] ||= {}).update( inheritance_hash[:Resources], &( self.class.method(:hash_update_proc_for_old) ) ) if inheritance_hash[:Resources]
 						(catalogs[:ColorSpace] ||= {}).update( inheritance_hash[:ColorSpace], &( self.class.method(:hash_update_proc_for_old) ) ) if inheritance_hash[:ColorSpace]
 
 
-						# avoide references on MediaBox and CropBox
+						# avoide references on MediaBox, CropBox and Rotate
 						catalogs[:MediaBox] = catalogs[:MediaBox][:referenced_object][:indirect_without_dictionary] if catalogs[:MediaBox].is_a?(Hash) && catalogs[:MediaBox][:referenced_object].is_a?(Hash) && catalogs[:MediaBox][:referenced_object][:indirect_without_dictionary]
 						catalogs[:CropBox] = catalogs[:CropBox][:referenced_object][:indirect_without_dictionary] if catalogs[:CropBox].is_a?(Hash) && catalogs[:CropBox][:referenced_object].is_a?(Hash) && catalogs[:CropBox][:referenced_object][:indirect_without_dictionary]
+						catalogs[:Rotate] = catalogs[:Rotate][:referenced_object][:indirect_without_dictionary] if catalogs[:Rotate].is_a?(Hash) && catalogs[:Rotate][:referenced_object].is_a?(Hash) && catalogs[:Rotate][:referenced_object][:indirect_without_dictionary]
 
 						page_list << catalogs
 					when :Pages
@@ -375,7 +384,7 @@ module CombinePDF
 		# - :start_at a Fixnum that sets the number for first page number. also accepts a letter ("a") for letter numbering. defaults to 1.
 		# - :margin_from_height a number (PDF points) for the top and buttom margins. defaults to 45.
 		# - :margin_from_side a number (PDF points) for the left and right margins. defaults to 15.
-		# the options Hash can also take all the options for PDFWriter.textbox.
+		# the options Hash can also take all the options for PDFWriter#textbox.
 		# defaults to font: :Helvetica, font_size: 12 and no box (:border_width => 0, :box_color => nil).
 		def number_pages(options = {})
 			opt = {

data/lib/combine_pdf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4