pdfrb 0.7.12 → 0.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26e34e7b8d5b74f8a2f8a89b36b3ea7ae028b0cf8944707aeed0a3ddde8270fc
-  data.tar.gz: 9bae4c50eff54052d0cc173559625fb0de3ff782bb567b9ac0bf7f85be951aea
+  metadata.gz: 29668fa0363922e98c020c762e0de36fc221ed3667407d70ab68b02bc40bf90e
+  data.tar.gz: 10e2c7a8f2f9dd8e43b464cab777ef54e921004ae8a59b89c3c29dfd3c0823db
 SHA512:
-  metadata.gz: 3c12a6ae1950e81e8bb5fc181dc35aa63fcb6c0671bf0ab9e3becc92b3ebbb28e2210eb0be966ca4cefb6baf97688b1e7ba8115629d08647493680f5f42c6588
-  data.tar.gz: 87eb412507356b781a33f96f3d58aa6a14acb5284664091879c23c699e70bd3a2ee4e5f0dbd64c7958361544e1ecc3a23f71b00e2d95b3fe9f2805ab9ad441ed
+  metadata.gz: 5b2e9643a1eb44228dccaf6882139060297ebb0bfec23ba33f5e10303d4c477dd562a94b98bc0027ed049f99aac94bf56eae0cf19160cd37ed78825e32422d41
+  data.tar.gz: c43041d9ca87df1184b44897a4f5456e3b252e1a3cd604d67d2b6d6d8a1e0c4d4327c6ee01a449f1f16f7b8527098f1b73b7f0132b8aa148393f484617d161e8

data/lib/pdfrb/content/operators/inline_image.rb

@@ -10,10 +10,9 @@ module Pdfrb
       # needed, but the bytes live in the content stream so they
       # can't be reused.
       #
-      # The serialise path emits the BI dict, ID marker, raw bytes,
-      # and EI marker. The invoke path is intentionally a no-op; the
-      # content Parser handles BI/ID/EI as a single bounded block
-      # rather than via the operator dispatch table.
+      # The Parser detects BI ... ID ... EI and yields a single
+      # BeginInlineImage invocation with the parsed image Hash as
+      # the operand. The invoke hook calls Processor#inline_image.
       class BeginInlineImage < Base
         class << self
           def name; "BI"; end
@@ -27,7 +26,9 @@ module Pdfrb
             buf
           end
 
-          def invoke(_processor, *_operands); end
+          def invoke(processor, image = nil)
+            processor.inline_image(image) if image
+          end
           register
         end
       end
@@ -36,14 +37,6 @@ module Pdfrb
         class << self
           def name; "EI"; end
 
-          # The byte payload sits between ID and EI. The serializer
-          # for inline images writes the payload directly via
-          # Canvas#inline_image; this method is here so the registry
-          # knows about EI.
-          def serialize(_serializer, *_operands)
-            "EI\n"
-          end
-
           def invoke(_processor, *_operands); end
           register
         end

data/lib/pdfrb/content/processor.rb

@@ -76,6 +76,12 @@ module Pdfrb
       def begin_marked_content(_tag, _properties = nil); end
       def end_marked_content; end
       def marked_content_point(_tag, _properties = nil); end
+
+      # Called when a BI/ID/EI inline image is encountered in the
+      # content stream. +image+ is a Hash with :header (the image
+      # dict keys, expanded from abbreviations) and :data (the raw
+      # byte payload). Subclasses override to render or extract.
+      def inline_image(_image); end
     end
   end
 end

data/lib/pdfrb/digital_signature/verification.rb

@@ -89,7 +89,7 @@ module Pdfrb
             trusted?: !trusted_certs.empty? && valid,
             error: valid ? nil : "signature verification failed",
           )
-        rescue OpenSSL::PKCS7::PKCS7Error => e
+        rescue OpenSSL::PKCS7::PKCS7Error, ArgumentError => e
           VerificationResult.new(valid?: false,
                                  byte_range_ok?: true,
                                  cert_chain: [],

data/lib/pdfrb/layout/box_fitter.rb

@@ -3,7 +3,9 @@
 module Pdfrb
   module Layout
     # Fits an ordered list of boxes into a Frame, flowing to a new
-    # Frame (provided by a block) when one fills up.
+    # Frame (provided by a block) when one fills up. Delegates area
+    # tracking to the Frame (which now properly tracks removed areas
+    # and returns non-overlapping positions).
     class BoxFitter
       attr_reader :boxes, :frame, :result, :overflow
 
@@ -16,26 +18,8 @@ module Pdfrb
 
       def fit
         current_frame = @frame
-        cursor_y = current_frame.top
         @boxes.each do |box|
-          loop do
-            position = current_frame.find_available_area(box.width || current_frame.width, box.height || (cursor_y - current_frame.bottom))
-            if position && box.fit?(position[2] || current_frame.width, position[3] || (cursor_y - current_frame.bottom))
-              @result << [box, position]
-              current_frame.remove_area(position[0], position[1] - box.height, box.width, box.height)
-              cursor_y = position[1] - box.height
-              break
-            else
-              next_frame = yield if block_given?
-              if next_frame
-                current_frame = next_frame
-                cursor_y = current_frame.top
-              else
-                @overflow << box
-                break
-              end
-            end
-          end
+          current_frame = fit_box(box, current_frame)
         end
         self
       end
@@ -49,6 +33,37 @@ module Pdfrb
       def fit_complete?
         @overflow.empty?
       end
+
+      private
+
+      def fit_box(box, frame)
+        loop do
+          return frame if place?(box, frame)
+
+          next_frame = yield if block_given?
+          unless next_frame
+            @overflow << box
+            return frame
+          end
+
+          frame = next_frame
+        end
+      end
+
+      def place?(box, frame)
+        box_w = box.width || frame.width
+        box_h = box.height || frame.available_height
+        position = frame.find_available_area(box_w, box_h)
+        return false unless position
+
+        actual_w = position[2] || frame.width
+        actual_h = position[3] || frame.available_height
+        return false unless box.fit?(actual_w, actual_h)
+
+        @result << [box, position]
+        frame.remove_area(position[0], position[1], actual_w, box.height || actual_h)
+        true
+      end
     end
   end
 end

data/lib/pdfrb/model/type/thumbnail.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Pdfrb
+  module Model
+    module Type
+      # Thumbnail image stream (ISO 32000-2 §12.3.4). A small image
+      # XObject rendered at reduced resolution for use in viewer
+      # navigation panels. Attached to a page via the /Thumb key.
+      class Thumbnail < Pdfrb::Model::Cos::Stream
+        arlington_object "Thumbnail"
+
+        # /Width — required.
+        def width
+          value[:Width]
+        end
+
+        # /Height — required.
+        def height
+          value[:Height]
+        end
+
+        # /ColorSpace — required unless /ImageMask true.
+        def color_space
+          value[:ColorSpace]
+        end
+
+        # /BitsPerComponent — required.
+        def bits_per_component
+          value[:BitsPerComponent]
+        end
+
+        # /Filter — optional; a named filter or array of filters.
+        def filter
+          value[:Filter]
+        end
+
+        def dimensions
+          [width, height]
+        end
+      end
+    end
+  end
+end

data/lib/pdfrb/model/type/timespan.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Pdfrb
+  module Model
+    module Type
+      # Timespan (ISO 32000-2 §12.7.11, PDF 1.5+). A duration with
+      # a unit, used in RichMedia timing, 3D animation, and
+      # JavaScript-embedded timelines.
+      class Timespan < Pdfrb::Model::Cos::Dictionary
+        arlington_object "Timespan"
+
+        # /Type — optional, fixed "Timespan".
+        def type
+          value[:Type]&.to_sym
+        end
+
+        # /S — required, fixed "S" (seconds).
+        def subtype
+          value[:S]&.to_sym
+        end
+
+        # /V — required, the numeric duration in seconds.
+        def duration
+          value[:V]
+        end
+
+        # Convenience: duration in milliseconds.
+        def milliseconds
+          v = duration
+          v ? v.to_f * 1000 : nil
+        end
+      end
+    end
+  end
+end

data/lib/pdfrb/model/type/user_property.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Pdfrb
+  module Model
+    module Type
+      # UserProperty (ISO 32000-2 §14.7.5). A single property in the
+      # /P array of a user property list attached to structure
+      # elements for custom metadata.
+      class UserProperty < Pdfrb::Model::Cos::Dictionary
+        arlington_object "UserProperty"
+
+        # /N — required, the property name.
+        def name
+          value[:N]
+        end
+
+        # /V — required, the property value (any COS type).
+        def property_value
+          value[:V]
+        end
+
+        # /F — optional, a text string with the intended format of
+        # the value.
+        def format
+          value[:F]
+        end
+
+        # /H — optional, whether the property is hidden from the
+        # user (default false).
+        def hidden?
+          value[:H] == true
+        end
+      end
+    end
+  end
+end

data/lib/pdfrb/model/type/viewport.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Pdfrb
+  module Model
+    module Type
+      # Viewport (ISO 32000-2 §12.7.11, PDF 1.6+). Defines a
+      # rectangular region of a page intended for separate display,
+      # used for magnifier rectangles, measurement regions, and
+      # zoom targets.
+      class Viewport < Pdfrb::Model::Cos::Dictionary
+        arlington_object "Viewport"
+
+        # /Type — optional, fixed "Viewport".
+        def type
+          value[:Type]&.to_sym
+        end
+
+        # /BBox — required, the viewport rectangle.
+        def bbox
+          value[:BBox]
+        end
+
+        # /Name — optional, human-readable viewport name.
+        def name
+          value[:Name]
+        end
+
+        # /Measure — optional indirect Measure dict (RL for rulers,
+        # GEO for geospatial since PDF 2.0).
+        def measure(document = nil)
+          ref = value[:Measure]
+          return nil unless ref && document
+
+          ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+        end
+      end
+    end
+  end
+end

data/lib/pdfrb/model/type/vri.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Pdfrb
+  module Model
+    module Type
+      # VRI (Validation Related Information) dictionary per ETSI EN
+      # 319 142-1 (PAdES) §B.5. Lives in /DSS /VRI map, keyed by the
+      # hex-encoded SHA-1 of the signature it validates. Holds the
+      # certificates, CRLs, and OCSP responses relevant to one
+      # signature.
+      class Vri < Pdfrb::Model::Cos::Dictionary
+        arlington_object "VRI"
+
+        # /Type — optional, fixed "VRI".
+        def type
+          value[:Type]&.to_sym
+        end
+
+        # /Cert — array of indirect streams, each a DER-encoded
+        # X.509 certificate relevant to the signature.
+        def certificates(document = nil)
+          refs = value[:Cert]
+          return [] unless refs
+
+          resolve_refs(refs, document)
+        end
+
+        # /CRL — array of indirect streams, each a DER-encoded
+        # certificate revocation list.
+        def crls(document = nil)
+          refs = value[:CRL]
+          return [] unless refs
+
+          resolve_refs(refs, document)
+        end
+
+        # /OCSP — array of indirect streams, each a DER-encoded
+        # OCSP response.
+        def ocsp_responses(document = nil)
+          refs = value[:OCSP]
+          return [] unless refs
+
+          resolve_refs(refs, document)
+        end
+
+        # /TU — optional string-text with a human-readable timestamp.
+        def timestamp_text
+          value[:TU]
+        end
+
+        # /TS — optional indirect stream with a timestamp token.
+        def timestamp_token(document = nil)
+          ref = value[:TS]
+          return nil unless ref && document
+
+          ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+        end
+
+        private
+
+        def resolve_refs(refs, document)
+          return [] unless document
+
+          arr = refs.is_a?(Pdfrb::Model::PdfArray) ? refs.value : refs
+          arr = [arr] unless arr.is_a?(::Array)
+          arr.filter_map do |r|
+            next r unless r.is_a?(Pdfrb::Model::Reference)
+
+            document.object(r)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pdfrb/model/type.rb

@@ -356,6 +356,21 @@ module Pdfrb
 
       # Page-piece dictionary (s14.5).
       autoload :PagePieceInfo, "pdfrb/model/type/page_piece_info"
+
+      # PAdES validation-related information (ETSI EN 319 142-1).
+      autoload :Vri, "pdfrb/model/type/vri"
+
+      # Page thumbnails (s12.3.4).
+      autoload :Thumbnail, "pdfrb/model/type/thumbnail"
+
+      # Timespan (s12.7.11, PDF 1.5+).
+      autoload :Timespan, "pdfrb/model/type/timespan"
+
+      # Viewport (s12.7.11, PDF 1.6+).
+      autoload :Viewport, "pdfrb/model/type/viewport"
+
+      # User property (s14.7.5).
+      autoload :UserProperty, "pdfrb/model/type/user_property"
     end
   end
 end

data/lib/pdfrb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pdfrb
-  VERSION = "0.7.12"
+  VERSION = "0.7.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdfrb
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.7.14
 platform: ruby
 authors:
 - Ribose Inc.
@@ -1149,14 +1149,19 @@ files:
 - lib/pdfrb/model/type/three_d_stream.rb
 - lib/pdfrb/model/type/three_d_units.rb
 - lib/pdfrb/model/type/three_d_view.rb
+- lib/pdfrb/model/type/thumbnail.rb
+- lib/pdfrb/model/type/timespan.rb
 - lib/pdfrb/model/type/to_unicode_cmap_stream.rb
 - lib/pdfrb/model/type/transition.rb
 - lib/pdfrb/model/type/underline_annotation.rb
 - lib/pdfrb/model/type/ur_transform_parameters.rb
 - lib/pdfrb/model/type/uri_dict.rb
 - lib/pdfrb/model/type/url_alias.rb
+- lib/pdfrb/model/type/user_property.rb
 - lib/pdfrb/model/type/variable_text_field.rb
 - lib/pdfrb/model/type/viewer_preferences.rb
+- lib/pdfrb/model/type/viewport.rb
+- lib/pdfrb/model/type/vri.rb
 - lib/pdfrb/model/type/watermark_annotation.rb
 - lib/pdfrb/model/type/widget_annotation.rb
 - lib/pdfrb/model/type/widget_appearance.rb