combine_pdf 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3048c37a61edc6d2146a875b7858a67c45cdfee
-  data.tar.gz: 1c34bcc2d900f23c56bd67ea9e83ed7cc5d8ac85
+  metadata.gz: 114c27c4f23021df9f78df6468f5fcffe8022f70
+  data.tar.gz: 5b75261b3ae0c2a0d12520f5f366a9b17b6e2049
 SHA512:
-  metadata.gz: 6cccfd304beb820569452b222725da35df09711ff9c63c96a5b8a73f306f9756d83f86536bb0214789ede6fd380dd8f77615eadec36de7f909b268af0f030b65
-  data.tar.gz: cb6331c3bc3cb57a51034018ee07549fb67d69f05692121a92b48584b6d70c9a581678b804b318d8e87dd2a6f48c9d4eb06ad071dff61213244d941fede3e9d8
+  metadata.gz: ff3cbca040ad3dece43ea7ce4ed1b3a006cf86842390761d88c601de0cddf3cc16056d15449ef3fc415886242f24d77c0637818831f7d04efd775d77a1fc23a6
+  data.tar.gz: f4e27c18d9b7925c7018059602f7d7cb16ca970dd06494025056f84db939828b309b399cfd1f52c6a27c36f8b17037e9e810b030b0f6e582f89ca2bba5991cdc

data/lib/combine_pdf/parser.rb

@@ -99,10 +99,10 @@ module CombinePDF
 			object_streams = @parsed.select {|obj| obj.is_a?(Hash) && obj[:Type] == :ObjStm}
 			unless object_streams.empty?
 				warn "PDF 1.5 Object streams found - they are not fully supported! attempting to extract objects."
-				
+
 				object_streams.each do |o|
 					## un-encode (using the correct filter) the object streams
-					PDFFilter.inflate_object o 
+					PDFFilter.inflate_object o
 					## extract objects from stream to top level arry @parsed
 					@scanner = StringScanner.new o[:raw_stream_content]
 					stream_data = _parse_
@@ -123,7 +123,6 @@ module CombinePDF
 			# Strings were unified, we can let them go..
 			@strings_dictionary.clear
 
-			
 			# serialize_objects_and_references.catalog_pages
 
 			# Benchmark.bm do |bm|
@@ -316,7 +315,7 @@ module CombinePDF
 					#is a comment, skip until new line
 					loop do
 						# break unless @scanner.scan(/[^\d\r\n]+/)
-						break if @scanner.check(/([\d]+[\s]+[\d]+[\s]+obj[\n\r\s]+\<\<)|([\n\r]+)/) || @scanner.eos? # || @scanner.scan(/[^\d]+[\r\n]+/) || 
+						break if @scanner.check(/([\d]+[\s]+[\d]+[\s]+obj[\n\r\s]+\<\<)|([\n\r]+)/) || @scanner.eos? # || @scanner.scan(/[^\d]+[\r\n]+/) ||
 						@scanner.scan(/[^\d\r\n]+/) || @scanner.pos += 1
 					end
 					# puts "AFTER COMMENT: #{@scanner.peek 8}"
@@ -364,13 +363,18 @@ module CombinePDF
 						if @scanner.skip_until(/<</)
 							data = _parse_
 							@root_object ||= {}
-							@root_object[data.shift] = data.shift while data[0]						
+							@root_object[data.shift] = data.shift while data[0]
 						end
 						##########
 						## skip untill end of segment, maked by %%EOF
 						@scanner.skip_until(/\%\%EOF/)
+						##########
+						## If this was the last valid segment, ignore any trailing garbage
+						## (issue #49 resolution)
+						break unless @scanner.exist?(/\%\%EOF/)
+
 					end
-					
+
 				when @scanner.scan(/[\s]+/)
 					# Generally, do nothing
 					nil
@@ -378,8 +382,8 @@ module CombinePDF
 					# Fix wkhtmltopdf PDF authoring issue - missing 'endobj' keywords
 					unless fresh || (out[-4].nil? || out[-4].is_a?(Hash))
 						keep = []
-						keep << out.pop # .tap {|i| puts "#{i} is an ID"} 
-						keep << out.pop # .tap {|i| puts "#{i} is a REF"} 
+						keep << out.pop # .tap {|i| puts "#{i} is an ID"}
+						keep << out.pop # .tap {|i| puts "#{i} is a REF"}
 
 						if out.last.is_a? Hash
 							out << out.pop.merge({indirect_generation_number: out.pop, indirect_reference_id: out.pop})
@@ -393,7 +397,7 @@ module CombinePDF
 					end
 					fresh = false
 				else
-					# always advance 
+					# always advance
 					# warn "Advnacing for unknown reason... #{@scanner.peek(4)}" unless @scanner.peek(1) =~ /[\s\n]/
 					warn "Warning: parser advnacing for unknown reason. Potential data-loss."
 					@scanner.pos = @scanner.pos + 1
@@ -420,7 +424,7 @@ module CombinePDF
 
 				raise "Unknown error - parsed data doesn't contain a cataloged object!" unless catalogs
 			end
-			case 
+			case
 			when catalogs.is_a?(Array)
 				catalogs.each {|c| catalog_pages(c, inheritance_hash ) unless c.nil?}
 			when catalogs.is_a?(Hash)
@@ -578,4 +582,4 @@ module CombinePDF
 		# end
 
 	end
-end
+end

data/lib/combine_pdf/version.rb

@@ -1,3 +1,3 @@
 module CombinePDF
-  VERSION = "0.2.15"
+  VERSION = "0.2.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4