hexapdf 0.6.0 → 0.7.0

data/lib/hexapdf/type/annotations.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/type/annotations/link.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/type/annotations/markup_annotation.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/type/annotations/text.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/type/catalog.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as
@@ -48,7 +48,7 @@ module HexaPDF
 
       define_type :Catalog
 
-      define_field :Type,              type: Symbol,     required: true, default: self.type
+      define_field :Type,              type: Symbol,     required: true, default: type
       define_field :Version,           type: Symbol,     version: '1.4'
       define_field :Extensions,        type: Dictionary, version: '1.7'
       # Pages field is required but this is handled in #perform_validation
@@ -99,7 +99,7 @@ module HexaPDF
         unless key?(:Pages)
           yield("A PDF document needs a page tree", true)
           value[:Pages] = document.add(Type: :Pages)
-          value[:Pages].validate {|msg, correctable| yield(msg, correctable)}
+          value[:Pages].validate {|msg, correctable| yield(msg, correctable) }
         end
       end
 

data/lib/hexapdf/type/cid_font.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as
@@ -51,7 +51,6 @@ module HexaPDF
       define_field :DW2,             type: Array, default: [880, -1100]
       define_field :W2,              type: Array
 
-
       # Returns the unscaled width of the given CID in glyph units, or 0 if the width for the CID is
       # missing.
       #
@@ -101,11 +100,11 @@ module HexaPDF
             entry = array[index]
             value = array[index + 1]
             if value.kind_of?(Array)
-              value.each_with_index {|width, i| result[entry + i] = width}
+              value.each_with_index {|width, i| result[entry + i] = width }
               index += 2
             else
               width = array[index + 2]
-              entry.upto(value) {|cid| result[cid] = width}
+              entry.upto(value) {|cid| result[cid] = width }
               index += 3
             end
           end

data/lib/hexapdf/type/embedded_file.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as
@@ -72,7 +72,7 @@ module HexaPDF
 
       define_type :EmbeddedFile
 
-      define_field :Type,    type: Symbol, default: self.type, version: '1.3'
+      define_field :Type,    type: Symbol, default: type, version: '1.3'
       define_field :Subtype, type: Symbol
       define_field :Params,  type: :XXEmbeddedFileParameters
 

data/lib/hexapdf/type/file_specification.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as
@@ -75,7 +75,7 @@ module HexaPDF
 
       define_type :Filespec
 
-      define_field :Type, type: Symbol, default: self.type, required: true
+      define_field :Type, type: Symbol, default: type, required: true
       define_field :FS,   type: Symbol
       define_field :F,    type: PDFByteString
       define_field :UF,   type: String, version: '1.7'
@@ -89,7 +89,6 @@ module HexaPDF
       define_field :Desc, type: String, version: '1.6'
       define_field :CI,   type: Dictionary, version: '1.7'
 
-
       # Returns +true+ if this file specification references an URL and not a file.
       def url?
         self[:FS] == :URL
@@ -130,7 +129,7 @@ module HexaPDF
         begin
           URI(url)
         rescue URI::InvalidURIError => e
-          raise HexaPDF::Error.new(e)
+          raise HexaPDF::Error, e
         end
         self.path = url
         self[:FS] = :URL
@@ -214,11 +213,11 @@ module HexaPDF
       # in the EmbeddedFiles name tree is also deleted.
       def unembed
         return unless key?(:EF)
-        self[:EF].each {|_key, ef_stream| document.delete(ef_stream)}
+        self[:EF].each {|_, ef_stream| document.delete(ef_stream) }
 
         if document.catalog.key?(:Names) && document.catalog[:Names].key?(:EmbeddedFiles)
           tree = document.catalog[:Names][:EmbeddedFiles]
-          tree.each_entry.find_all {|_, spec| document.deref(spec) == self}.each do |name, _|
+          tree.each_entry.find_all {|_, spec| document.deref(spec) == self }.each do |(name, _)|
             tree.delete_entry(name)
           end
         end

data/lib/hexapdf/type/font.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as
@@ -44,7 +44,7 @@ module HexaPDF
 
       define_type :Font
 
-      define_field :Type, type: Symbol, required: true, default: self.type
+      define_field :Type, type: Symbol, required: true, default: type
       define_field :BaseFont, type: Symbol, required: true
       define_field :ToUnicode, type: Stream, version: '1.2'
 
@@ -56,7 +56,7 @@ module HexaPDF
       # Returns the UTF-8 string for the given character code, or calls the configuration option
       # 'font.on_missing_unicode_mapping' if no mapping was found.
       def to_utf8(code)
-        to_unicode_cmap && to_unicode_cmap.to_unicode(code) || missing_unicode_mapping(code)
+        to_unicode_cmap&.to_unicode(code) || missing_unicode_mapping(code)
       end
 
       # Returns the bounding box of the font or +nil+ if it is not found.

