pdf-core 0.6.1 → 0.7.0

data/lib/pdf/core/name_tree.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'pdf/core/utils'
+
 # name_tree.rb : Implements NameTree for PDF
 #
 # Copyright November 2008, Jamis Buck. All Rights Reserved.
@@ -16,7 +18,7 @@ module PDF
         attr_accessor :parent
         attr_accessor :ref
 
-        def initialize(document, limit, parent=nil)
+        def initialize(document, limit, parent = nil)
           @document = document
           @children = []
           @limit = limit
@@ -29,7 +31,7 @@ module PDF
         end
 
         def size
-          leaf? ? children.size : children.inject(0) { |sum, child| sum + child.size }
+          leaf? ? children.size : children.map(&:size).reduce(:+)
         end
 
         def leaf?
@@ -47,10 +49,10 @@ module PDF
           if leaf?
             hash[:Names] = children if leaf?
           else
-            hash[:Kids] = children.map { |child| child.ref }
+            hash[:Kids] = children.map(&:ref)
           end
 
-          return hash
+          hash
         end
 
         def least
@@ -84,15 +86,16 @@ module PDF
           value
         end
 
-        def >=(value)
-          children.empty? || children.last >= value
+        def >=(other)
+          children.empty? || children.last >= other
         end
 
         def split!
           if parent
             parent.split(self)
           else
-            left, right = new_node(self), new_node(self)
+            left = new_node(self)
+            right = new_node(self)
             split_children(self, left, right)
             children.replace([left, right])
           end
@@ -103,51 +106,51 @@ module PDF
         #
         def deep_copy
           node = dup
-          node.instance_variable_set("@children",
-                                     Marshal.load(Marshal.dump(children)))
-          node.instance_variable_set("@ref",
-                                     node.ref ? node.ref.deep_copy : nil)
+          node.instance_variable_set('@children', Utils.deep_clone(children))
+          node.instance_variable_set('@ref',
+            node.ref ? node.ref.deep_copy : nil)
           node
         end
 
         protected
 
-          def split(node)
-            new_child = new_node(self)
-            split_children(node, node, new_child)
-            index = children.index(node)
-            children.insert(index+1, new_child)
-            split! if children.length > limit
-          end
+        def split(node)
+          new_child = new_node(self)
+          split_children(node, node, new_child)
+          index = children.index(node)
+          children.insert(index + 1, new_child)
+          split! if children.length > limit
+        end
 
         private
 
-          def new_node(parent=nil)
-            node = Node.new(document, limit, parent)
-            node.ref = document.ref!(node)
-            return node
-          end
+        def new_node(parent = nil)
+          node = Node.new(document, limit, parent)
+          node.ref = document.ref!(node)
+          node
+        end
 
-          def split_children(node, left, right)
-            half = (node.limit+1)/2
+        def split_children(node, left, right)
+          half = (node.limit + 1) / 2
 
-            left_children, right_children = node.children[0...half], node.children[half..-1]
+          left_children = node.children[0...half]
+          right_children = node.children[half..-1]
 
-            left.children.replace(left_children)
-            right.children.replace(right_children)
+          left.children.replace(left_children)
+          right.children.replace(right_children)
 
-            unless node.leaf?
-              left_children.each { |child| child.parent = left }
-              right_children.each { |child| child.parent = right }
-            end
+          unless node.leaf?
+            left_children.each { |child| child.parent = left }
+            right_children.each { |child| child.parent = right }
           end
+        end
 
-          def insertion_point(value)
-            children.each_with_index do |child, index|
-              return index if child >= value
-            end
-            return children.length
+        def insertion_point(value)
+          children.each_with_index do |child, index|
+            return index if child >= value
           end
+          children.length
+        end
       end
 
       class Value #:nodoc:
@@ -157,11 +160,12 @@ module PDF
         attr_reader :value
 
         def initialize(name, value)
-          @name, @value = PDF::Core::LiteralString.new(name), value
+          @name = PDF::Core::LiteralString.new(name)
+          @value = value
         end
 
-        def <=>(leaf)
-          name <=> leaf.name
+        def <=>(other)
+          name <=> other.name
         end
 
         def inspect

data/lib/pdf/core/object_store.rb

@@ -18,12 +18,12 @@ module PDF
         @identifiers = []
 
         @info  ||= ref(opts[:info] || {}).identifier
-        @root  ||= ref(:Type => :Catalog).identifier
+        @root  ||= ref(Type: :Catalog).identifier
         if opts[:print_scaling] == :none
-          root.data[:ViewerPreferences] = {:PrintScaling => :None}
+          root.data[:ViewerPreferences] = { PrintScaling: :None }
         end
         if pages.nil?
