hexapdf 0.6.0 → 0.7.0

data/lib/hexapdf/serializer.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
@@ -162,7 +162,7 @@ module HexaPDF
     #
     # See: PDF1.7 s7.3.3
     def serialize_float(obj)
-      obj.abs < 0.0001 && obj != 0 ? sprintf("%.6f".freeze, obj) : obj.round(6).to_s
+      -0.0001 < obj && obj < 0.0001 && obj != 0 ? sprintf("%.6f", obj) : obj.round(6).to_s
     end
 
     # The regexp matches all characters that need to be escaped and the substs hash contains the
@@ -171,7 +171,7 @@ module HexaPDF
     # See PDF1.7 s7.3.5
     NAME_SUBSTS = {} # :nodoc:
     [0..32, 127..255, Tokenizer::DELIMITER.bytes, Tokenizer::WHITESPACE.bytes, [35]].each do |a|
-      a.each {|c| NAME_SUBSTS[c.chr] = "##{c.to_s(16).rjust(2, "0")}"}
+      a.each {|c| NAME_SUBSTS[c.chr] = "##{c.to_s(16).rjust(2, '0')}" }
     end
     NAME_REGEXP = /[^!-~&&[^##{Regexp.escape(Tokenizer::DELIMITER)}#{Regexp.escape(Tokenizer::WHITESPACE)}]]/ # :nodoc:
     NAME_CACHE = Utils::LRUCache.new(1000) # :nodoc:
@@ -183,7 +183,7 @@ module HexaPDF
       NAME_CACHE[obj] ||=
         begin
           str = obj.to_s.force_encoding(Encoding::BINARY)
-          str.gsub!(NAME_REGEXP) {|m| NAME_SUBSTS[m]}
+          str.gsub!(NAME_REGEXP) {|m| NAME_SUBSTS[m] }
           "/#{str}"
         end
     end
@@ -195,32 +195,32 @@ module HexaPDF
     #
     # See: PDF1.7 s7.3.6
     def serialize_array(obj)
-      str = "["
+      str = +"["
       index = 0
       while index < obj.size
         tmp = __serialize(obj[index])
-        str << " ".freeze unless BYTE_IS_DELIMITER[tmp.getbyte(0)] ||
-          BYTE_IS_DELIMITER[str.getbyte(-1)]
+        str << " " unless BYTE_IS_DELIMITER[tmp.getbyte(0)] ||
+            BYTE_IS_DELIMITER[str.getbyte(-1)]
         str << tmp
         index += 1
       end
-      str << "]".freeze
+      str << "]"
     end
 
     # Serializes a Hash object (i.e. a PDF dictionary object).
     #
     # See: PDF1.7 s7.3.7
     def serialize_hash(obj)
-      str = "<<"
+      str = +"<<"
       obj.each do |k, v|
         next if v.nil? || (v.respond_to?(:null?) && v.null?)
         str << __serialize(k)
         tmp = __serialize(v)
-        str << " ".freeze unless BYTE_IS_DELIMITER[tmp.getbyte(0)] ||
-          BYTE_IS_DELIMITER[str.getbyte(-1)]
+        str << " " unless BYTE_IS_DELIMITER[tmp.getbyte(0)] ||
+            BYTE_IS_DELIMITER[str.getbyte(-1)]
         str << tmp
       end
-      str << ">>".freeze
+      str << ">>"
     end
 
     STRING_ESCAPE_MAP = {"(" => "\\(", ")" => "\\)", "\\" => "\\\\", "\r" => "\\r"}.freeze # :nodoc:
@@ -229,16 +229,19 @@ module HexaPDF
     #
     # See: PDF1.7 s7.3.4
     def serialize_string(obj)
-      if @encrypter && @object.kind_of?(HexaPDF::Object) && @object.indirect?
-        obj = encrypter.encrypt_string(obj, @object)
-      elsif obj.encoding != Encoding::BINARY
-        obj = if obj =~ /[^ -~\t\r\n]/
+      obj = if @encrypter && @object.kind_of?(HexaPDF::Object) && @object.indirect?
+              encrypter.encrypt_string(obj, @object)
+            elsif obj.encoding != Encoding::BINARY
+              if obj.match?(/[^ -~\t\r\n]/)
                 "\xFE\xFF".b << obj.encode(Encoding::UTF_16BE).force_encoding(Encoding::BINARY)
               else
                 obj.b
               end
-      end
-      "(" << obj.gsub(/[\(\)\\\r]/n) {|m| STRING_ESCAPE_MAP[m]} << ")".freeze
+            else
+              obj.dup
+            end
+      obj.gsub!(/[\(\)\\\r]/n, STRING_ESCAPE_MAP)
+      "(#{obj})"
     end
 
     # The ISO PDF specification differs in respect to the supported date format. When converting
@@ -282,7 +285,7 @@ module HexaPDF
 
     # See: PDF1.7 s7.3.10
     def serialize_hexapdf_reference(obj)
-      "#{obj.oid} #{obj.gen} R".freeze
+      "#{obj.oid} #{obj.gen} R"
     end
 
     # Serializes the streams dictionary and its stream.
@@ -304,11 +307,11 @@ module HexaPDF
       if @io && fiber.respond_to?(:length) && fiber.length >= 0
         obj.value[:Length] = fiber.length
         @io << __serialize(obj.value)
-        @io << "stream\n".freeze
+        @io << "stream\n"
         while fiber.alive? && (data = fiber.resume)
           @io << data.freeze
         end
-        @io << "\nendstream".freeze
+        @io << "\nendstream"
 
         nil
       else
@@ -316,9 +319,9 @@ module HexaPDF
         obj.value[:Length] = data.size
 
         str = __serialize(obj.value)
-        str << "stream\n".freeze
+        str << "stream\n"
         str << data
-        str << "\nendstream".freeze
+        str << "\nendstream"
       end
     end
 

data/lib/hexapdf/stream.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
@@ -162,7 +162,7 @@ module HexaPDF
       if data.stream.kind_of?(String)
         HexaPDF::Filter.source_from_string(data.stream)
       else
-        data.stream.fiber(config['io.chunk_size'.freeze])
+        data.stream.fiber(config['io.chunk_size'])
       end
     end
 
@@ -190,7 +190,7 @@ module HexaPDF
     def stream_encoder(source = stream_source)
       encoder_data = [document.unwrap(self[:Filter])].flatten.
         zip([document.unwrap(self[:DecodeParms])].flatten).
-        delete_if {|f, _| f.nil?}
+        delete_if {|f, _| f.nil? }
 
       if data.stream.kind_of?(StreamData)
         decoder_data = data.stream.filter.zip(data.stream.decode_parms)

data/lib/hexapdf/task.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/task/dereference.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
@@ -90,9 +90,9 @@ module HexaPDF
       def recurse(val) #:nodoc:
         case val
         when Hash
-          val.each {|k, v| val[k] = recurse(v)}
+          val.each {|k, v| val[k] = recurse(v) }
         when Array
-          val.map! {|v| recurse(v)}
+          val.map! {|v| recurse(v) }
         when HexaPDF::Reference
           dereference(@doc.object(val))
         when HexaPDF::Object

data/lib/hexapdf/task/optimize.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
@@ -157,7 +157,7 @@ module HexaPDF
                 count = 0
               end
             end
-            objstms.each {|objstm| doc.add(objstm, revision: rev_index)}
+            objstms.each {|objstm| doc.add(objstm, revision: rev_index) }
             doc.add({Type: :XRef}, revision: rev_index) unless xref_stream
           end
         end
@@ -222,7 +222,8 @@ module HexaPDF
         end
 
         def process(op, operands) #:nodoc:
-          @result << HexaPDF::Content::Operator::DEFAULT_OPERATORS[op.intern].serialize(@serializer, *operands)
+          @result << HexaPDF::Content::Operator::DEFAULT_OPERATORS[op].
+            serialize(@serializer, *operands)
         end
 
       end

data/lib/hexapdf/tokenizer.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
@@ -56,17 +56,16 @@ module HexaPDF
     # Characters defined as whitespace.
     #
     # See: PDF1.7 s7.2.2
-    WHITESPACE = "\0\t\n\f\r ".freeze
+    WHITESPACE = " \n\r\0\t\f"
 
     # Characters defined as delimiters.
     #
     # See: PDF1.7 s7.2.2
-    DELIMITER = "()<>{}/[]%".freeze
+    DELIMITER = "()<>{}/[]%"
 
     WHITESPACE_MULTI_RE = /[#{WHITESPACE}]+/ # :nodoc:
 
-    WHITESPACE_OR_DELIMITER_RE = /(?=[#{Regexp.escape(WHITESPACE)}#{Regexp.escape(DELIMITER)}])/ # :nodoc:
-
+    WHITESPACE_OR_DELIMITER_RE = /(?=[#{Regexp.escape(WHITESPACE + DELIMITER)}])/ # :nodoc:
 
     # The IO object from the tokens are read.
     attr_reader :io
@@ -228,7 +227,7 @@ module HexaPDF
 
     private
 
-    TOKEN_CACHE = Hash.new {|h, k| h[k] = Token.new(k)} # :nodoc:
+    TOKEN_CACHE = Hash.new {|h, k| h[k] = Token.new(k) } # :nodoc:
     TOKEN_CACHE['true'] = true
     TOKEN_CACHE['false'] = false
     TOKEN_CACHE['null'] = nil
@@ -237,11 +236,11 @@ module HexaPDF
     #
     # See: PDF1.7 s7.2
     def parse_keyword
-      str = scan_until(WHITESPACE_OR_DELIMITER_RE) || @ss.scan(/.*/).freeze
-      TOKEN_CACHE[str.freeze]
+      str = scan_until(WHITESPACE_OR_DELIMITER_RE) || @ss.scan(/.*/)
+      TOKEN_CACHE[str]
     end
 
-    REFERENCE_RE = /[#{WHITESPACE}]+([+-]?\d+)[#{WHITESPACE}]+R(?=[#{Regexp.escape(WHITESPACE)}#{Regexp.escape(DELIMITER)}])/ # :nodoc:
+    REFERENCE_RE = /[#{WHITESPACE}]+([+-]?\d+)[#{WHITESPACE}]+R#{WHITESPACE_OR_DELIMITER_RE}/ # :nodoc:
 
     # Parses the number (integer or real) at the current position.
     #
@@ -254,7 +253,7 @@ module HexaPDF
         tmp = Reference.new(tmp, @ss[1].to_i) if @ss.scan(REFERENCE_RE)
         tmp
       elsif (val = @ss.scan(/[+-]?(?:\d+\.\d*|\.\d+)/))
-        val << '0'.freeze if val.getbyte(-1) == 46 # dot '.'
+        val << '0' if val.getbyte(-1) == 46 # dot '.'
         Float(val)
       else
         parse_keyword
@@ -326,8 +325,8 @@ module HexaPDF
       end
 
       @ss.pos += 1
-      data.tr!(WHITESPACE, "".freeze)
-      [data].pack('H*'.freeze)
+      data.tr!(WHITESPACE, "")
+      [data].pack('H*')
     end
 
     # Parses the name at the current position.
@@ -383,7 +382,6 @@ module HexaPDF
       result
     end
 
-
     # Prepares the StringScanner by filling its string instance with enough bytes.
     #
     # The number of needed bytes can be specified via the optional +needed_bytes+ argument.

data/lib/hexapdf/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/action.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
@@ -46,7 +46,7 @@ module HexaPDF
 
       define_type :Action
 
-      define_field :Type, type: Symbol, default: self.type
+      define_field :Type, type: Symbol, default: type
       define_field :S,    type: Symbol, required: true
       define_field :Next, type: [Dictionary, Hash, Array], version: '1.2'
 

data/lib/hexapdf/type/actions.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/actions/go_to.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/actions/go_to_r.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/actions/launch.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/actions/uri.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
@@ -53,7 +53,7 @@ module HexaPDF
           unless self[:URI].ascii_only?
             yield("URIs have to contain ASCII characters only", true)
             uri = self[:URI].dup.force_encoding(Encoding::BINARY)
-            uri.encode!(Encoding::US_ASCII, fallback: ->(c) { "%#{c.ord.to_s(16).upcase}"})
+            uri.encode!(Encoding::US_ASCII, fallback: lambda {|c| "%#{c.ord.to_s(16).upcase}" })
             self[:URI] = uri
           end
         end

data/lib/hexapdf/type/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
@@ -47,7 +47,7 @@ module HexaPDF
 
       define_type :Annot
 
-      define_field :Type,         type: Symbol, default: self.type
+      define_field :Type,         type: Symbol, default: type
       define_field :Subtype,      type: Symbol, required: true
       define_field :Rect,         type: Rectangle, required: true
       define_field :Contents,     type: String