hexapdf 0.9.3 → 0.10.0

data/lib/hexapdf/content/canvas.rb

@@ -1253,7 +1253,7 @@ module HexaPDF
       #   end
       #
       #   image = document.object(5)    # Object with oid=5 is an image XObject in this example
-      #   canvas.xobject(image, at: [100, 200], width: 200, heigth: 300)
+      #   canvas.xobject(image, at: [100, 200], width: 200, height: 300)
       #
       # See: PDF1.7 s8.8, s.8.10.1
       def xobject(obj, at:, width: nil, height: nil)

data/lib/hexapdf/dictionary.rb

@@ -284,7 +284,16 @@ module HexaPDF
 
         # Check the type of the field
         unless field.valid_object?(obj)
-          yield("Type of field #{name} is invalid: #{obj.class}", false)
+          msg = "Type of field #{name} is invalid: #{obj.class}"
+          if field.type.include?(String) && obj.kind_of?(Symbol)
+            yield(msg, true)
+            self[name] = obj.to_s
+          elsif field.type.include?(Symbol) && obj.kind_of?(String)
+            yield(msg, true)
+            self[name] = obj.intern
+          else
+            yield(msg, false)
+          end
         end
 
         # Check if field value needs to be (in)direct
@@ -304,4 +313,9 @@ module HexaPDF
 
   end
 
+  # :nodoc:
+  # Forward declaration of Stream to circumvent circular require problem
+  class Stream < Dictionary
+  end
+
 end

data/lib/hexapdf/dictionary_fields.rb

@@ -118,8 +118,7 @@ module HexaPDF
       # Returns the array with valid types for this field.
       def type
         return @type if @type_mapped
-        @type_mapped = true
-        @type.concat(@converters.map(&:additional_types).compact.flatten)
+        @type.concat(@converters.flat_map(&:additional_types).compact)
         @type.map! do |type|
           if type.kind_of?(Symbol)
             HexaPDF::GlobalConfiguration.constantize('object.type_map', type)
@@ -128,6 +127,7 @@ module HexaPDF
           end
         end
         @type.uniq!
+        @type_mapped = true
         @type
       end
 
@@ -191,8 +191,9 @@ module HexaPDF
       # Wraps the given data value in the PDF specific type class if it can be converted. Otherwise
       # returns +nil+.
       def self.convert(data, type, document)
-        return if data.kind_of?(type.first) || !(data.kind_of?(Hash) ||
-          data.kind_of?(HexaPDF::Dictionary))
+        return if data.kind_of?(type.first) ||
+          !(data.kind_of?(Hash) || data.kind_of?(HexaPDF::Dictionary)) ||
+          (type.first <= HexaPDF::Stream && (data.kind_of?(Hash) || data.data.stream.nil?))
         document.wrap(data, type: type.first)
       end
 

data/lib/hexapdf/document.rb

@@ -277,17 +277,22 @@ module HexaPDF
     # needed.
     #
     # The class of the returned object is always a subclass of HexaPDF::Object (or of
-    # HexaPDF::Stream if a +stream+ is given). Which subclass is used, depends on the values
-    # of the +type+ and +subtype+ options as well as on the 'object.type_map' and
-    # 'object.subtype_map' global configuration options:
+    # HexaPDF::Stream if a +stream+ is given). Which subclass is used, depends on the values of the
+    # +type+ and +subtype+ options as well as on the 'object.type_map' and 'object.subtype_map'
+    # global configuration options:
     #
-    # * First +type+ is used to try to determine the class. If it is already a Class object, it is
-    #   used, otherwise the type is looked up in 'object.type_map'.
+    # * First +type+ is used to try to determine the class. If it is not provided and if +obj+ is a
+    #   hash with a :Type field, the value of this field is used instead. If the resulting object is
+    #   already a Class object, it is used, otherwise the type is looked up in 'object.type_map'.
     #
     # * If +subtype+ is provided or can be determined because +obj+ is a hash with a :Subtype or :S
     #   field, the type and subtype together are used to look up a special subtype class in
     #   'object.subtype_map'.
     #
+    #   Additionally, if there is no +type+ but a +subtype+, all required fields of the subtype
+    #   class need to have values; otherwise the subtype class is not used. This is done to better
+    #   prevent invalid mappings when only partial knowledge (:Type key is missing) is available.
+    #
     # * If there is no valid class after the above steps, HexaPDF::Stream is used if a stream is
     #   given, HexaPDF::Dictionary if the given objecct is a hash or else HexaPDF::Object is used.
     #
@@ -330,7 +335,11 @@ module HexaPDF
         subtype ||= deref(data.value[:Subtype]) || deref(data.value[:S])
       end
       if subtype
