pdfrb 0.8.4 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6ed6487322f48831706d1efa10d78b12bbb0965d8c46232b8d333130fe63e91
-  data.tar.gz: f3da7f40c6b4f1e53b454d70eaac66a2fd42d3f73c03802dc01a9bdffbdd3915
+  metadata.gz: 84368b352e856470e7d3f3374071df7724c21d5dba77596842ac5bacc419db59
+  data.tar.gz: c0bfb8c0a8803aa74ecf43d1e3e35ff18b17bc457582705c409d8fae89b8f50f
 SHA512:
-  metadata.gz: 922050302dd2668bdf08e8fcfb612a02e99e0b8a90c0ce667f2910398a5cbece4fd656b1d2cf615c4e410d368534f31a0071afac6e80b5b81982f65c7b78b9a3
-  data.tar.gz: f80c263e29e5b17659e7e9eeef9dbedac5865ffbb38d9871e9687bbbe1cc8ad7a1743c0c9dd9dbb18eb9fcb072c0c9032391983df129b04eb9b15f0d148a1abd
+  metadata.gz: 4d6aec972d3b32bc66f70098ab1122472fef43c675d4eaba1b77cb4c3b74231a515f9ad877d648c8b28d3dc874b55475327b20ade2b2dcc85d70e3e15712fdbc
+  data.tar.gz: 65fd26f6e44e1bcaa18471e86662f53e46ae4c2ac9a91a82fb182adbb10c7ef6616e6ab5505379dbc42c414a6684f848864648c486567a59e2f9aa695de67f57

data/lib/pdfrb/annotation/base.rb

@@ -39,7 +39,7 @@ module Pdfrb
             Type: :Annot,
             Subtype: subtype,
             Rect: rect,
-            P: Pdfrb::Model::Reference.new(page.oid, page.gen),
+            P: page.ref,
             Contents: contents,
             F: flags,
           }.compact
@@ -64,7 +64,7 @@ module Pdfrb
 
         def attach_to_page(page, annot)
           annots = page.value[:Annots]
-          ref = Pdfrb::Model::Reference.new(annot.oid, annot.gen)
+          ref = annot.ref
           if annots.nil?
             page.value[:Annots] = [ref]
           elsif annots.is_a?(::Array)

data/lib/pdfrb/appearance/generator.rb

@@ -195,7 +195,7 @@ module Pdfrb
 
       def set_appearance(field, form, state_name = :Normal)
         form_stream = form.stream
-        ref = Pdfrb::Model::Reference.new(form_stream.oid, form_stream.gen)
+        ref = form_stream.ref
 
         ap = field.value[:AP]
         if ap.nil?

data/lib/pdfrb/cli/images.rb

@@ -18,7 +18,7 @@ module Pdfrb
 
           xo = xo.value if xo.is_a?(Pdfrb::Model::Cos::Dictionary)
           xo&.each do |name, ref|
-            obj = ref.is_a?(Pdfrb::Model::Reference) ? doc.object(ref) : ref
+            obj = doc.resolve(ref)
             next unless obj&.value&.[](:Subtype) == :Image
 
             count += 1

data/lib/pdfrb/cli.rb

@@ -158,7 +158,7 @@ module Pdfrb
       return unless fields
 
       fields.each do |ref|
-        field = ref.is_a?(Pdfrb::Model::Reference) ? doc.object(ref) : ref
+        field = doc.resolve(ref)
         next unless field
 
         name = field[:T] || "(unnamed)"
@@ -330,7 +330,7 @@ module Pdfrb
           O: o_entry, U: u_entry },
         type: Pdfrb::Model::Cos::Dictionary
       )
-      doc.trailer[:Encrypt] = Pdfrb::Model::Reference.new(encrypt_dict.oid, encrypt_dict.gen)
+      doc.trailer[:Encrypt] = encrypt_dict.ref
 
       # Set up the handler so Writer can encrypt per-object.
       handler = Pdfrb::Encryption::StandardSecurityHandler.new(
@@ -364,7 +364,7 @@ module Pdfrb
           O: o_entry, U: u_entry, OE: "".b, UE: "".b },
         type: Pdfrb::Model::Cos::Dictionary
       )
-      doc.trailer[:Encrypt] = Pdfrb::Model::Reference.new(encrypt_dict.oid, encrypt_dict.gen)
+      doc.trailer[:Encrypt] = encrypt_dict.ref
       doc.config["encryption.password"] = user_pw
     end
 

data/lib/pdfrb/color/default_profile.rb