data/lib/hexapdf/type/font_descriptor.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as
@@ -48,7 +48,7 @@ module HexaPDF
 
       define_type :FontDescriptor
 
-      define_field :Type,         type: Symbol, required: true, default: self.type
+      define_field :Type,         type: Symbol, required: true, default: type
       define_field :FontName,     type: Symbol, required: true
       define_field :FontFamily,   type: PDFByteString, version: '1.5'
       define_field :FontStretch,  type: Symbol, version: '1.5'
@@ -76,7 +76,6 @@ module HexaPDF
       define_field :FD,           type: Dictionary
       define_field :CIDSet,       type: Stream
 
-
       bit_field(:raw_flags, {fixed_pitch: 0, serif: 1, symbolic: 2, script: 3, nonsymbolic: 5,
                              italic: 6, all_cap: 16, small_cap: 17, force_bold: 18},
                 lister: "flags", getter: "flagged?", setter: "flag")

data/lib/hexapdf/type/font_simple.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as
@@ -61,15 +61,12 @@ module HexaPDF
             encoding = encoding_from_font if encoding.nil?
             encoding
           when HexaPDF::Dictionary, Hash
-            encoding = val[:BaseEncoding]
-            encoding = HexaPDF::Font::Encoding.for_name(encoding) if encoding
-            unless encoding
-              if embedded? || symbolic?
-                encoding = encoding_from_font
-              else
-                encoding = HexaPDF::Font::Encoding.for_name(:StandardEncoding)
-              end
-            end
+            encoding = val[:BaseEncoding] && HexaPDF::Font::Encoding.for_name(val[:BaseEncoding])
+            encoding ||= if embedded? || symbolic?
+                           encoding_from_font
+                         else
+                           HexaPDF::Font::Encoding.for_name(:StandardEncoding)
+                         end
             encoding = difference_encoding(encoding, val[:Differences]) if val.key?(:Differences)
             encoding
           when nil
@@ -88,16 +85,15 @@ module HexaPDF
       # Returns the UTF-8 string for the given character code, or calls the configuration option
       # 'font.on_missing_unicode_mapping' if no mapping was found.
       def to_utf8(code)
-        (to_unicode_cmap && to_unicode_cmap.to_unicode(code)) ||
-          encoding.unicode(code) || missing_unicode_mapping(code)
+        to_unicode_cmap&.to_unicode(code) || encoding.unicode(code) || missing_unicode_mapping(code)
       end
 
       # Returns the unscaled width of the given code point in glyph units, or 0 if the width for
       # the code point is missing.
       def width(code)
         widths = self[:Widths]
-        first_char = self[:FirstChar] || -1
-        last_char = self[:LastChar] || -1
+        first_char = self[:FirstChar]
+        last_char = self[:LastChar]
 
         if widths && code >= first_char && code <= last_char
           widths[code - first_char]
@@ -116,7 +112,7 @@ module HexaPDF
       # Returns +true+ if the font is a symbolic font, +false+ if it is not, and +nil+ if it is
       # not known.
       def symbolic?
-        self[:FontDescriptor] && self[:FontDescriptor].flagged?(:symbolic) || nil
+        self[:FontDescriptor]&.flagged?(:symbolic)
       end
 
       # Returns whether word spacing is applicable when using this font.

data/lib/hexapdf/type/font_true_type.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as

data/lib/hexapdf/type/font_type0.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as
@@ -72,8 +72,8 @@ module HexaPDF
       # Returns the UTF-8 string for the given code, or calls the configuration option
       # 'font.on_missing_unicode_mapping' if no mapping was found.
       def to_utf8(code)
-        (to_unicode_cmap && to_unicode_cmap.to_unicode(code)) ||
-          (ucs2_cmap && ucs2_cmap.to_unicode(code)) || missing_unicode_mapping(code)
+        to_unicode_cmap&.to_unicode(code) || ucs2_cmap&.to_unicode(code) ||
+          missing_unicode_mapping(code)
       end
 
       # Returns the unscaled width of the given CID in glyph units, or 0 if the width for the code
@@ -103,7 +103,7 @@ module HexaPDF
       #
       # See: PDF1.7 s9.3.3
       def word_spacing_applicable?
-        @word_spacing_applicable ||= ((cmap.read_codes("\x20".freeze) && true) rescue false)
+        @word_spacing_applicable ||= ((cmap.read_codes("\x20") && true) rescue false)
       end
 
       private

data/lib/hexapdf/type/font_type1.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as
@@ -65,10 +65,10 @@ module HexaPDF
           %s(TimesNewRoman,Bold) => %s(Times-Bold),
           %s(TimesNewRoman,BoldItalic) => %s(Times-BoldItalic),
         }
