hexapdf 0.9.3 → 0.10.0

data/test/hexapdf/test_dictionary_fields.rb

@@ -3,6 +3,7 @@
 require 'test_helper'
 require 'hexapdf/dictionary_fields'
 require 'hexapdf/dictionary'
+require 'hexapdf/stream'
 require 'hexapdf/type'
 
 describe HexaPDF::DictionaryFields do
@@ -74,6 +75,20 @@ describe HexaPDF::DictionaryFields do
       @doc.verify
     end
 
+    it "allows conversion from an HexaPDF::Dictionary to a Stream if stream data is set" do
+      @field = self.class::Field.new(HexaPDF::Stream)
+      @doc.expect(:wrap, :data, [HexaPDF::Dictionary, Hash])
+      data = HexaPDF::PDFData.new({}, 0, 0, "")
+      @field.convert(HexaPDF::Dictionary.new(data), @doc)
+      @doc.verify
+    end
+
+    it "doesn't allow conversion to a Stream subclass from Hash or Dictionary" do
+      @field = self.class::Field.new(HexaPDF::Stream)
+      refute(@field.convert({}, @doc))
+      refute(@field.convert(HexaPDF::Dictionary.new(Test: :value), @doc))
+    end
+
     it "doesn't allow conversion from nil" do
       refute(@field.convert(nil, @doc))
     end

data/test/hexapdf/test_document.rb

@@ -267,6 +267,7 @@ describe HexaPDF::Document do
       @myclass = Class.new(HexaPDF::Dictionary)
       @myclass.define_type(:MyClass)
       @myclass2 = Class.new(HexaPDF::Dictionary)
+      @myclass2.define_field(:Test, type: String, required: true)
       HexaPDF::GlobalConfiguration['object.type_map'][:MyClass] = @myclass
       HexaPDF::GlobalConfiguration['object.subtype_map'][nil][:Global] = @myclass2
       HexaPDF::GlobalConfiguration['object.subtype_map'][:MyClass] = {TheSecond: @myclass2}
@@ -328,14 +329,16 @@ describe HexaPDF::Document do
     it "uses the type/subtype information in the hash that should be wrapped" do
       assert_kind_of(@myclass, @doc.wrap(Type: :MyClass))
       refute_kind_of(@myclass2, @doc.wrap(Subtype: :TheSecond))
-      assert_kind_of(@myclass2, @doc.wrap(Subtype: :Global))
+      refute_kind_of(@myclass2, @doc.wrap(Subtype: :Global))
+      assert_kind_of(@myclass2, @doc.wrap(Subtype: :Global, Test: "true"))
       assert_kind_of(@myclass2, @doc.wrap(Type: :MyClass, S: :TheSecond))
       assert_kind_of(@myclass, @doc.wrap(Type: :MyClass, Subtype: :TheThird))
     end
 
     it "respects the given type/subtype arguments" do
       assert_kind_of(@myclass, @doc.wrap({Type: :Other}, type: :MyClass))
-      assert_kind_of(@myclass2, @doc.wrap({Subtype: :Other}, subtype: :Global))
+      refute_kind_of(@myclass2, @doc.wrap({Subtype: :Other}, subtype: :Global))
+      assert_kind_of(@myclass2, @doc.wrap({Subtype: :Other, Test: "true"}, subtype: :Global))
       assert_kind_of(@myclass2, @doc.wrap({Type: :Other, Subtype: :Other},
                                           type: :MyClass, subtype: :TheSecond))
       assert_kind_of(@myclass2, @doc.wrap({Subtype: :TheSecond}, type: @myclass))

data/test/hexapdf/test_reference.rb

@@ -40,6 +40,10 @@ describe HexaPDF::Reference do
     refute(h.key?(HexaPDF::Reference.new(5, 8)))
   end
 
+  it "shows the PDF serialization as string representation " do
+    assert_equal("5 7 R", HexaPDF::Reference.new(5, 7).to_s)
+  end
+
   it "shows oid and gen on inspection" do
     assert_match(/\[5, 7\]/, HexaPDF::Reference.new(5, 7).inspect)
   end

data/test/hexapdf/test_revision.rb