-        klass = GlobalConfiguration.constantize('object.subtype_map', type, subtype) { klass }
+        sub_klass = GlobalConfiguration.constantize('object.subtype_map', type, subtype) { klass }
+        if type ||
+            sub_klass&.each_field&.none? {|name, field| field.required? && !data.value.key?(name) }
+          klass = sub_klass
+        end
       end
 
       klass ||= if data.stream

data/lib/hexapdf/encryption/security_handler.rb

@@ -257,7 +257,7 @@ module HexaPDF
 
         key = object_key(obj.oid, obj.gen, string_algorithm)
         each_string_in_object(obj.value) do |str|
-          next if str.empty?
+          next if str.empty? || (obj.type == :Sig && obj[:Contents].equal?(str))
           str.replace(string_algorithm.decrypt(key, str))
         end
 
@@ -275,7 +275,8 @@ module HexaPDF
       #
       # See: PDF1.7 s7.6.2
       def encrypt_string(str, obj)
-        return str if str.empty? || obj == document.trailer[:Encrypt] || obj.type == :XRef
+        return str if str.empty? || obj == document.trailer[:Encrypt] || obj.type == :XRef ||
+          (obj.type == :Sig && obj[:Contents].equal?(str))
 
         key = object_key(obj.oid, obj.gen, string_algorithm)
         string_algorithm.encrypt(key, str)

data/lib/hexapdf/font/encoding/mac_expert_encoding.rb