-        %i(Times-Roman Times-Bold Times-Italic Times-BoldItalic
+        %i[Times-Roman Times-Bold Times-Italic Times-BoldItalic
            Helvetica Helvetica-Bold Helvetica-Oblique Helvetica-BoldOblique
            Courier Courier-Bold Courier-Oblique Courier-BoldOblique
-           Symbol ZapfDingbats).each {|name| @mapping[name] = name}
+           Symbol ZapfDingbats].each {|name| @mapping[name] = name }
 
         # Returns +true+ if the given name is the name of a standard font.
         def self.standard_font?(name)

data/lib/hexapdf/type/form.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as
@@ -44,7 +44,7 @@ module HexaPDF
 
       define_type :XObject
 
-      define_field :Type,          type: Symbol,     default: self.type
+      define_field :Type,          type: Symbol,     default: type
       define_field :Subtype,       type: Symbol,     required: true, default: :Form
       define_field :FormType,      type: Integer,    default: 1
       define_field :BBox,          type: Rectangle,  required: true

data/lib/hexapdf/type/graphics_state_parameter.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as
@@ -47,7 +47,7 @@ module HexaPDF
 
       define_type :ExtGState
 
-      define_field :Type,          type: Symbol, required: true, default: self.type
+      define_field :Type,          type: Symbol, required: true, default: type
       define_field :LW,            type: Numeric, version: "1.3"
       define_field :LC,            type: Integer, version: "1.3"
       define_field :LJ,            type: Integer, version: "1.3"

data/lib/hexapdf/type/image.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; frozen_string_literal: true -*-
 #
 #--
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2017 Thomas Leitner
+# Copyright (C) 2014-2018 Thomas Leitner
 #
 # HexaPDF is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3 as
@@ -50,7 +50,7 @@ module HexaPDF
 
       define_type :XObject
 
-      define_field :Type,             type: Symbol,          default: self.type
+      define_field :Type,             type: Symbol,          default: type
       define_field :Subtype,          type: Symbol,          required: true, default: :Image
       define_field :Width,            type: Integer,         required: true
       define_field :Height,           type: Integer,         required: true
@@ -112,17 +112,17 @@ module HexaPDF
         case filter
         when :DCTDecode
           result.type = :jpeg
-          result.extension = 'jpg'.freeze
+          result.extension = 'jpg'
         when :JPXDecode
           result.type = :jp2
-          result.extension = 'jpx'.freeze
+          result.extension = 'jpx'
         when :JBIG2Decode
           result.type = :jbig2
         when :CCITTFaxDecode
           result.type = :ccitt
         else
           result.type = :png
-          result.extension = 'png'.freeze
+          result.extension = 'png'
         end
 
         if rest || ![:FlateDecode, :DCTDecode, :JPXDecode, nil].include?(filter)
@@ -177,7 +177,7 @@ module HexaPDF
         end
 
         io = if name_or_io.kind_of?(String)
-               File.open(name_or_io.sub(/\.#{info.extension}\z/, '') + "." + info.extension, "wb")
+               File.open(name_or_io.sub(/\.#{info.extension}\z/, '') << "." << info.extension, "wb")
              else
                name_or_io
              end
@@ -226,14 +226,14 @@ module HexaPDF
           if info.color_space == :rgb
             palette = palette_data[0, palette_data.length - palette_data.length % 3]
           else
-            palette_data.each_byte {|byte| palette << byte << byte << byte}
+            palette_data.each_byte {|byte| palette << byte << byte << byte }
           end
           io << png_chunk('PLTE', palette)
         end
 
-        if self[:Mask].kind_of?(Array) && self[:Mask].each_slice(2).all? {|a, b| a == b} &&
+        if self[:Mask].kind_of?(Array) && self[:Mask].each_slice(2).all? {|a, b| a == b } &&
             (color_type == ImageLoader::PNG::TRUECOLOR || color_type == ImageLoader::PNG::GREYSCALE)
-          io << png_chunk('tRNS', self[:Mask].each_slice(2).map {|a, _| a}.pack('n*'))
+          io << png_chunk('tRNS', self[:Mask].each_slice(2).map {|a, _| a }.pack('n*'))
         end
 
         filter, = *self[:Filter]
@@ -246,13 +246,12 @@ module HexaPDF
         end
         io << png_chunk('IDAT', Filter.string_from_source(data))
 
-        io << png_chunk('IEND', '')
+        io << png_chunk('IEND')
       end
 
       # Returns the binary representation of the PNG chunk for the given chunk type and data.
-      def png_chunk(type, data = nil)
-        [data.to_s.length].pack("N") << type << data.to_s <<
-          [Zlib.crc32(data, Zlib.crc32(type))].pack("N")
+      def png_chunk(type, data = '')
+        [data.length].pack("N") << type << data << [Zlib.crc32(data, Zlib.crc32(type))].pack("N")
       end
 
     end