-          root.data[:Pages] = ref(:Type => :Pages, :Count => 0, :Kids => [])
+          root.data[:Pages] = ref(Type: :Pages, Count: 0, Kids: [])
         end
       end
 
@@ -48,22 +48,23 @@ module PDF
       end
 
       # Adds the given reference to the store and returns the reference object.
-      # If the object provided is not a PDF::Core::Reference, one is created from the
-      # arguments provided.
+      # If the object provided is not a PDF::Core::Reference, one is created
+      # from the arguments provided.
       #
       def push(*args, &block)
-        reference = if args.first.is_a?(PDF::Core::Reference)
-          args.first
-        else
-          PDF::Core::Reference.new(*args, &block)
-        end
+        reference =
+          if args.first.is_a?(PDF::Core::Reference)
+            args.first
+          else
+            PDF::Core::Reference.new(*args, &block)
+          end
 
         @objects[reference.identifier] = reference
         @identifiers << reference.identifier
         reference
       end
 
-      alias_method :<<, :push
+      alias << push
 
       def each
         @identifiers.each do |id|
@@ -78,7 +79,7 @@ module PDF
       def size
         @identifiers.size
       end
-      alias_method :length, :size
+      alias length size
 
       # returns the object ID for a particular page in the document. Pages
       # are indexed starting at 1 (not 0!).
@@ -95,12 +96,6 @@ module PDF
         flat_page_ids = get_page_objects(pages).flatten
         flat_page_ids[k]
       end
-
-      def is_utf8?(str)
-        str.force_encoding(::Encoding::UTF_8)
-        str.valid_encoding?
-      end
     end
   end
 end
-

data/lib/pdf/core/outline_item.rb

@@ -1,7 +1,8 @@
 module PDF
   module Core
     class OutlineItem #:nodoc:
-      attr_accessor :count, :first, :last, :next, :prev, :parent, :title, :dest, :closed
+      attr_accessor :count, :first, :last, :next, :prev, :parent, :title, :dest,
+        :closed
 
       def initialize(title, parent, options)
         @closed = options[:closed]
@@ -11,11 +12,15 @@ module PDF
       end
 
       def to_hash
-        hash = { :Title => title,
-                 :Parent => parent,
-                 :Count => closed ? -count : count }
-        [{:First => first}, {:Last => last}, {:Next => defined?(@next) && @next},
-         {:Prev => prev}, {:Dest => dest}].each do |h|
+        hash = {
+          Title: title,
+          Parent: parent,
+          Count: closed ? -count : count
+        }
+        [
+          { First: first }, { Last: last }, { Next: defined?(@next) && @next },
+          { Prev: prev }, { Dest: dest }
+        ].each do |h|
           unless h.values.first.nil?
             hash.merge!(h)
           end

data/lib/pdf/core/outline_root.rb

@@ -8,7 +8,7 @@ module PDF
       end
 
       def to_hash
-        {:Type => :Outlines, :Count => count, :First => first, :Last => last}
+        { Type: :Outlines, Count: count, First: first, Last: last }
       end
     end
   end

data/lib/pdf/core/page.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # prawn/core/page.rb : Implements low-level representation of a PDF page
 #
 # Copyright February 2010, Gregory Brown.  All Rights Reserved.
@@ -12,21 +10,48 @@ require_relative 'graphics_state'
 module PDF
   module Core
     class Page #:nodoc:
-      attr_accessor :document, :margins, :stack
+      attr_accessor :art_indents, :bleeds, :crops, :document, :margins, :stack,
+        :trims
       attr_writer :content, :dictionary
 
-      def initialize(document, options={})
+      ZERO_INDENTS = {
+        left: 0,
+        bottom: 0,
+        right: 0,
+        top: 0
+      }.freeze
+
+      def initialize(document, options = {})
         @document = document
-        @margins  = options[:margins] || { :left    => 36,
-                                           :right   => 36,
-                                           :top     => 36,
-                                           :bottom  => 36  }
+        @margins  = options[:margins] || { left: 36,
+                                           right: 36,
+                                           top: 36,
+                                           bottom: 36 }
+        @crops = options[:crops] || ZERO_INDENTS
+        @bleeds = options[:bleeds] || ZERO_INDENTS
+        @trims = options[:trims] || ZERO_INDENTS
+        @art_indents = options[:art_indents] || ZERO_INDENTS
         @stack = GraphicStateStack.new(options[:graphic_state])
-        if options[:object_id]
-          init_from_object(options)
-        else
-          init_new_page(options)
-        end
+        @size     = options[:size] || 'LETTER'
+        @layout   = options[:layout] || :portrait
+
+        @stamp_stream      = nil
+        @stamp_dictionary  = nil
+
+        @content = document.ref({})
+        content << 'q' << "\n"
+        @dictionary = document.ref(
+          Type: :Page,
+          Parent: document.state.store.pages,
+          MediaBox: dimensions,
+          CropBox: crop_box,
+          BleedBox: bleed_box,
+          TrimBox: trim_box,
+          ArtBox: art_box,
+          Contents: content
+        )
+
+        resources[:ProcSet] = [:PDF, :Text, :ImageB, :ImageC, :ImageI]
       end
 
       def graphic_state
