rubrik 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a41daeeefd22b755dd4ae91177d7142e46eff64f5d1877a1c303f4885634f1a2
-  data.tar.gz: d205242211ab51a47a2ac8db5a89267bf90f2e2576450d60311e3de8a5b33d82
+  metadata.gz: 1092e4bfdff7f05272eab8cf226a09b54737f368c24e883370002a399036ce4a
+  data.tar.gz: 818072d3ea9003599a9ec5fb49af2df99f3f43045e9aa6a81a1e62e8f2c11fd3
 SHA512:
-  metadata.gz: 4e73a024012af2d658489a007a449ed05270c02ccbaf4fa9c49930827e98aeb4bc1ea71f70e1c923e7d5fafe17e334f27b5ae66a4e3f49959f34ea8e6836ec58
-  data.tar.gz: 23a4ca82df06a937feb613b5320351d44067c0a7db596ccc854486256609856f97361011be725cf987ede6fd7e6e9a2d4c7249ba8683ef010b5718e302fa0e8d
+  metadata.gz: 173091b0ab44b398a10260e267de6ff92fe8083d2668dabe86e79bdb93547151ad9b73e08296c955e3e604ebba4b1f9f74fc44ae91ef661839883cd96f71fe9d
+  data.tar.gz: 60a0c1647190a473703ac1ae1cf1e5d407bc59e4f599b1de6d3111c3dd7105fa8077ec7955fed5df1c5c088dc9a515e7b5b3bd1987a0d42dc2835f5ca8585313

data/lib/rubrik/document/serialize_object.rb

@@ -15,14 +15,14 @@ module Rubrik
           serialized_objs = obj.flatten.map { |e| SerializeObject[e] }
           "<<#{serialized_objs.join(" ")}>>"
         when Symbol
-          "/#{obj}"
+          serialize_symbol(obj)
         when Array
           serialized_objs = obj.map { |e| SerializeObject[e] }
           "[#{serialized_objs.join(" ")}]"
         when PDF::Reader::Reference
           "#{obj.id} #{obj.gen} R"
         when String
-          "(#{obj})"
+          serialize_string(obj)
         when TrueClass
           "true"
         when FalseClass
@@ -48,6 +48,43 @@ module Rubrik
       end
 
       alias call []
+
+      private
+
+      STRING_ESCAPE_MAP = {
+        "\n" => "\\\n",
+        "\r" => "\\\r",
+        "\t" => "\\\t",
+        "\b" => "\\\b",
+        "\f" => "\\\f",
+        "\\" => "\\\\",
+        "(" => "\\(",
+        ")" => "\\)"
+      }.freeze
+
+      sig {params(string: String).returns(String)}
+      def serialize_string(string)
+        "(#{string.gsub(/[\n\r\t\b\f\\()]/n, STRING_ESCAPE_MAP)})"
+      end
+
+      DELIMITERS = "()<>[]{}/%".bytes.freeze
+      REGULAR_CHARACTERS =
+        "!\"\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~".bytes.freeze
+
+
+      NAME_ESCAPE_CHARACTERS = (0..255).to_a - REGULAR_CHARACTERS + DELIMITERS + "#".bytes
+      NAME_ESCAPE_CHARACTERS.freeze
+
+      NAME_ESCAPE_MAP = NAME_ESCAPE_CHARACTERS.each_with_object({}) do |char, escape_map|
+        escape_map[char.chr] = "##{char.to_s(16).rjust(2, "0")}"
+      end.freeze
+
+      NAME_ESCAPE_REGEX = /[#{Regexp.escape(NAME_ESCAPE_CHARACTERS.map(&:chr).join)}]/
+
+      sig {params(symbol: Symbol).returns(String)}
+      def serialize_symbol(symbol)
+        "/#{symbol.to_s.b.gsub(NAME_ESCAPE_REGEX, NAME_ESCAPE_MAP)}"
+      end
     end
   end
 end

data/lib/rubrik/document.rb

@@ -91,7 +91,15 @@ module Rubrik
         modified_objects << {id: first_page_reference, value: new_first_page}
       end
 
-      (interactive_form[:Fields] ||= []) << signature_field_id
+      fields_entry = interactive_form[:Fields]
+      if fields_entry.is_a?(PDF::Reader::Reference)
+        new_fields_array = objects.fetch(fields_entry).dup
+        new_fields_array << signature_field_id
+
+        modified_objects << {id: fields_entry, value: new_fields_array}
+      else
+        (interactive_form[:Fields] ||= []) << signature_field_id
+      end
 
       signature_value_id
     end
@@ -118,11 +126,22 @@ module Rubrik
       root_ref = objects.trailer[:Root]
       root = T.let(objects.fetch(root_ref), T::Hash[Symbol, T.untyped])
 
-      if root.key?(:AcroForm)
+      interactive_form_value = root[:AcroForm]
+      case interactive_form_value
+      when PDF::Reader::Reference
         form_id = root[:AcroForm]
 
         modified_objects << {id: form_id, value: objects.fetch(form_id).dup}
-      else
+      when Hash
+        interactive_form_id = assign_new_object_id!
+
+        modified_objects << {id: interactive_form_id, value: interactive_form_value.dup}
+
+        new_root = root.dup
+        new_root[:AcroForm] = interactive_form_id
+
+        modified_objects << {id: root_ref, value: new_root}
+      when NilClass
         interactive_form_id = assign_new_object_id!
         modified_objects << {id: interactive_form_id, value: {Fields: []}}
 
@@ -131,6 +150,10 @@ module Rubrik
         updated_root[:AcroForm] = interactive_form_id
 
         modified_objects << {id: root_ref, value: updated_root}
+      else
+        raise Error.new(
+          "Expected dictionary, reference or nil but got " \
+          "#{interactive_form_value.class} on AcroForm entry.")
       end
 
       interactive_form[:SigFlags] = 3 # dont modify, append only

data/lib/rubrik/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rubrik
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubrik
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Tomás Coêlho
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 2023-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pdf-reader