combine_pdf 1.0.29 → 1.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 773cc37e05ad8fb02f148c12e3b7e1e24be8fc71ec946e4bca674bad107e1398
-  data.tar.gz: ecf125185a04ecdbced0856db01514d90036f93b315ff384b3b55cc794018032
+  metadata.gz: e2f4eb4504ba56b707d2145c1a6e92a24c0e35c0f1fbfc8f18864585f199eefb
+  data.tar.gz: c9fd95a94ef49a6252907dc107ed19440fc0081855e6a86cc6c0e614fc042d9f
 SHA512:
-  metadata.gz: d8c2636e089c11b71f4a07d29a9eea6f7df8ca1f5466c2a447e8afb2598467d2fe3663d4e382c45a04dfd6ead9f19a6afe9ae7e01fae22b8c678db08ba6d1fe8
-  data.tar.gz: efc8160687a50fbf0df43cc5b0b85c013fc5fda3f2a053bc37716b403de18ad429caa4872832047a1ea1e2167797c0d8a5a773d8c341128752e38db9a87990ad
+  metadata.gz: 6edd9716fe0acccd04deff29003d666e2f7a0f4f330259fed7dd15ffcbe96eb5589b4d1ae90a04e90aaf605f78eaea021b5c4010c56061041282d36270b93454
+  data.tar.gz: 330775ef6008b8959e63c9a3206c5dd1da414b0f2c0e5f7d47972556a60a20e19ef27d38278fcaa4ceb097f9eb186d7200e689ecf59ea2af57940c4d2da70408

data/lib/combine_pdf/parser.rb

@@ -41,7 +41,7 @@ module CombinePDF
     # string:: the data to be parsed, as a String object.
     def initialize(string, options = {})
       raise TypeError, "couldn't parse data, expecting type String" unless string.is_a? String
-      @string_to_parse = string.force_encoding(Encoding::ASCII_8BIT)
+      @string_to_parse = (string.frozen? ? string.dup : string).force_encoding(Encoding::ASCII_8BIT)
       @literal_strings = [].dup
       @hex_strings = [].dup
       @streams = [].dup
@@ -358,23 +358,25 @@ module CombinePDF
         ##########################################
         ## parse a Stream
         ##########################################
-        elsif @scanner.scan(/stream[ \t]*[\r\n]/)
-          @scanner.pos += 1 if @scanner.peek(1) == "\n".freeze && @scanner.matched[-1] != "\n".freeze
+        elsif @scanner.scan(/stream[ \t]*\r?\n?/)
           # advance by the publshed stream length (if any)
           old_pos = @scanner.pos
-          if(out.last.is_a?(Hash) && out.last[:Length].is_a?(Integer) && out.last[:Length] > 2)
-            @scanner.pos += out.last[:Length] - 2
+          if(out.last.is_a?(Hash) && out.last[:Length].is_a?(Integer) && out.last[:Length])
+            @scanner.pos += out.last[:Length]
+            unless(@scanner.skip(/\r?\n?endstream/))
+              @scanner.pos = old_pos 
+              # raise error if the stream doesn't end.
+              unless @scanner.skip_until(/endstream/)
+                raise ParsingError, "Parsing Error: PDF file error - a stream object wasn't properly closed using 'endstream'!"
+              end
+            end
+          else
+            # raise error if the stream doesn't end.
+            unless @scanner.skip_until(/endstream/)
+              raise ParsingError, "Parsing Error: PDF file error - a stream object wasn't properly closed using 'endstream'!"
+            end
           end
 
-          # the following was dicarded because some PDF files didn't have an EOL marker as required
-          # str = @scanner.scan_until(/(\r\n|\r|\n)endstream/)
-          # instead, a non-strict RegExp is used:
-
-
-          # raise error if the stream doesn't end.
-          unless @scanner.skip_until(/endstream/)
-            raise ParsingError, "Parsing Error: PDF file error - a stream object wasn't properly closed using 'endstream'!"
-          end
           length = @scanner.pos - (old_pos + 9)
           length = 0 if(length < 0)
           length -= 1 if(@scanner.string[old_pos + length - 1] == "\n") 

data/lib/combine_pdf/renderer.rb

@@ -52,7 +52,7 @@ module CombinePDF
       if object.length == 0 || obj_bytes.min <= 31 || obj_bytes.max >= 127 # || (obj_bytes[0] != 68  object.match(/[^D\:\d\+\-Z\']/))
         # A hexadecimal string shall be written as a sequence of hexadecimal digits (0-9 and either A-F or a-f)
         # encoded as ASCII characters and enclosed within angle brackets (using LESS-THAN SIGN (3Ch) and GREATER- THAN SIGN (3Eh)).
-        "<#{object.unpack('H*')[0]}>".force_encoding(Encoding::ASCII_8BIT)
+        "<#{object.unpack('H*')[0]}>"
       else
         # a good fit for a Literal String or the string is a date (MUST be literal)
         ('(' + ([].tap { |out| obj_bytes.each { |byte| out.concat(STRING_REPLACEMENT_ARRAY[byte]) } } ).pack('C*') + ')').force_encoding(Encoding::ASCII_8BIT)
@@ -101,7 +101,7 @@ module CombinePDF
         end
         object[:indirect_reference_id] ||= 0
         object[:indirect_generation_number] ||= 0
-        return "#{object[:indirect_reference_id]} #{object[:indirect_generation_number]} R".force_encoding(Encoding::ASCII_8BIT)
+        return "#{object[:indirect_reference_id]} #{object[:indirect_generation_number]} R"
       end
 
       # if the object is indirect...
@@ -109,7 +109,7 @@ module CombinePDF
       if object[:indirect_reference_id]
         object[:indirect_reference_id] ||= 0
         object[:indirect_generation_number] ||= 0
-        out << "#{object[:indirect_reference_id]} #{object[:indirect_generation_number]} obj\n".force_encoding(Encoding::ASCII_8BIT)
+        out << "#{object[:indirect_reference_id]} #{object[:indirect_generation_number]} obj\n"
         if object[:indirect_without_dictionary]
           out << object_to_pdf(object[:indirect_without_dictionary])
           out << "\nendobj\n"
@@ -126,11 +126,11 @@ module CombinePDF
       # (using LESS-THAN SIGNs (3Ch) and GREATER-THAN SIGNs (3Eh)).
       out << "<<\n".b
       object.each do |key, value|
-        out << "#{object_to_pdf key} #{object_to_pdf value}\n".force_encoding(Encoding::ASCII_8BIT) unless PDF::PRIVATE_HASH_KEYS.include? key
+        out << "#{object_to_pdf key} #{object_to_pdf value}\n" unless PDF::PRIVATE_HASH_KEYS.include? key
       end
       object.delete :Length
       out << '>>'.b
-      out << "\nstream\n#{object[:raw_stream_content]}\nendstream".force_encoding(Encoding::ASCII_8BIT) if object[:raw_stream_content]
+      out << "\nstream\n#{object[:raw_stream_content]}\nendstream" if object[:raw_stream_content]
       out << "\nendobj\n" if object[:indirect_reference_id]
       out.join.force_encoding(Encoding::ASCII_8BIT)
     end

data/lib/combine_pdf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CombinePDF
-  VERSION = '1.0.29'
+  VERSION = '1.0.30'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.0.30
 platform: ruby
 authors:
 - Boaz Segev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-06 00:00:00.000000000 Z
+date: 2025-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Combine, stamp and watermark PDF files in pure Ruby.