lib/combine_pdf/parser.rb in combine_pdf-1.0.5 vs lib/combine_pdf/parser.rb in combine_pdf-1.0.6

@@ -63,15 +63,15 @@
       return [] if @string_to_parse.empty?
       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\-\.]+/
+      if @scanner.scan(/\%PDF\-[\d\-\.]+/)
         @version = @scanner.matched.scan(/[\d\.]+/)[0].to_f
         loop do
           break unless @scanner.scan(/[^\d\r\n]+/)
-          break if @scanner.check(/([\d]+[\s]+[\d]+[\s]+obj[\n\r\s]+\<\<)|([\n\r]+)/)
+          break if @scanner.check(/([\d]+[\s]+[\d]+[\s]+obj[\s]+\<\<)|([\n\r]+)/)
           break if @scanner.eos?
           @scanner.pos += 1
         end
       end
       @parsed = _parse_
@@ -379,10 +379,10 @@
         ##########################################
         elsif str = @scanner.scan(/\%/)
           # 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[\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}"
         ##########################################
         ## Parse an Object Reference