@@ -47,7 +47,7 @@ module Pdfrb
           type: Pdfrb::Model::Cos::Stream
         )
         stream.stream = bytes
-        [:ICCBased, Pdfrb::Model::Reference.new(stream.oid, stream.gen)]
+        [:ICCBased, stream.ref]
       end
 
       # ---- Header construction ----

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/ltv.rb

@@ -87,7 +87,7 @@ module Pdfrb
                         fields = Pdfrb::Conformance::Pades.signature_fields(doc)
                         has_archival = fields.any? do |field|
                           v = field[:V]
-                          v_obj = v.is_a?(Pdfrb::Model::Reference) ? doc.object(v) : v
+                          v_obj = doc.resolve(v)
                           v_obj && v_obj[:Type]&.to_sym == :DocTimeStamp
                         end
                         next nil if has_archival

data/lib/pdfrb/conformance/pades.rb

@@ -52,7 +52,7 @@ module Pdfrb
                           v = field[:V]
                           next unless v
 
-                          v_obj = v.is_a?(Pdfrb::Model::Reference) ? doc.object(v) : v
+                          v_obj = doc.resolve(v)
                           next if v_obj && ALLOWED_SIGNATURE_TYPES.include?(v_obj[:Type]&.to_sym)
 
                           vs << Violation.new(
@@ -81,7 +81,7 @@ module Pdfrb
                           v = field[:V]
                           next unless v
 
-                          v_obj = v.is_a?(Pdfrb::Model::Reference) ? doc.object(v) : v
+                          v_obj = doc.resolve(v)
                           has_timestamp = v_obj && (
                             v_obj[:Type]&.to_sym == :DocTimeStamp ||
                               (v_obj[:ByteRange] && timestamp_in_signature?(v_obj))
@@ -134,7 +134,7 @@ module Pdfrb
                         # protecting the DSS.
                         has_archival = signature_fields(doc).any? do |field|
                           v = field[:V]
-                          v_obj = v.is_a?(Pdfrb::Model::Reference) ? doc.object(v) : v
+                          v_obj = doc.resolve(v)
                           v_obj && v_obj[:Type]&.to_sym == :DocTimeStamp
                         end
                         next nil if has_archival
@@ -173,7 +173,7 @@ module Pdfrb
         return [] unless fields.is_a?(::Array)
 
         fields.filter_map do |ref|
-          obj = ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          obj = document.resolve(ref)
           next nil unless obj
 
           obj[:FT]&.to_sym == :Sig ? obj : nil

data/lib/pdfrb/conformance/pdf_2_af.rb

@@ -131,7 +131,7 @@ module Pdfrb
           af_value = af.is_a?(Pdfrb::Model::PdfArray) ? af.value : af
           entries = af_value.is_a?(::Array) ? af_value : [af_value]
           entries.each do |e|
-            resolved = e.is_a?(Pdfrb::Model::Reference) ? document.object(e) : e
+            resolved = document.resolve(e)
             yield container, resolved if resolved
           end
         end
@@ -153,7 +153,7 @@ module Pdfrb
           af_value = af.is_a?(Pdfrb::Model::PdfArray) ? af.value : af
           entries = af_value.is_a?(::Array) ? af_value : [af_value]
           entries.each do |e|
-            resolved = e.is_a?(Pdfrb::Model::Reference) ? document.object(e) : e
+            resolved = document.resolve(e)
             next unless resolved && resolved.value[:Type] == :FileSpec
 
             yield container, resolved

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,
@@ -65,7 +64,7 @@ module Pdfrb
                           next unless fonts
 
                           fonts.each_value do |ref|
-                            f = ref.is_a?(Pdfrb::Model::Reference) ? doc.object(ref) : ref
+                            f = doc.resolve(ref)
                             next unless f
                             next if f[:FontDescriptor]
 
@@ -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

@@ -94,7 +94,7 @@ module Pdfrb
 
                           fonts_hash = fonts.is_a?(Pdfrb::Model::Cos::Dictionary) ? fonts.value : fonts
                           fonts_hash&.each_value do |ref|
-                            font = ref.is_a?(Pdfrb::Model::Reference) ? doc.object(ref) : ref
+                            font = doc.resolve(ref)
                             next unless font
 
                             fd = font[:FontDescriptor]
@@ -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)
 
@@ -174,7 +172,7 @@ module Pdfrb
 
         intents = [intents] unless intents.is_a?(::Array)
         intents.any? do |ref|
-          obj = ref.is_a?(Pdfrb::Model::Reference) ? doc.object(ref) : ref
+          obj = doc.resolve(ref)
           obj && obj.value[:S] == :GTS_PDFX
         end
       end
@@ -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",
@@ -257,7 +255,7 @@ module Pdfrb
                           else [intents]
                           end
           has_pdfx = intents_array.any? do |i|
-            obj = i.is_a?(Pdfrb::Model::Reference) ? doc.object(i) : i
+            obj = doc.resolve(i)
             obj && obj[:S] == :GTS_PDFX
           end
           next nil if has_pdfx
@@ -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/conformance/tagged_pdf.rb

@@ -145,7 +145,7 @@ module Pdfrb
         root_ref = document.catalog[:StructTreeRoot]
         return unless root_ref
 
-        root = root_ref.is_a?(Pdfrb::Model::Reference) ? document.object(root_ref) : root_ref
+        root = document.resolve(root_ref)
         return unless root
 
         first_kids = structure_kids(root, document)

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
@@ -531,7 +523,7 @@ module Pdfrb
         )
         r = @stream.value[:Resources] || {}
         eg = r[:ExtGState] || {}
