hexapdf 0.26.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e41c50e1ddb3dc2b063e8a858ccf612fb069df46189d592dccec3778d58d738
-  data.tar.gz: cf62d302bd4728816c9920d09fcf27224004b6e70bc23b19d9a0f8b37dc27a3b
+  metadata.gz: '071877a8fbc781ac3d35f5432d6b7d83b80d5d7f981d3fd7110551e0e09bc18b'
+  data.tar.gz: a0ac1aa3be4d720561b9d58d197f547e9c3958fb0c252d8da27d9e9a356c0b7b
 SHA512:
-  metadata.gz: 83afdc841024adb116efbeb75bd34c2feb71042cbccb368e32b220634f3f8122f1a29bf07d8b7532836953fe1d3edb0733cb6c31fd50177a28bddea9bcdee2a2
-  data.tar.gz: fa3e26f634fc7e3e6461ade1555a063bffbf52c4e956d802b4bee5d01290bc2415571501b4afa083aaefd9f514a38a10fb10546418dbd5b7ef9bfbd121abd37f
+  metadata.gz: 7528b421de6360e09bf4caeb72caec3b71f317314c8e0389fca287ee00bfab0ee952d8cecced2df937ff2e8198655fe81ebd12a494fac94847ae28ca20169384
+  data.tar.gz: 52a0ab62632122772162fa1dbbb80e05b11956d187385c813f97f0a6c6c8b23c83f568cef2df81e93caf2ae558cda005ef0923de45f16d2c943cc9d86f92c868

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.26.1 - 2022-10-14
+
+### Changed
+
+* [HexaPDF::Serializer] to provide better error messages when encountering
+  unserializable objects
+
+### Fixed
+
+* [HexaPDF::Importer] to correctly expose previously mapped objects
+
+
 ## 0.26.0 - 2022-10-14
 
 ### Added

data/lib/hexapdf/importer.rb

@@ -117,7 +117,7 @@ module HexaPDF
       when HexaPDF::Object
         if object.type == :Catalog || object.type == :Pages
           @mapper[object.data] = nil
-        elsif (mapped_object = @mapper[object.data]) && !mapped_object.null?
+        elsif (mapped_object = @mapper[object.data]&.__getobj__) && !mapped_object.null?
           mapped_object
         else
           obj = object.dup

data/lib/hexapdf/serializer.rb

@@ -151,6 +151,16 @@ module HexaPDF
       @io = nil
     end
 
+    # Raises an error to provide better failure messages.
+    def serialize_basicobject(obj)
+      object_message = if @object.kind_of?(HexaPDF::Object)
+                         "#{obj} (part of #{@object.oid},#{@object.gen})"
+                       else
+                         obj.inspect
+                       end
+      raise HexaPDF::Error, "No serialization method for #{object_message}"
+    end
+
     # Serializes the +nil+ value.
     #
     # See: PDF1.7 s7.3.9

data/lib/hexapdf/version.rb

@@ -37,6 +37,6 @@
 module HexaPDF
 
   # The version of HexaPDF.
-  VERSION = '0.26.0'
+  VERSION = '0.26.1'
 
 end

data/test/hexapdf/test_importer.rb

@@ -78,6 +78,14 @@ describe HexaPDF::Importer do
       assert_equal(["one", "two"], @obj[:array])
     end
 
+    it "uses already mapped HexaPDF::Object instances instead of mapping them again" do
+      hash = @importer.import(@hash)
+      assert_kind_of(HexaPDF::Dictionary, hash)
+      obj = @importer.import(@obj)
+      assert_kind_of(HexaPDF::Dictionary, obj[:hash])
+      assert_same(hash, obj[:hash])
+    end
+
     it "duplicates the stream if it is a string" do
       src_obj = @source.add({}, stream: 'data')
       dst_obj = @importer.import(src_obj)

data/test/hexapdf/test_serializer.rb

@@ -31,6 +31,14 @@ describe HexaPDF::Serializer do
     assert_serialized("(test)", s)
   end
 
+  it "raises an error for unknown objects" do
+    obj = HexaPDF::Dictionary.new({x: 5, y: Object.new}, oid: 5, gen: 1)
+    error = assert_raises(HexaPDF::Error) { @serializer.serialize(obj) }
+    assert_match(/\(part of 5,1\)/, error.message)
+    error = assert_raises(HexaPDF::Error) { @serializer.serialize(Object.new) }
+    assert_match(/Object/, error.message)
+  end
+
   it "serializes nil" do
     assert_serialized("null", nil)
   end

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.26.0)>>
+      <</Producer(HexaPDF version 0.26.1)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.26.0)>>
+      <</Producer(HexaPDF version 0.26.1)>>
       endobj
       2 0 obj
       <</Length 10>>stream
@@ -206,7 +206,7 @@ describe HexaPDF::Writer do
       <</Type/Page/MediaBox[0 0 595 842]/Parent 2 0 R/Resources<<>>>>
       endobj
       5 0 obj
-      <</Producer(HexaPDF version 0.26.0)>>
+      <</Producer(HexaPDF version 0.26.1)>>
       endobj
       4 0 obj
       <</Root 1 0 R/Info 5 0 R/Size 6/Type/XRef/W[1 1 2]/Index[0 6]/Filter/FlateDecode/DecodeParms<</Columns 4/Predictor 12>>/Length 33>>stream

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.26.1
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
@@ -706,7 +706,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby