hexapdf 1.1.1 → 1.2.0

data/lib/hexapdf/xref_section.rb

@@ -113,9 +113,10 @@ module HexaPDF
 
     # Marks this XRefSection object as being the first cross-reference section in a PDF file.
     #
-    # This has the consequence that only a single sub-section is created.
+    # This has the consequence that only a single sub-section starting a zero is created.
     def mark_as_initial_section!
       @initial_section = true
+      add_free_entry(0, 65535)
     end
 
     # Adds an in-use entry to the cross-reference section.
@@ -161,9 +162,10 @@ module HexaPDF
       return to_enum(__method__) unless block_given?
 
       temp = []
-      oids.sort.each do |oid|
-        expected_next_oid = !temp.empty? && temp[-1].oid + 1
-        if expected_next_oid && expected_next_oid != oid
+      sorted_oids = oids.sort
+      expected_next_oid = sorted_oids[0]
+      sorted_oids.each do |oid|
+        if expected_next_oid != oid
           if @initial_section
             expected_next_oid.upto(oid - 1) do |free_oid|
               temp << self.class.free_entry(free_oid, 0)
@@ -174,6 +176,7 @@ module HexaPDF
           end
         end
         temp << self[oid]
+        expected_next_oid = oid + 1
       end
       yield(temp)
       self

data/test/hexapdf/content/test_graphics_state.rb

@@ -2,7 +2,6 @@
 
 require 'test_helper'
 require 'hexapdf/content/graphics_state'
-require 'ostruct'
 
 # Dummy class used as wrapper so that constant lookup works correctly
 class GraphicsStateWrapper < Minitest::Spec
@@ -149,8 +148,8 @@ class GraphicsStateWrapper < Minitest::Spec
     end
 
     it "uses the correct glyph to text space scaling" do
-      font = OpenStruct.new
-      font.glyph_scaling_factor = 0.002
+      font = Object.new
+      font.define_singleton_method(:glyph_scaling_factor) { 0.002 }
       @gs.font = font
       @gs.font_size = 10
       assert_equal(0.02, @gs.scaled_font_size)

data/test/hexapdf/content/test_operator.rb

@@ -4,7 +4,6 @@ require 'test_helper'
 require 'hexapdf/content/operator'
 require 'hexapdf/content/processor'
 require 'hexapdf/serializer'
-require 'ostruct'
 
 describe HexaPDF::Content::Operator::BaseOperator do
   before do
@@ -191,8 +190,8 @@ end
 
 describe_operator :SetGraphicsStateParameters, :gs do
   it "applies parameters from an ExtGState dictionary" do
-    font = OpenStruct.new
-    font.glyph_scaling_factor = 0.01
+    font = Object.new
+    font.define_singleton_method(:glyph_scaling_factor) { 0.01 }
     @processor.resources[:ExtGState] = {Name: {LW: 10, LC: 2, LJ: 2, ML: 2, D: [[3, 5], 2],
                                                RI: 2, SA: true, BM: :Multiply, CA: 0.5, ca: 0.5,
                                                AIS: true, TK: false, Font: [font, 10],
@@ -453,8 +452,8 @@ describe_operator :SetFontAndSize, :Tf do
       self[:Font] && self[:Font][name]
     end
 
-    font = OpenStruct.new
-    font.glyph_scaling_factor = 0.01
+    font = Object.new
+    font.define_singleton_method(:glyph_scaling_factor) { 0.01 }
     @processor.resources[:Font] = {F1: font}
     invoke(:F1, 10)
     assert_equal(@processor.resources.font(:F1), @processor.graphics_state.font)

data/test/hexapdf/digital_signature/test_cms_handler.rb

@@ -4,17 +4,16 @@ require 'digest'
 require 'test_helper'
 require_relative 'common'
 require 'hexapdf/digital_signature'
-require 'ostruct'
 
 describe HexaPDF::DigitalSignature::CMSHandler do
   before do
-    @data = 'Some data'
-    @dict = OpenStruct.new
-    @pkcs7 = OpenSSL::PKCS7.sign(CERTIFICATES.signer_certificate, CERTIFICATES.signer_key,
-                                 @data, [CERTIFICATES.ca_certificate],
-                                 OpenSSL::PKCS7::DETACHED)
-    @dict.contents = @pkcs7.to_der
-    @dict.signed_data = @data
+    @data = data = 'Some data'
+    @dict = Struct.new(:contents, :signed_data, :signature_type, :Reference, :M).new
+    @pkcs7 = pkcs7 = OpenSSL::PKCS7.sign(CERTIFICATES.signer_certificate, CERTIFICATES.signer_key,
+                                         @data, [CERTIFICATES.ca_certificate],
+                                         OpenSSL::PKCS7::DETACHED)
+    @dict.contents = pkcs7.to_der
+    @dict.signed_data = data
     @handler = HexaPDF::DigitalSignature::CMSHandler.new(@dict)
   end
 

data/test/hexapdf/digital_signature/test_handler.rb

@@ -4,7 +4,6 @@ require 'test_helper'
 require 'hexapdf/digital_signature'
 require 'hexapdf/document'
 require 'time'
-require 'ostruct'
 require 'openssl'
 
 describe HexaPDF::DigitalSignature::Handler do
@@ -33,7 +32,7 @@ describe HexaPDF::DigitalSignature::Handler do
 
   describe "store_verification_callback" do
     before do
-      @context = OpenStruct.new
+      @context = Struct.new(:error).new
     end
 
     it "can allow self-signed certificates" do
@@ -60,7 +59,7 @@ describe HexaPDF::DigitalSignature::Handler do
     ].each do |success, not_before, not_after|
       @result.messages.clear
       @handler.define_singleton_method(:signer_certificate) do
-        OpenStruct.new.tap do |struct|
+        Struct.new(:not_before, :not_after).new.tap do |struct|
           struct.not_before = Time.parse("2021-11-14 #{not_before}")
           struct.not_after = Time.parse("2021-11-14 #{not_after}")
         end

data/test/hexapdf/digital_signature/test_pkcs1_handler.rb

@@ -3,12 +3,11 @@
 require 'test_helper'
 require_relative 'common'
 require 'hexapdf/digital_signature'
-require 'ostruct'
 
 describe HexaPDF::DigitalSignature::PKCS1Handler do
   before do
     @data = 'Some data'
-    @dict = OpenStruct.new
+    @dict = Struct.new(:signed_data, :contents, :Cert, :Reference, :M).new
     @dict.signed_data = @data
     encoded_data = CERTIFICATES.signer_key.sign(OpenSSL::Digest.new('SHA1'), @data)
     @dict.contents = OpenSSL::ASN1::OctetString.new(encoded_data).to_der

data/test/hexapdf/document/test_annotations.rb

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+
+require 'test_helper'
+require 'hexapdf/document'
+
+describe HexaPDF::Document::Annotations do
+  before do
+    @doc = HexaPDF::Document.new
+    @page = @doc.pages.add
+    @annots = @doc.annotations
+  end
+
+  describe "create" do
+    it "fails if the type argument doesn't refer to an implemented method" do
+      assert_raises(ArgumentError) { @annots.create(:unknown, @page) }
+    end
+
+    it "delegates to the actual create_TYPE implementation" do
+      annot = @annots.create(:line, @page, start_point: [0, 0], end_point: [10, 10])
+      assert_equal(:Line, annot[:Subtype])
+    end
+  end
+
+  describe "create_line" do
+    it "creates an appropriate line annotation object" do
+      annot = @annots.create(:line, @page, start_point: [0, 5], end_point: [10, 15])
+      assert_equal(:Annot, annot[:Type])
+      assert_equal(:Line, annot[:Subtype])
+      assert_equal([0, 5, 10, 15], annot.line)
+      assert_equal(annot, @page[:Annots].first)
+    end
+  end
+end

data/test/hexapdf/font/test_true_type_wrapper.rb

@@ -209,6 +209,13 @@ describe HexaPDF::Font::TrueTypeWrapper do
                    dict[:Encoding].stream)
       assert_equal([glyph.id, [glyph.width]], dict[:DescendantFonts][0][:W].value)
     end
+
+    it "handles the case where the font is added but then not used and deleted" do
+      @doc.task(:optimize, compact: true)
+      assert(@font_wrapper.pdf_object.null?)
+      @doc.dispatch_message(:complete_objects)
+      assert(@font_wrapper.pdf_object.null?)
+    end
   end
 
   describe "font file embedding" do

data/test/hexapdf/font/test_type1_wrapper.rb

@@ -140,5 +140,12 @@ describe HexaPDF::Font::Type1Wrapper do
     it "makes sure that the PDF dictionaries are indirect" do
       assert(@times_wrapper.pdf_object.indirect?)
     end
+
+    it "handles the case where the font is added but then not used and deleted" do
+      @doc.task(:optimize, compact: true)
+      assert(@times_wrapper.pdf_object.null?)
+      @doc.dispatch_message(:complete_objects)
+      assert(@times_wrapper.pdf_object.null?)
+    end
   end
 end

data/test/hexapdf/task/test_optimize.rb

@@ -99,7 +99,7 @@ describe HexaPDF::Task::Optimize do
       objstm = @doc.add({}, type: HexaPDF::Type::ObjectStream)
       @doc.add({}, type: HexaPDF::Type::XRefStream)
       objstm.add_object(@doc.add({Type: :Test}))
-      @doc.write(io)
+      @doc.write(io, compact: false)
       io.rewind
       @doc = HexaPDF::Document.new(io: io)
     end

data/test/hexapdf/test_document.rb

@@ -54,7 +54,7 @@ describe HexaPDF::Document do
   describe "::open" do
     before do
       @file = Tempfile.new('hexapdf-document')
-      @io_doc.write(@file)
+      @io_doc.write(@file, compact: false)
       @file.close
     end
 
