combine_pdf 1.0.28 → 1.0.30beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1da4a9ad814eebd6f7b976c238a018a19e6cd1106dea1ebf5d3d51ab1b213ad7
-  data.tar.gz: 0fe9ca847a095fb68e2498e03329186d382a856d80e549d83a301f0f0675c9a8
+  metadata.gz: 2f990d5b448b0b5e1949e59d2432b3b43ee394ab6bf5ba94fcbcc5ce94d8b856
+  data.tar.gz: 326d40396956ba3472b3535217df4bec94d72f368dfd30da53b31a5697f04113
 SHA512:
-  metadata.gz: ded304e2d225506a354da76d0165e2d31afffae5537cc30bce2c12228c767825093725b191aa03be08f024437ab15d8431e181d6c9abaefd02f832a494e559b3
-  data.tar.gz: c15e1be8a06560ccc966f7e28c4dc84bc05656b33936862dd307afe7744f011bdc17c50107f9595ef44c281e10fc62f1e535f8ef93c24ea438eaa45fc5287e02
+  metadata.gz: e1548c3e004f118d92189b81466f6bb4e2d202fb7b60ec12df3ce2dafb96ac0f44789d873b2a9409110e610aea59e49b83fcb6f141bd7aa48146e90719655624
+  data.tar.gz: 81532eb10fe68f024566df811ab953f7f15c16fd007683d6210a6b6b6b4729931b1b1dcc2b9252a19f7c0d785f8c8610401f5c25f7bb5bb2e5b691447e35d030

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+#### Change log v.1.0.31 (2025-04-03)
+
+**Fix**: frozen string literal lingering issues. Credit to @pauline-koch, @qdegraeve, @isaporto, @ncreuschling, @francescob, @@anthonykaufman and @ma-matsui for their input on this issue. Credit to @anthonykaufman for offering one possible solution and @Markus-Munk-Shipmondo for pushing on this.
+
+**Fix**: possible permission issues. Credit to @davidwessman, @visini, @sander-deryckere, and @LindseySaari for exploring this.
+
+**Fix**: calling CombinePDF.parse with a frozen string literal. Credit to @lovro-bikic for offering one possible solution.
+
+**Fix**: Ruby 3.4 warning. Credit to @chaadow for offering one possible solution.
+
+#### Change log v.1.0.29 (2024-12-07)
+
+**Fix**: frozen string literal support fix. Credit to @francescob (Francesco) for PR #245.
+
 #### Change log v.1.0.28 (2024-11-12)
 
 **Fix**: use `require` to load code (instead of `load`). Credit to @casperisfine (Jean byroot Boussier) for PR #216.

data/lib/combine_pdf/basic_writer.rb

@@ -36,7 +36,7 @@ module CombinePDF
     # mediabox:: the PDF page size in PDF points. defaults to [0, 0, 612.0, 792.0] (US Letter)
     def initialize(mediabox = [0, 0, 612.0, 792.0])
       # indirect_reference_id, :indirect_generation_number
-      @contents = ''
+      @contents = String.new
       @base_font_name = 'Writer' + SecureRandom.hex(7) + 'PDF'
       self[:Type] = :Page
       self[:indirect_reference_id] = 0

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") 
@@ -724,6 +726,7 @@ module CombinePDF
 
     # All Strings are one String
     def unify_string(str)
+      str = str.dup if(str.frozen?)
       str.force_encoding(Encoding::ASCII_8BIT)
       @strings_dictionary[str] ||= str
     end

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.28'
+  VERSION = '1.0.30beta'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 1.0.28
+  version: 1.0.30beta
 platform: ruby
 authors:
 - Boaz Segev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2025-04-04 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.