-        eg[name] = Pdfrb::Model::Reference.new(gs.oid, gs.gen)
+        eg[name] = gs.ref
         r[:ExtGState] = eg
         @stream.value[:Resources] = r
         name

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]
@@ -69,7 +68,7 @@ module Pdfrb
                  end
 
           return obj if list.any? do |c|
-            c_obj = c.is_a?(Pdfrb::Model::Reference) ? @document.object(c) : c
+            c_obj = @document.resolve(c)
             c_obj == stream_obj
           end
         end

data/lib/pdfrb/content/shading/base.rb

@@ -31,7 +31,7 @@ module Pdfrb
         # @return [Symbol] resource name (e.g. :Sh1)
         def register_on(document, page)
           shading_obj = document.add(to_dict, type: Pdfrb::Model::Cos::Dictionary)
-          ref = Pdfrb::Model::Reference.new(shading_obj.oid, shading_obj.gen)
+          ref = shading_obj.ref
           resources = ensure_resources(document, page)
           shading_dict = resources.value[:Shading]
           if shading_dict.nil?

data/lib/pdfrb/content/tiling_pattern.rb

@@ -51,7 +51,7 @@ module Pdfrb
           yield canvas
         end
 
-        ref = Pdfrb::Model::Reference.new(pattern_stream.oid, pattern_stream.gen)
+        ref = pattern_stream.ref
         register_in_resources(document, page, ref)
       end
 

data/lib/pdfrb/digital_signature/signing.rb

@@ -43,12 +43,12 @@ module Pdfrb
 
         field = document.add(
           { Type: :Annot, Subtype: :Widget, FT: :Sig, T: "Signature1",
-            V: Pdfrb::Model::Reference.new(sig_dict.oid, sig_dict.gen),
+            V: sig_dict.ref,
             Rect: [0, 0, 0, 0] },
           type: Pdfrb::Model::Cos::Dictionary
         )
         catalog.value[:AcroForm][:Fields] <<
-          Pdfrb::Model::Reference.new(field.oid, field.gen)
+          field.ref
       end
 
       def serialize(document)

data/lib/pdfrb/document/annotations.rb

@@ -16,14 +16,14 @@ module Pdfrb
             Type: :Annot,
             Subtype: subtype,
             Rect: rect,
-            P: Pdfrb::Model::Reference.new(page.oid, page.gen),
+            P: page.ref,
             Contents: opts[:contents],
             F: opts[:flags] || 0
           }.compact,
           type: Pdfrb::Model::Type::Annotation
         )
         annots = (page.value[:Annots] ||= [])
-        annots << Pdfrb::Model::Reference.new(annot.oid, annot.gen)
+        annots << annot.ref
         annot
       end
 
@@ -45,7 +45,7 @@ module Pdfrb
             { Type: :Action, S: :URI, URI: uri },
             type: Pdfrb::Model::Type::Action
           )
-          annot.value[:A] = Pdfrb::Model::Reference.new(action.oid, action.gen)
+          annot.value[:A] = action.ref
         end
         annot
       end