@@ -45,15 +70,15 @@ module PDF
       end
 
       def size
-        defined?(@size) && @size || dimensions[2,2]
+        defined?(@size) && @size || dimensions[2, 2]
       end
 
       def in_stamp_stream?
-        !!@stamp_stream
+        !@stamp_stream.nil?
       end
 
       def stamp_stream(dictionary)
-        @stamp_stream     = ""
+        @stamp_stream     = ''
         @stamp_dictionary = dictionary
         graphic_stack_size = stack.stack.size
 
@@ -76,7 +101,8 @@ module PDF
       end
 
       def dictionary
-        defined?(@stamp_dictionary) && @stamp_dictionary || document.state.store[@dictionary]
+        defined?(@stamp_dictionary) && @stamp_dictionary ||
+          document.state.store[@dictionary]
       end
 
       def resources
@@ -116,62 +142,67 @@ module PDF
           dictionary.data[:Contents].each do |stream|
             stream.stream.compress! if document.compression_enabled?
           end
-        else
-          content.stream.compress! if document.compression_enabled?
+        elsif document.compression_enabled?
+          content.stream.compress!
         end
       end
 
-      def imported_page?
-        @imported_page
-      end
-
       def dimensions
-        return inherited_dictionary_value(:MediaBox) if imported_page?
-
         coords = PDF::Core::PageGeometry::SIZES[size] || size
-        [0,0] + case(layout)
-        when :portrait
-          coords
-        when :landscape
-          coords.reverse
-        else
-          raise PDF::Core::Errors::InvalidPageLayout,
-            "Layout must be either :portrait or :landscape"
-        end
+        [0, 0] +
+          case layout
+          when :portrait
+            coords
+          when :landscape
+            coords.reverse
+          else
+            raise PDF::Core::Errors::InvalidPageLayout,
+              'Layout must be either :portrait or :landscape'
+          end
       end
 
-      private
-
-      def init_from_object(options)
-        @dictionary = options[:object_id].to_i
-
-        unless dictionary.data[:Contents].is_a?(Array) # content only on leafs
-          @content    = dictionary.data[:Contents].identifier
-        end
-
-        @stamp_stream      = nil
-        @stamp_dictionary  = nil
-        @imported_page     = true
+      def art_box
+        left, bottom, right, top = dimensions
+        [
+          left + art_indents[:left],
+          bottom + art_indents[:bottom],
+          right - art_indents[:right],
+          top - art_indents[:top]
+        ]
       end
 
-      def init_new_page(options)
-        @size     = options[:size]    ||  "LETTER"
-        @layout   = options[:layout]  || :portrait
-
-        @stamp_stream      = nil
-        @stamp_dictionary  = nil
-        @imported_page     = false
+      def bleed_box
+        left, bottom, right, top = dimensions
+        [
+          left + bleeds[:left],
+          bottom + bleeds[:bottom],
+          right - bleeds[:right],
+          top - bleeds[:top]
+        ]
+      end
 
-        @content    = document.ref({})
-        content << "q" << "\n"
-        @dictionary = document.ref(:Type        => :Page,
-                                   :Parent      => document.state.store.pages,
-                                   :MediaBox    => dimensions,
-                                   :Contents    => content)
+      def crop_box
+        left, bottom, right, top = dimensions
+        [
+          left + crops[:left],
+          bottom + crops[:bottom],
+          right - crops[:right],
+          top - crops[:top]
+        ]
+      end
 
-        resources[:ProcSet] = [:PDF, :Text, :ImageB, :ImageC, :ImageI]
+      def trim_box
+        left, bottom, right, top = dimensions
+        [
+          left + trims[:left],
+          bottom + trims[:bottom],
+          right - trims[:right],
+          top - trims[:top]
+        ]
       end
 
+      private
+
       # some entries in the Page dict can be inherited from parent Pages dicts.
       #
       # Starting with the current page dict, this method will walk up the
@@ -183,12 +214,10 @@ module PDF
       def inherited_dictionary_value(key, local_dict = nil)
         local_dict ||= dictionary.data
 
-        if local_dict.has_key?(key)
+        if local_dict.key?(key)
           local_dict[key]
-        elsif local_dict.has_key?(:Parent)
+        elsif local_dict.key?(:Parent)
           inherited_dictionary_value(key, local_dict[:Parent].data)
-        else
-          nil
         end
       end
     end