@@ -63,6 +63,18 @@ describe HexaPDF::Revision do
     end
   end
 
+  describe "xref" do
+    it "returns the xref structure" do
+      assert_equal(@xref_section[2, 0], @rev.xref(HexaPDF::Reference.new(2, 0)))
+      assert_equal(@xref_section[2, 0], @rev.xref(2))
+    end
+
+    it "returns nil if no xref entry is found" do
+      assert_nil(@rev.xref(@ref))
+      assert_nil(@rev.xref(1))
+    end
+  end
+
   describe "object" do
     it "returns nil if no object is found" do
       assert_nil(@rev.object(@ref))

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.9.3)>>
+      <</Producer(HexaPDF version 0.10.0)>>
       endobj
       xref
       3 1
@@ -48,7 +48,7 @@ describe HexaPDF::Writer do
       trailer
       <</Prev 219/Size 4/Root<</Type/Catalog>>/Info 3 0 R>>
       startxref
-      348
+      349
       %%EOF
     EOF
 
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.9.3)>>
+      <</Producer(HexaPDF version 0.10.0)>>
       endobj
       2 0 obj
       <</Length 10>>stream
@@ -81,11 +81,11 @@ describe HexaPDF::Writer do
       endobj
       4 0 obj
       <</Size 7/Prev 141/Root<</Type/Catalog>>/Info 6 0 R/Type/XRef/W[1 2 2]/Index[2 1 4 1 6 1]/Filter/FlateDecode/DecodeParms<</Columns 5/Predictor 12>>/Length 22>>stream
