pdfrb 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04a819d2ed2b54eb4ca8c0ac17ceb14cc1c45a79e359bb51c6b5194e2fdb7025
-  data.tar.gz: bcb6a670c04b7e68b20b90f8ac344ac0672a76f1fd3e16306ac46b4c44f728ec
+  metadata.gz: 84368b352e856470e7d3f3374071df7724c21d5dba77596842ac5bacc419db59
+  data.tar.gz: c0bfb8c0a8803aa74ecf43d1e3e35ff18b17bc457582705c409d8fae89b8f50f
 SHA512:
-  metadata.gz: f8eb286788ae52128019b39b18006776c9c9227ab92e76b0a72add85eb92b16daa390704d243627a0f79fcd8b9c0195a606f7f6878953db634ff1c9ad257b0f4
-  data.tar.gz: 1940d86297e8e20ae06d33b23bd7b36815d5249fce28eb120262ab33e5350668fa015247444ed905ac1ba5b73295fa092b74d6e477c9fd74a507252a78cb110f
+  metadata.gz: 4d6aec972d3b32bc66f70098ab1122472fef43c675d4eaba1b77cb4c3b74231a515f9ad877d648c8b28d3dc874b55475327b20ade2b2dcc85d70e3e15712fdbc
+  data.tar.gz: 65fd26f6e44e1bcaa18471e86662f53e46ae4c2ac9a91a82fb182adbb10c7ef6616e6ab5505379dbc42c414a6684f848864648c486567a59e2f9aa695de67f57

data/lib/pdfrb/compare/comparator.rb

@@ -96,8 +96,7 @@ module Pdfrb
 
       def inventory_fonts(doc)
         fonts = Set.new
-        doc.each_indirect_object do |obj|
-          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
+        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
           next unless obj[:Type] == :Font
 
           name = obj[:BaseFont] || obj[:Name] || "Unknown"
@@ -117,8 +116,7 @@ module Pdfrb
 
       def count_images(doc)
         count = 0
-        doc.each_indirect_object do |obj|
-          next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
+        doc.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
           next unless obj[:Subtype] == :Image
 
           count += 1

data/lib/pdfrb/conformance/pdf_a.rb

