combine_pdf 0.2.29 → 0.2.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f282a79a5cf28d268806efc53ba4b21daaede88
-  data.tar.gz: 57e4153629f11d8db42cce3d0aaebb44504666c2
+  metadata.gz: f81f9412da41045468ecaa6e10104fc9062eee8d
+  data.tar.gz: 23410127dcabe19c6b9ddee352752f9b7bd0abb6
 SHA512:
-  metadata.gz: dd1da2e87426b60a206e17f58bae6931089dcdf9dcb14df5f11094c9dfadf64ad9592addf4249a19a21cc3a69882c4135f61554911f5460d43313a588baa92f7
-  data.tar.gz: d4f1d4f094469da7d26ef1b1c979c066224236e4269cba5c43ba75a1a2ef0b70e4f8dbd9cdf4f0e351955975e068b2c0de4baab29587cd2ea7ed28a06bff56e3
+  metadata.gz: 03fdcce50faf9045930e435cbdf4d31e4ed96419f6e594796df89ab7c6e0891568467d5c1b632338c5e33fe17f3e68fe14c1c7c6c199e6d6d8a33ec47e438a46
+  data.tar.gz: 24442ecac5ee2ed427de851eb5de4081ab8bb4a8625cdcaa2c9d4a84da86c79feaf3b02928ebee22462b2963a94ea9683fde5a47a3e6a35400d9ace2f3b13489

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ***
 
+Change log v.0.2.30
+
+**Fix**: Fixed an issue where HTTP artifacts before the beginning of a PDF file / string would prevent the PDF from being parsed. This fixes issue #78 reported by @robvitaro.
+
+***
+
 Change log v.0.2.29
 
 **Fix**: Fixed an issue where updating a page's rotation might raise a `NoMethodError` exception. Credit to Danny (@dikond) both for discovering the issue and for PR #77 that fixes this.

data/lib/combine_pdf/parser.rb

@@ -62,6 +62,7 @@ module CombinePDF
       return @parsed unless @parsed.empty?
       @scanner = StringScanner.new @string_to_parse
       @scanner.pos = 0
+      @scanner.skip(/[^%]*/) if @scanner.exist?(/%PDF/i)
       if @scanner.scan /\%PDF\-[\d\-\.]+/
         @version = @scanner.matched.scan(/[\d\.]+/)[0].to_f
         loop do
@@ -355,7 +356,7 @@ module CombinePDF
         ##########################################
         ## XREF - check for encryption... anything else?
         ##########################################
-        elsif @scanner.scan(/xref/)
+        elsif @scanner.scan(/(startxref)|(xref)/)
           ##########
           ## get root object to check for encryption
           @scanner.scan_until(/(trailer)|(\%EOF)/)
@@ -399,7 +400,7 @@ module CombinePDF
           fresh = false
         else
           # always advance
-          # warn "Advancing for unknown reason... #{@scanner.string[@scanner.pos-4, 8]} ... #{@scanner.peek(4)}" unless @scanner.peek(1) =~ /[\s\n]/
+          # warn "Advancing for unknown reason... #{@scanner.string[@scanner.pos - 4, 8]} ... #{@scanner.peek(4)}" unless @scanner.peek(1) =~ /[\s\n]/
           warn 'Warning: parser advancing for unknown reason. Potential data-loss.'
           @scanner.pos = @scanner.pos + 1
         end
@@ -418,7 +419,8 @@ module CombinePDF
         else
           catalogs = (@parsed.select { |obj| obj[:Type] == :Catalog }).last
         end
-        @parsed.delete_if { |obj| obj[:Type] == :Catalog }
+
+        @parsed.delete_if { |obj| obj.nil? || obj[:Type] == :Catalog }
         @parsed << catalogs
 
         raise "Unknown error - parsed data doesn't contain a cataloged object!" unless catalogs

data/lib/combine_pdf/version.rb

@@ -1,3 +1,3 @@
 module CombinePDF
-  VERSION = '0.2.29'.freeze
+  VERSION = '0.2.30'.freeze
 end

data/test/automated

@@ -54,6 +54,7 @@ CombinePDF.load("./Ruby/test\ pdfs/Scribus-unknown_err.pdf").save '08_1-unknown-
 CombinePDF.load("./Ruby/test\ pdfs/Scribus-unknown_err2.pdf").save '08_2-unknown-err-empty-str.pdf'
 CombinePDF.load("./Ruby/test\ pdfs/Scribus-unknown_err3.pdf").save '08_3-unknown-err-empty-str.pdf'
 
+CombinePDF.load("/Users/2Be/Ruby/test\ pdfs/nil_object.pdf").save('09_nil_in_parsed_array.pdf')
 # unify = [
 #   "./Ruby/test\ pdfs/AESv2\ encrypted.pdf",
 #   "./Ruby/test\ pdfs/data-in-comment.pdf",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 0.2.29
+  version: 0.2.30
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4