@@ -49,171 +49,171 @@ module HexaPDF
           super
           @encoding_name = :MacExpertEncoding
           @code_to_name = {
-            0276  => :AEsmall,
-            0207  => :Aacutesmall,
-            0211  => :Acircumflexsmall,
-            0047  => :Acutesmall,
-            0212  => :Adieresissmall,
-            0210  => :Agravesmall,
-            0214  => :Aringsmall,
-            0141  => :Asmall,
-            0213  => :Atildesmall,
-            0363  => :Brevesmall,
-            0142  => :Bsmall,
-            0256  => :Caronsmall,
-            0215  => :Ccedillasmall,
-            0311  => :Cedillasmall,
-            0136  => :Circumflexsmall,
-            0143  => :Csmall,
-            0254  => :Dieresissmall,
-            0372  => :Dotaccentsmall,
-            0144  => :Dsmall,
-            0216  => :Eacutesmall,
-            0220  => :Ecircumflexsmall,
-            0221  => :Edieresissmall,
-            0217  => :Egravesmall,
-            0145  => :Esmall,
-            0104  => :Ethsmall,
-            0146  => :Fsmall,
-            0140  => :Gravesmall,
-            0147  => :Gsmall,
-            0150  => :Hsmall,
-            0042  => :Hungarumlautsmall,
-            0222  => :Iacutesmall,
-            0224  => :Icircumflexsmall,
-            0225  => :Idieresissmall,
-            0223  => :Igravesmall,
-            0151  => :Ismall,
-            0152  => :Jsmall,
-            0153  => :Ksmall,
-            0302  => :Lslashsmall,
-            0154  => :Lsmall,
-            0364  => :Macronsmall,
-            0155  => :Msmall,
-            0156  => :Nsmall,
-            0226  => :Ntildesmall,
-            0317  => :OEsmall,
-            0227  => :Oacutesmall,
-            0231  => :Ocircumflexsmall,
-            0232  => :Odieresissmall,
-            0362  => :Ogoneksmall,
-            0230  => :Ogravesmall,
-            0277  => :Oslashsmall,
-            0157  => :Osmall,
-            0233  => :Otildesmall,
-            0160  => :Psmall,
-            0161  => :Qsmall,
-            0373  => :Ringsmall,
-            0162  => :Rsmall,
-            0247  => :Scaronsmall,
-            0163  => :Ssmall,
-            0271  => :Thornsmall,
-            0176  => :Tildesmall,
-            0164  => :Tsmall,
-            0234  => :Uacutesmall,
-            0236  => :Ucircumflexsmall,
-            0237  => :Udieresissmall,
-            0235  => :Ugravesmall,
-            0165  => :Usmall,
-            0166  => :Vsmall,
-            0167  => :Wsmall,
-            0170  => :Xsmall,
-            0264  => :Yacutesmall,
-            0330  => :Ydieresissmall,
-            0171  => :Ysmall,
-            0275  => :Zcaronsmall,
-            0172  => :Zsmall,
-            0046  => :ampersandsmall,
-            0201  => :asuperior,
-            0365  => :bsuperior,
-            0251  => :centinferior,
-            0043  => :centoldstyle,
-            0202  => :centsuperior,
-            0072  => :colon,
-            0173  => :colonmonetary,
-            0054  => :comma,
-            0262  => :commainferior,
-            0370  => :commasuperior,
-            0266  => :dollarinferior,
-            0044  => :dollaroldstyle,
-            0045  => :dollarsuperior,
-            0353  => :dsuperior,
-            0245  => :eightinferior,
-            0070  => :eightoldstyle,
-            0241  => :eightsuperior,
-            0344  => :esuperior,
-            0326  => :exclamdownsmall,
-            0041  => :exclamsmall,
-            0126  => :ff,
-            0131  => :ffi,
-            0132  => :ffl,
-            0127  => :fi,
-            0320  => :figuredash,
-            0114  => :fiveeighths,
-            0260  => :fiveinferior,
-            0065  => :fiveoldstyle,
-            0336  => :fivesuperior,
-            0130  => :fl,
-            0242  => :fourinferior,
-            0064  => :fouroldstyle,
-            0335  => :foursuperior,
-            0057  => :fraction,
-            0055  => :hyphen,
-            0137  => :hypheninferior,
-            0321  => :hyphensuperior,
-            0351  => :isuperior,
-            0361  => :lsuperior,
-            0367  => :msuperior,
-            0273  => :nineinferior,
-            0071  => :nineoldstyle,
-            0341  => :ninesuperior,
-            0366  => :nsuperior,
-            0053  => :onedotenleader,
-            0112  => :oneeighth,
-            0174  => :onefitted,
-            0110  => :onehalf,
-            0301  => :oneinferior,
-            0061  => :oneoldstyle,
-            0107  => :onequarter,
-            0332  => :onesuperior,
-            0116  => :onethird,
-            0257  => :osuperior,
-            0133  => :parenleftinferior,
-            0050  => :parenleftsuperior,
-            0135  => :parenrightinferior,
-            0051  => :parenrightsuperior,
-            0056  => :period,
-            0263  => :periodinferior,
-            0371  => :periodsuperior,
-            0300  => :questiondownsmall,
-            0077  => :questionsmall,
-            0345  => :rsuperior,
-            0175  => :rupiah,
-            0073  => :semicolon,
-            0115  => :seveneighths,
-            0246  => :seveninferior,
-            0067  => :sevenoldstyle,
-            0340  => :sevensuperior,
-            0244  => :sixinferior,
-            0066  => :sixoldstyle,
-            0337  => :sixsuperior,
-            0040  => :space,
-            0352  => :ssuperior,
-            0113  => :threeeighths,
-            0243  => :threeinferior,
-            0063  => :threeoldstyle,
-            0111  => :threequarters,
-            0075  => :threequartersemdash,
-            0334  => :threesuperior,
-            0346  => :tsuperior,
-            0052  => :twodotenleader,
-            0252  => :twoinferior,
-            0062  => :twooldstyle,
-            0333  => :twosuperior,
-            0117  => :twothirds,
-            0274  => :zeroinferior,
-            0060  => :zerooldstyle,
-            0342  => :zerosuperior,
+            0276 => :AEsmall,
+            0207 => :Aacutesmall,
+            0211 => :Acircumflexsmall,
+            0047 => :Acutesmall,
+            0212 => :Adieresissmall,
+            0210 => :Agravesmall,
+            0214 => :Aringsmall,
+            0141 => :Asmall,
+            0213 => :Atildesmall,
+            0363 => :Brevesmall,
+            0142 => :Bsmall,
+            0256 => :Caronsmall,
+            0215 => :Ccedillasmall,
+            0311 => :Cedillasmall,
+            0136 => :Circumflexsmall,
+            0143 => :Csmall,
+            0254 => :Dieresissmall,
+            0372 => :Dotaccentsmall,
+            0144 => :Dsmall,
+            0216 => :Eacutesmall,
+            0220 => :Ecircumflexsmall,
+            0221 => :Edieresissmall,
+            0217 => :Egravesmall,
+            0145 => :Esmall,
+            0104 => :Ethsmall,
+            0146 => :Fsmall,
+            0140 => :Gravesmall,
+            0147 => :Gsmall,
+            0150 => :Hsmall,
+            0042 => :Hungarumlautsmall,
+            0222 => :Iacutesmall,
+            0224 => :Icircumflexsmall,
+            0225 => :Idieresissmall,
+            0223 => :Igravesmall,
+            0151 => :Ismall,
+            0152 => :Jsmall,
+            0153 => :Ksmall,
+            0302 => :Lslashsmall,
+            0154 => :Lsmall,
+            0364 => :Macronsmall,
+            0155 => :Msmall,
+            0156 => :Nsmall,
+            0226 => :Ntildesmall,
+            0317 => :OEsmall,
+            0227 => :Oacutesmall,
+            0231 => :Ocircumflexsmall,
+            0232 => :Odieresissmall,
+            0362 => :Ogoneksmall,
+            0230 => :Ogravesmall,
+            0277 => :Oslashsmall,
+            0157 => :Osmall,
+            0233 => :Otildesmall,
+            0160 => :Psmall,
+            0161 => :Qsmall,
+            0373 => :Ringsmall,
+            0162 => :Rsmall,
+            0247 => :Scaronsmall,
+            0163 => :Ssmall,
+            0271 => :Thornsmall,
+            0176 => :Tildesmall,
+            0164 => :Tsmall,
+            0234 => :Uacutesmall,
+            0236 => :Ucircumflexsmall,
+            0237 => :Udieresissmall,
+            0235 => :Ugravesmall,
+            0165 => :Usmall,
+            0166 => :Vsmall,
+            0167 => :Wsmall,
+            0170 => :Xsmall,
+            0264 => :Yacutesmall,
+            0330 => :Ydieresissmall,
+            0171 => :Ysmall,
+            0275 => :Zcaronsmall,
+            0172 => :Zsmall,
+            0046 => :ampersandsmall,
+            0201 => :asuperior,
+            0365 => :bsuperior,
+            0251 => :centinferior,
+            0043 => :centoldstyle,
+            0202 => :centsuperior,
+            0072 => :colon,
+            0173 => :colonmonetary,
+            0054 => :comma,
+            0262 => :commainferior,
+            0370 => :commasuperior,
+            0266 => :dollarinferior,
+            0044 => :dollaroldstyle,
+            0045 => :dollarsuperior,
+            0353 => :dsuperior,
+            0245 => :eightinferior,
+            0070 => :eightoldstyle,
+            0241 => :eightsuperior,
+            0344 => :esuperior,
+            0326 => :exclamdownsmall,
+            0041 => :exclamsmall,
+            0126 => :ff,
+            0131 => :ffi,
+            0132 => :ffl,
+            0127 => :fi,
+            0320 => :figuredash,
+            0114 => :fiveeighths,
+            0260 => :fiveinferior,
+            0065 => :fiveoldstyle,
+            0336 => :fivesuperior,
+            0130 => :fl,
+            0242 => :fourinferior,
+            0064 => :fouroldstyle,
+            0335 => :foursuperior,
+            0057 => :fraction,
+            0055 => :hyphen,
+            0137 => :hypheninferior,
+            0321 => :hyphensuperior,
+            0351 => :isuperior,
+            0361 => :lsuperior,
+            0367 => :msuperior,
+            0273 => :nineinferior,
+            0071 => :nineoldstyle,
+            0341 => :ninesuperior,
+            0366 => :nsuperior,
+            0053 => :onedotenleader,
+            0112 => :oneeighth,
+            0174 => :onefitted,
+            0110 => :onehalf,
+            0301 => :oneinferior,
+            0061 => :oneoldstyle,
+            0107 => :onequarter,
+            0332 => :onesuperior,
+            0116 => :onethird,
+            0257 => :osuperior,
+            0133 => :parenleftinferior,
+            0050 => :parenleftsuperior,
+            0135 => :parenrightinferior,
+            0051 => :parenrightsuperior,
+            0056 => :period,
+            0263 => :periodinferior,
+            0371 => :periodsuperior,
+            0300 => :questiondownsmall,
+            0077 => :questionsmall,
+            0345 => :rsuperior,
+            0175 => :rupiah,
+            0073 => :semicolon,
+            0115 => :seveneighths,
+            0246 => :seveninferior,
+            0067 => :sevenoldstyle,
+            0340 => :sevensuperior,
+            0244 => :sixinferior,
+            0066 => :sixoldstyle,
+            0337 => :sixsuperior,
+            0040 => :space,
+            0352 => :ssuperior,
+            0113 => :threeeighths,
+            0243 => :threeinferior,
+            0063 => :threeoldstyle,
+            0111 => :threequarters,
+            0075 => :threequartersemdash,
+            0334 => :threesuperior,
+            0346 => :tsuperior,
+            0052 => :twodotenleader,
+            0252 => :twoinferior,
+            0062 => :twooldstyle,
+            0333 => :twosuperior,
+            0117 => :twothirds,
+            0274 => :zeroinferior,
+            0060 => :zerooldstyle,
+            0342 => :zerosuperior,
           }
         end