@@ -31,8 +31,7 @@ module Pdfrb
                       id: "6.1-4", description: "JavaScript prohibited",
                       severity: :error, spec_clause: "ISO 19005-1 6.1",
                       check: ->(doc) {
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
                           if obj.value[:S] == :JavaScript
                             return Violation.new(rule_id: "6.1-4", message: "PDF/A prohibits JavaScript actions",
                                                  object: "JavaScript action", severity: :error,
@@ -201,8 +200,7 @@ module Pdfrb
                       id: "a1-1", description: "JPEG2000 not allowed in A-1",
                       severity: :error, spec_clause: "ISO 19005-1 6.2.4",
                       check: ->(doc) {
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
                           next unless obj[:Filter] == :JPXDecode
 
                           return Violation.new(rule_id: "a1-1",
@@ -217,8 +215,7 @@ module Pdfrb
                       id: "a1-2", description: "Object streams not allowed in A-1",
                       severity: :error, spec_clause: "ISO 19005-1 6.2.4",
                       check: ->(doc) {
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
                           next unless obj.value[:Type] == :ObjStm
 
                           return Violation.new(rule_id: "a1-2",
@@ -247,9 +244,7 @@ module Pdfrb
                       id: "a1-4", description: "LZWDecode not allowed in A-1",
                       severity: :error, spec_clause: "ISO 19005-1 6.2.4",
                       check: ->(doc) {
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
-
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
                           f = obj[:Filter]
                           fs = f.is_a?(::Array) ? f : [f]
                           next unless fs.include?(:LZWDecode)
@@ -269,8 +264,7 @@ module Pdfrb
                       id: "a2-1", description: "PostScript XObjects prohibited",
                       severity: :warning, spec_clause: "ISO 19005-2 6.2.4",
                       check: ->(doc) {
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
                           next unless [:PS, :PSXObject].include?(obj[:Subtype])
 
                           return Violation.new(rule_id: "a2-1",
@@ -285,8 +279,7 @@ module Pdfrb
                       id: "a2-2", description: "Embedded files not allowed in A-2",
                       severity: :error, spec_clause: "ISO 19005-2 6.2",
                       check: ->(doc) {
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
                           next unless obj.value[:Type] == :EmbeddedFile
 
                           return Violation.new(rule_id: "a2-2",
@@ -316,8 +309,7 @@ module Pdfrb
                       severity: :error, spec_clause: "ISO 19005-3 6.2",
                       check: ->(doc) {
                         vs = []
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
                           next unless obj.value[:Type] == :Filespec
                           next if obj.value[:AFRelationship]
 
@@ -348,8 +340,7 @@ module Pdfrb
                       severity: :error, spec_clause: "ISO 19005-4 6.2",
                       check: ->(doc) {
                         vs = []
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
                           next unless obj.value[:Type] == :Filespec
                           next if obj.value[:AFRelationship]
 
@@ -366,8 +357,7 @@ module Pdfrb
                       severity: :error, spec_clause: "ISO 19005-4 6.2.3",
                       check: ->(doc) {
                         vs = []
-                        doc.each_indirect_object do |annot|
-                          next unless annot.is_a?(Pdfrb::Model::Cos::Dictionary)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |annot|
                           next unless annot.value[:Type] == :Annot
 
                           st = annot.value[:Subtype]

data/lib/pdfrb/conformance/pdf_x.rb

@@ -150,9 +150,7 @@ module Pdfrb
                       spec_clause: "ISO 15930 §6.5",
                       check: ->(doc) {
                         violations = []
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
-
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
                           s = obj[:S]
                           next unless [:JavaScript, :JS, :Launch, :URI].include?(s)
 
@@ -231,7 +229,7 @@ module Pdfrb
         spec_clause: "ISO 15930-11 6.1",
         check: ->(doc) {
           v = doc.version.to_s
-          next nil if compare_versions(v, "2.0") >= 0
+          next nil if Pdfrb::PdfVersion.compare(v, "2.0") >= 0
 
           Violation.new(
             rule_id: "x6-1",
@@ -280,16 +278,8 @@ module Pdfrb
         rs.register(X6_OUTPUT_INTENT_RULE)
       end
 
-      def compare_versions(a, b)
-        aa = a.to_s.split(".").map(&:to_i)
-        bb = b.to_s.split(".").map(&:to_i)
-        (aa <=> bb) || 0
-      end
-
       def scan_color_spaces(doc, &block)
-        doc.each_indirect_object do |obj|
-          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
-
+        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
           cs = obj.value[:ColorSpace]
           next unless cs
 

data/lib/pdfrb/content/canvas.rb

@@ -43,13 +43,11 @@ module Pdfrb
       end
 
       def concat(a, b, c, d, e, f, &)
-        emit_op Pdfrb::Content::Operator::ConcatMatrix, a, b, c, d, e, f
-        return self unless block_given?
+        return emit_op(Pdfrb::Content::Operator::ConcatMatrix, a, b, c, d, e, f) unless block_given?
 
-        begin
+        save_graphics_state do
+          emit_op(Pdfrb::Content::Operator::ConcatMatrix, a, b, c, d, e, f)
           yield self
-        ensure
-          emit_op Pdfrb::Content::Operator::SaveGraphicsState
         end
         self
       end
@@ -282,41 +280,28 @@ module Pdfrb
                 create_ext_g_state(BM: mode.to_s))
       end
 
-      def with_transparency(opacity: 1.0, blend_mode: nil)
-        save_graphics_state
-        self.opacity = opacity if opacity < 1.0
-        self.blend_mode = blend_mode if blend_mode
-
-        begin
+      def with_transparency(opacity: 1.0, blend_mode: nil, &)
+        save_graphics_state do
+          self.opacity = opacity if opacity < 1.0
+          self.blend_mode = blend_mode if blend_mode
           yield self
-        ensure
-          emit_op(Pdfrb::Content::Operator::RestoreGraphicsState)
         end
         self
       end
 
       def draw_image(name, at: nil, width: nil, height: nil, matrix: nil)
-        @used_xobjects[name] = true
-        save_graphics_state do
-          if matrix
-            a, b, c, d, e, f = matrix
-            concat(a, b, c, d, e, f)
-            emit_op(Pdfrb::Content::Operator::InvokeXObject, name)
-          else
-            translate(at[0], at[1])
-            concat(width, 0, 0, height, 0, 0)
-            append(" /#{name} Do\n")
-          end
+        if matrix
+          a, b, c, d, e, f = matrix
+          invoke_xobject(name, matrix: [a, b, c, d, e, f])
+        else
+          invoke_xobject(name, matrix: [width, 0, 0, height, 0, 0],
+                               pre_translate: at)
         end
         self
       end
 
       def draw_image_matrix(name, a:, b:, c:, d:, e:, f:)
-        @used_xobjects[name] = true
-        save_graphics_state do
-          concat(a, b, c, d, e, f)
-          emit_op(Pdfrb::Content::Operator::InvokeXObject, name)
-        end
+        invoke_xobject(name, matrix: [a, b, c, d, e, f])
         self
       end
 
@@ -327,13 +312,20 @@ module Pdfrb
       # @param at [Array<Numeric>] x, y translation.
       # @param matrix [Array<Numeric>, nil] 6-element transform matrix.
       def draw_form_xobject(name, at: [0, 0], matrix: nil)
+        translate = matrix.nil? ? at : nil
+        invoke_xobject(name, matrix: matrix, pre_translate: translate)
+        self
+      end
+
+      # Invoke an XObject (/Do) inside a saved graphics state, applying
+      # an optional translation then a 6-element transform matrix.
+      def invoke_xobject(name, matrix: nil, pre_translate: nil)
         @used_xobjects[name] = true
         save_graphics_state do
+          translate(pre_translate[0], pre_translate[1]) if pre_translate
           if matrix
             a, b, c, d, e, f = matrix
-            concat(a, b, c, d, e, f)
-          elsif at
-            translate(at[0], at[1])
+            emit_op(Pdfrb::Content::Operator::ConcatMatrix, a, b, c, d, e, f)
           end
           emit_op(Pdfrb::Content::Operator::InvokeXObject, name)
         end

data/lib/pdfrb/content/hidden_text_detector.rb

@@ -55,8 +55,7 @@ module Pdfrb
       end
 
       def find_page(stream_obj)
-        @document.each_indirect_object do |obj|
-          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
+        @document.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
           next unless obj[:Type] == :Page
 
           contents = obj[:Contents]

data/lib/pdfrb/document.rb

@@ -282,6 +282,16 @@ module Pdfrb
       end
     end
 
+    # Yield every indirect object of +klass+ (e.g. all Streams, all
+    # Dictionaries). Enumerator when blockless.
+    def each_indirect_of(klass)
+      return enum_for(:each_indirect_of, klass) unless block_given?
+
+      each_indirect_object do |obj|
+        yield obj if obj.is_a?(klass)
+      end
+    end
+
     # Walk every revision in the document's incremental-update chain,
     # from the latest (most recent) revision backward via /Prev.
     # Each revision yields a (revision_index, xref, trailer) tuple

data/lib/pdfrb/pdf_version.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Pdfrb
+  # PDF header version comparisons (ISO 32000-2, s7.2). Version strings
+  # are dot-separated numerics ("1.4", "2.0"); comparison is
+  # numeric-per-component, never lexical ("1.10" > "1.9").
+  module PdfVersion
+    module_function
+
+    # @return [Integer] -1, 0, or 1 as +a+ is earlier, equal, or later
+    #   than +b+.
+    def compare(a, b)
+      aa = a.to_s.split(".").map(&:to_i)
+      bb = b.to_s.split(".").map(&:to_i)
+      (aa <=> bb) || 0
+    end
+
+    # @return [Boolean] whether +version+ meets or exceeds +minimum+.
+    def at_least?(version, minimum)
+      compare(version, minimum) >= 0
+    end
+  end
+end

data/lib/pdfrb/task/optimize.rb

@@ -55,9 +55,7 @@ module Pdfrb
       # {duplicate_oid => canonical_oid} that was applied.
       def dedup_streams!(document)
         canonical_for = {}
-        document.each_indirect_object do |obj|
-          next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
-          next unless obj.indirect?
+        document.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
           next if obj.value[:Type] == :ObjStm
 
           key = stream_dedup_key(obj)
@@ -65,9 +63,7 @@ module Pdfrb
         end
 
         replacements = {}
-        document.each_indirect_object do |obj|
-          next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
-          next unless obj.indirect?
+        document.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
           next if obj.value[:Type] == :ObjStm
 
           key = stream_dedup_key(obj)

data/lib/pdfrb/version.rb

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

data/lib/pdfrb/writer.rb

@@ -392,26 +392,19 @@ module Pdfrb
       return current unless catalog
 
       v = current
-      if (catalog.value[:AF] || catalog.value[:Collection]) && compare_versions(v, "2.0").negative?
+      if (catalog.value[:AF] || catalog.value[:Collection]) && Pdfrb::PdfVersion.compare(v, "2.0").negative?
         v = "2.0"
       end
-      if catalog.value[:OCProperties] && compare_versions(v, "1.5").negative?
+      if catalog.value[:OCProperties] && Pdfrb::PdfVersion.compare(v, "1.5").negative?
         v = "1.5"
       end
       document.version = v
       v
     end
 
-    def compare_versions(a, b)
-      aa = a.to_s.split(".").map(&:to_i)
-      bb = b.to_s.split(".").map(&:to_i)
-      (aa <=> bb) || 0
-    end
-
     def compress_content_streams
       require "zlib"
-      document.each_indirect_object do |obj|
-        next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
+      document.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
         next if obj.value[:Filter]
         next unless obj.stream
         next if obj.value[:Type] == :Metadata

data/lib/pdfrb.rb

@@ -18,6 +18,7 @@ module Pdfrb
   autoload :Configuration, "pdfrb/configuration"
   autoload :DataDir, "pdfrb/data_dir"
   autoload :PdfConstants, "pdfrb/pdf_constants"
+  autoload :PdfVersion, "pdfrb/pdf_version"
 
   autoload :Source, "pdfrb/source"
   autoload :Model, "pdfrb/model"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdfrb
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-29 00:00:00.000000000 Z
+date: 2026-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark
@@ -1261,6 +1261,7 @@ files:
 - lib/pdfrb/model/type/xobject_image.rb
 - lib/pdfrb/model/type/xref_stream.rb
 - lib/pdfrb/pdf_constants.rb
+- lib/pdfrb/pdf_version.rb
 - lib/pdfrb/serializer.rb
 - lib/pdfrb/source.rb
 - lib/pdfrb/source/header_reader.rb