@@ -55,7 +55,7 @@ module Pdfrb
         annot = document.add(
           {
             Type: :Annot, Subtype: :FreeText, Rect: rect,
-            P: Pdfrb::Model::Reference.new(page.oid, page.gen),
+            P: page.ref,
             Contents: contents
           },
           type: Pdfrb::Model::Type::FreeTextAnnotation
@@ -65,7 +65,7 @@ module Pdfrb
         da_parts << "#{color.join(' ')} rg" if color
         annot.value[:DA] = da_parts.join(" ") unless da_parts.empty?
         annots = (page.value[:Annots] ||= [])
-        annots << Pdfrb::Model::Reference.new(annot.oid, annot.gen)
+        annots << annot.ref
         annot
       end
 
@@ -75,13 +75,13 @@ module Pdfrb
           {
             Type: :Annot, Subtype: :Highlight,
             QuadPoints: quad_points,
-            P: Pdfrb::Model::Reference.new(page.oid, page.gen),
+            P: page.ref,
             Contents: contents
           }.compact,
           type: Pdfrb::Model::Type::HighlightAnnotation
         )
         annots = (page.value[:Annots] ||= [])
-        annots << Pdfrb::Model::Reference.new(annot.oid, annot.gen)
+        annots << annot.ref
         annot
       end
 
@@ -90,13 +90,13 @@ module Pdfrb
         annot = document.add(
           {
             Type: :Annot, Subtype: :Stamp, Rect: rect, Name: name,
-            P: Pdfrb::Model::Reference.new(page.oid, page.gen),
+            P: page.ref,
             Contents: contents
           }.compact,
           type: Pdfrb::Model::Type::StampAnnotation
         )
         annots = (page.value[:Annots] ||= [])
-        annots << Pdfrb::Model::Reference.new(annot.oid, annot.gen)
+        annots << annot.ref
         annot
       end
 
@@ -114,7 +114,7 @@ module Pdfrb
         return self unless annots
 
         annots.each do |ref|
-          a = ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          a = document.resolve(ref)
           yield a if a
         end
         self

data/lib/pdfrb/document/associated_files.rb

@@ -54,7 +54,7 @@ module Pdfrb
         filespec = document.files.add(data, name: filename,
                                             description: description,
                                             mime_type: mime_type)
-        ref = Pdfrb::Model::Reference.new(filespec.oid, filespec.gen)
+        ref = filespec.ref
         filespec.value[:AFRelationship] = relationship
         add_to_catalog(ref, relationship: relationship)
         ref
@@ -95,7 +95,7 @@ module Pdfrb
 
         refs = af.is_a?(::Array) ? af : [af]
         refs.filter_map do |ref|
-          obj = ref.is_a?(Pdfrb::Model::Reference) ? document.object(ref) : ref
+          obj = document.resolve(ref)
           obj if obj.is_a?(Pdfrb::Model::Cos::Dictionary)
         end
       end

data/lib/pdfrb/document/colors.rb

@@ -30,7 +30,7 @@ module Pdfrb
         stream.stream = profile.raw_data
         Pdfrb::Model::PdfArray.new([
                                      :ICCBased,
-                                     Pdfrb::Model::Reference.new(stream.oid, stream.gen),
+                                     stream.ref,
                                    ])
       end
 

data/lib/pdfrb/document/destinations.rb

@@ -79,7 +79,7 @@ module Pdfrb
         d = catalog.value[:Dests]
         return nil unless d
 
-        d.is_a?(Pdfrb::Model::Reference) ? document.object(d) : d
+        document.resolve(d)
       end
 
       def resolved_name_tree
@@ -93,7 +93,7 @@ module Pdfrb
         d = names.is_a?(Pdfrb::Model::Cos::Dictionary) ? names.value[:Dests] : names[:Dests]
         return nil unless d
 
-        d.is_a?(Pdfrb::Model::Reference) ? document.object(d) : d
+        document.resolve(d)
       end
 
       def lookup_in_name_tree(node, name)
@@ -107,7 +107,7 @@ module Pdfrb
           arr = node.value[:Kids]
           arr = arr.to_a if arr.is_a?(Pdfrb::Model::PdfArray)
           arr.each do |kid_ref|
-            kid = kid_ref.is_a?(Pdfrb::Model::Reference) ? document.object(kid_ref) : kid_ref
+            kid = document.resolve(kid_ref)
             result = lookup_in_name_tree(kid, name)
             return result if result
           end
@@ -130,7 +130,7 @@ module Pdfrb
           arr = node.value[:Kids]
           arr = arr.to_a if arr.is_a?(Pdfrb::Model::PdfArray)
           arr.each do |kid_ref|
-            kid = kid_ref.is_a?(Pdfrb::Model::Reference) ? document.object(kid_ref) : kid_ref
+            kid = document.resolve(kid_ref)
             each_name_tree_key(kid, &block)
           end
         elsif node.is_a?(Hash) && node[:Names]