-      x\xDAcbdlc``b`\xB0\x04\x93\x93\x19\x18\x00\f\x0F\x01[
+      x\xDAcbdlg``b`\xB0\x04\x93\x93\x18\x18\x00\f\e\x01[
       endstream
       endobj
       startxref
-      447
+      448
       %%EOF
     EOF
   end

data/test/hexapdf/test_xref_section.rb

@@ -3,6 +3,17 @@
 require 'test_helper'
 require 'hexapdf/xref_section'
 
+describe HexaPDF::XRefSection::Entry do
+  it "can describe itself" do
+    free = HexaPDF::XRefSection::Entry.new(:free, 1, 2)
+    normal = HexaPDF::XRefSection::Entry.new(:in_use, 1, 2, 10)
+    compressed = HexaPDF::XRefSection::Entry.new(:compressed, 1, 0, 2, 10)
+    assert_match(/1,2 type=free/, free.to_s)
+    assert_match(/1,2 type=normal/, normal.to_s)
+    assert_match(/1,0 type=compressed/, compressed.to_s)
+  end
+end
+
 describe HexaPDF::XRefSection do
   before do
     @xref_section = HexaPDF::XRefSection.new

data/test/hexapdf/type/test_form.rb

@@ -8,7 +8,7 @@ require 'hexapdf/type/form'
 describe HexaPDF::Type::Form do
   before do
     @doc = HexaPDF::Document.new
-    @form = @doc.wrap({}, subtype: :Form)
+    @form = @doc.wrap({}, type: :XObject, subtype: :Form)
   end
 
   describe "box" do

data/test/hexapdf/type/test_image.rb

@@ -12,19 +12,19 @@ describe HexaPDF::Type::Image do
   end
 
   it "returns the width of the image" do
-    @image = @doc.wrap(Subtype: :Image, Width: 10)
+    @image = @doc.wrap(Type: :XObject, Subtype: :Image, Width: 10)
     assert_equal(10, @image.width)
   end
 
   it "returns the height of the image" do
-    @image = @doc.wrap(Subtype: :Image, Height: 10)
+    @image = @doc.wrap(Type: :XObject, Subtype: :Image, Height: 10)
     assert_equal(10, @image.height)
   end
 
   describe "info" do
     before do
-      @image = @doc.wrap(Subtype: :Image, Width: 10, Height: 5, ColorSpace: :DeviceRGB,
-                         BitsPerComponent: 4)
+      @image = @doc.wrap(Type: :XObject, Subtype: :Image, Width: 10, Height: 5,
+                         ColorSpace: :DeviceRGB, BitsPerComponent: 4)
     end
 
     it "uses the Width, Height and BitsPerComponent values" do
@@ -131,18 +131,24 @@ describe HexaPDF::Type::Image do
       @file.unlink
     end
 
-    `pngcheck 2>&1`
-    if $?.exitstatus != 0
-      warn("Skipping PNG output validity check because pngcheck executable is missing")
-      PNG_CHECK_AVAILABLE = false
-    else
-      PNG_CHECK_AVAILABLE = true
-    end
+    `which pngcheck 2>&1`
+    PNG_CHECK_AVAILABLE = $?.exitstatus == 0
+
+    `which pngtopnm 2>&1`
+    PNG_COMPARE_AVAILABLE = $?.exitstatus == 0
 
-    def assert_valid_png(filename)
-      return unless PNG_CHECK_AVAILABLE
-      result = `pngcheck -q #{filename}`
-      assert(result.empty?, "pngcheck error: #{result}")
+    def assert_valid_png(filename, original = nil)
+      if PNG_CHECK_AVAILABLE
+        result = `pngcheck -q #{filename}`
+        assert(result.empty?, "pngcheck error: #{result}")
+      else
+        skip("Skipping PNG output validity check because pngcheck executable is missing")
+      end
+      if PNG_COMPARE_AVAILABLE
+        assert_equal(`pngtopnm #{original}`, `pngtopnm #{filename}`) if original
+      else
+        skip("Skipping PNG output comparison check because pngtopnm executable is missing")
+      end
     end
 
     it "can write to an IO" do
@@ -179,8 +185,11 @@ describe HexaPDF::Type::Image do
       it "writes #{File.basename(png_file)} correctly as PNG file" do
         image = @doc.images.add(png_file)
         image.write(@file.path)
+        assert_valid_png(@file.path, png_file)
 
-        assert_valid_png(@file.path)
+        image.delete(:DecodeParms) # force re-encoding of stream
+        image.write(@file.path)
+        assert_valid_png(@file.path, png_file)
 
         new_image = @doc.images.add(@file.path)
 
@@ -208,7 +217,7 @@ describe HexaPDF::Type::Image do
     end
 
     it "works for greyscale indexed images" do
-      image = @doc.add(Subtype: :Image, Width: 2, Height: 2, BitsPerComponent: 2,
+      image = @doc.add(Type: :XObject, Subtype: :Image, Width: 2, Height: 2, BitsPerComponent: 2,
                        ColorSpace: [:Indexed, :DeviceGray, 3, "\x00\x40\x80\xFF".b])
       image.stream = HexaPDF::StreamData.new(filter: :ASCIIHexDecode) { "10 B0".b }
       image.write(@file.path)
@@ -227,13 +236,13 @@ describe HexaPDF::Type::Image do
     end
 
     it "fails if an unsupported colorspace is used" do
-      image = @doc.add(Subtype: :Image, Width: 1, Height: 1, BitsPerComponent: 8,
+      image = @doc.add(Type: :XObject, Subtype: :Image, Width: 1, Height: 1, BitsPerComponent: 8,
                        ColorSpace: :ICCBased)
       assert_raises(HexaPDF::Error) { image.write(@file) }
     end
 
     it "fails if an indexed image with an unsupported colorspace is used" do
-      image = @doc.add(Subtype: :Image, Width: 1, Height: 1, BitsPerComponent: 8,
+      image = @doc.add(Type: :XObject, Subtype: :Image, Width: 1, Height: 1, BitsPerComponent: 8,
                        ColorSpace: [:Indexed, :ICCBased, 0, "0"])
       assert_raises(HexaPDF::Error) { image.write(@file) }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
@@ -436,6 +436,7 @@ files:
 - test/data/images/truecolour-alpha-8bit.png
 - test/data/images/truecolour-gama-chrm-8bit.png
 - test/data/images/truecolour-srgb-8bit.png
+- test/data/images/ycck.jpg
 - test/data/minimal.pdf
 - test/data/standard-security-handler/README
 - test/data/standard-security-handler/bothpwd-aes-128bit-V4.pdf