@@ -370,7 +370,7 @@ describe HexaPDF::Document do
     it "writes the document to a file" do
       file = Tempfile.new('hexapdf-write')
       file.close
-      @io_doc.write(file.path)
+      @io_doc.write(file.path, compact: false)
       HexaPDF::Document.open(file.path) do |doc|
         assert_equal(200, doc.object(2).value)
       end
@@ -422,10 +422,18 @@ describe HexaPDF::Document do
 
     it "allows optimizing the file by using object streams" do
       io = StringIO.new(''.b)
-      @io_doc.write(io, optimize: true)
+      @io_doc.write(io, optimize: true, compact: false)
       doc = HexaPDF::Document.new(io: io)
       assert_equal(2, doc.each.count {|o| o.type == :ObjStm })
     end
+
+    it "automatically compacts the file" do
+      io = StringIO.new(''.b)
+      @io_doc.write(io)
+      doc = HexaPDF::Document.new(io: io)
+      assert_equal(1, doc.revisions.count)
+      assert_equal(4, doc.each.count)
+    end
   end
 
   describe "version" do

data/test/hexapdf/test_stream.rb

@@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 
 require 'test_helper'
-require 'ostruct'
 require 'stringio'
 require 'tempfile'
 require 'hexapdf/configuration'
@@ -80,7 +79,7 @@ end
 
 describe HexaPDF::Stream do
   before do
-    @document = OpenStruct.new
+    @document = Struct.new(:config).new
     @document.config = HexaPDF::Configuration.with_defaults
     @document.instance_variable_set(:@version, '1.2')
     def (@document).unwrap(obj); obj; end

data/test/hexapdf/test_xref_section.rb

@@ -66,7 +66,7 @@ describe HexaPDF::XRefSection do
       @xref_section.add_in_use_entry(1, 0, 0)
       @xref_section.add_in_use_entry(2, 0, 0)
       result = @xref_section.each_subsection.map {|s| s.map {|e| [e.oid, e.type] }}
-      assert_equal([[[1, :in_use], [2, :in_use],
+      assert_equal([[[0, :free], [1, :in_use], [2, :in_use],
                      [3, :free], [4, :free], [5, :free],
                      [6, :in_use], [7, :in_use],
                      [8, :free],

data/test/hexapdf/type/acro_form/test_java_script_actions.rb

@@ -82,6 +82,20 @@ describe HexaPDF::Type::AcroForm::JavaScriptActions do
         assert_equal('1.234,57', value)
       end
 
+      it "works with the special Infinity and NaN values" do
+        @value = 'Infinity'
+        assert_format('2, 2, 0, 0, "", false', "Inf", "black")
+        @value = '-Infinity'
+        assert_format('2, 2, 0, 0, "", false', "-Inf", "black")
+        @value = 'Nan'
+        assert_format('2, 2, 0, 0, "", false', "NaN", "black")
+      end
+
+      it "works if the value is nil" do
+        @value = nil
+        assert_format('2, 2, 0, 0, "", false', "0,00", "black")
+      end
+
       it "does nothing to the value if the JavaScript method could not be determined " do
         assert_format('2, 3, 0, 0, " E", false, a', "1234567.898765", nil)
       end
@@ -244,6 +258,13 @@ describe HexaPDF::Type::AcroForm::JavaScriptActions do
         assert_calculation('SUM', [@field1, @field2], "30.54")
       end
 
+      it "works with the special values Infinity and NaN" do
+        @field1.field_value = "Infinity"
+        assert_calculation('SUM', [@field1, @field2], "Infinity")
+        @field1.field_value = "NaN"
+        assert_calculation('SUM', [@field1, @field2], "NaN")
+      end
+
       it "returns nil if a field cannot be resolved" do
         @action[:JS] = 'AFSimple_Calculate("SUM", ["unknown"]);'
         assert_nil(@klass.calculate(@form, @action))

data/test/hexapdf/type/acro_form/test_text_field.rb

@@ -130,9 +130,12 @@ describe HexaPDF::Type::AcroForm::TextField do
       assert_raises(HexaPDF::Error) { @field.field_value = 'test' }
     end
 
-    it "fails if the value exceeds the length set by /MaxLen" do
+    it "calls acro_form.text_field.on_max_len_exceeded  if the value exceeds the length set by /MaxLen" do
       @field[:MaxLen] = 5
       assert_raises(HexaPDF::Error) { @field.field_value = 'testdf' }
+      @doc.config['acro_form.text_field.on_max_len_exceeded'] = proc {|f, v| v }
+      @field.field_value = 'testdf'
+      assert_equal('testdf', @field[:V])
     end
   end
 
@@ -278,6 +281,9 @@ describe HexaPDF::Type::AcroForm::TextField do
       assert(@field.validate)
       @field[:MaxLen] = 2
       refute(@field.validate)
+      @doc.config['acro_form.text_field.on_max_len_exceeded'] = proc {|field, str| "Hello" }
+      assert(@field.validate)
+      assert_equal('Hello', @field[:V])
       @field[:V] = nil
       assert(@field.validate)
     end