prawn 1.0.0.rc2 → 1.0.0

data/lib/prawn/repeater.rb

@@ -11,14 +11,16 @@
 module Prawn
 
   class Document
-
     # A list of all repeaters in the document.
     # See Document#repeat for details
     #
+    # @private
     def repeaters
       @repeaters ||= []
     end
 
+    # @group Experimental API
+
     # Provides a way to execute a block of code repeatedly based on a
     # page_filter.  Since Stamp is used under the hood, this method is very space
     # efficient.
@@ -29,10 +31,10 @@ module Prawn
     #   :even       -- repeats on even pages
     #   some_array  -- repeats on every page listed in the array
     #   some_range  -- repeats on every page included in the range
-    #   some_lambda -- yields page number and repeats for true return values 
+    #   some_lambda -- yields page number and repeats for true return values
     #
-    # Also accepts an optional second argument for dynamic content which executes the code 
-    # in the context of the filtered pages without using a Stamp. 
+    # Also accepts an optional second argument for dynamic content which executes the code
+    # in the context of the filtered pages without using a Stamp.
     #
     # Example:
     #
@@ -49,8 +51,8 @@ module Prawn
     #     repeat :even do
     #       draw_text "EVEN", :at => [0,0]
     #     end
-    # 
-    #     repeat [1,2] do 
+    #
+    #     repeat [1,2] do
     #       draw_text "[1,2]", :at => [100,0]
     #     end
     #
@@ -62,11 +64,11 @@ module Prawn
     #       draw_text "Every third", :at => [250, 20]
     #     end
     #
-    #     10.times do 
+    #     10.times do
     #       start_new_page
     #       draw_text "A wonderful page", :at => [400,400]
     #     end
-    #     
+    #
     #     repeat(:all, :dynamic => true) do
     #       text page_number, :at => [500, 0]
     #     end

data/lib/prawn/security.rb

@@ -7,30 +7,33 @@
 # This is free software. Please see the LICENSE and COPYING files for details.
 
 require 'digest/md5'
-require 'rc4'
-require 'prawn/core/byte_string'
+
+require 'pdf/core/byte_string'
+
+require 'prawn/security/arcfour'
 
 module Prawn
   class Document
-    
+
     # Implements PDF encryption (password protection and permissions) as
     # specified in the PDF Reference, version 1.3, section 3.5 "Encryption".
     module Security
-      include Prawn::Core
-      
+
+      # @group Experimental API
+
       # Encrypts the document, to protect confidential data or control
       # modifications to the document. The encryption algorithm used is
       # detailed in the PDF Reference 1.3, section 3.5 "Encryption", and it is
       # implemented by all major PDF readers.
       #
       # +options+ can contain the following:
-      # 
-      # <tt>:user_password</tt>:: Password required to open the document. If 
+      #
+      # <tt>:user_password</tt>:: Password required to open the document. If
       #                           this is omitted or empty, no password will be
       #                           required. The document will still be
       #                           encrypted, but anyone can read it.
       #
-      # <tt>:owner_password</tt>:: Password required to make modifications to 
+      # <tt>:owner_password</tt>:: Password required to make modifications to
       #                            the document or change or override its
       #                            permissions. If this is set to
       #                            <tt>:random</tt>, a random password will be
@@ -52,7 +55,7 @@ module Prawn
       #
       # <tt>:copy_contents</tt>:: Copy text and graphics from document.
       #
-      # <tt>:modify_annotations</tt>:: Add or modify text annotations and 
+      # <tt>:modify_annotations</tt>:: Add or modify text annotations and
       #                                interactive form fields.
       #
       # == Examples
@@ -66,8 +69,8 @@ module Prawn
       # both the user and the owner:
       #
       #   encrypt_document :user_password => 'foo', :owner_password => 'bar'
-      # 
-      # Set no passwords, grant all permissions (This is useful because the 
+      #
+      # Set no passwords, grant all permissions (This is useful because the
       # default in some readers, if no permissions are specified, is "deny"):
       #
       #   encrypt_document
@@ -77,10 +80,10 @@ module Prawn
       # * The encryption used is weak; the key is password-derived and is
       #   limited to 40 bits, due to US export controls in effect at the time
       #   the PDF standard was written.
-      # 
+      #
       # * There is nothing technologically requiring PDF readers to respect the
       #   permissions embedded in a document. Many PDF readers do not.
-      # 
+      #
       # * In short, you have <b>no security at all</b> against a moderately
       #   motivated person. Don't use this for anything super-serious. This is
       #   not a limitation of Prawn, but is rather a built-in limitation of the
@@ -104,7 +107,7 @@ module Prawn
         state.encrypt = true
         state.encryption_key = user_encryption_key
       end
-      
+
       # Encrypts the given string under the given key, also requiring the
       # object ID and generation number of the reference.
       # See Algorithm 3.1.
@@ -116,7 +119,7 @@ module Prawn
 
         # Compute the RC4 key from the extended key and perform the encryption
         rc4_key = Digest::MD5.digest(extended_key)[0, 10]
-        RC4.new(rc4_key).encrypt(str)
+        Arcfour.new(rc4_key).encrypt(str)
       end
 
       private
@@ -126,8 +129,8 @@ module Prawn
         { :Filter => :Standard, # default PDF security handler
           :V      => 1,         # "Algorithm 3.1", PDF reference 1.3
           :R      => 2,         # Revision 2 of the algorithm
-          :O      => ByteString.new(owner_password_hash),
-          :U      => ByteString.new(user_password_hash),
+          :O      => PDF::Core::ByteString.new(owner_password_hash),
+          :U      => PDF::Core::ByteString.new(user_password_hash),
           :P      => permissions_value }
       end
 
@@ -136,7 +139,7 @@ module Prawn
                           :modify_contents    => 4,
                           :copy_contents      => 5,
                           :modify_annotations => 6 }
-      
+
       FullPermissions = 0b1111_1111_1111_1111_1111_1111_1111_1111
 
       def permissions=(perms={})
@@ -162,10 +165,10 @@ module Prawn
         @permissions || FullPermissions
       end
 
-      PasswordPadding = 
+      PasswordPadding =
         "28BF4E5E4E758A4164004E56FFFA01082E2E00B6D0683E802F0CA9FE6453697A".
         scan(/../).map{|x| x.to_i(16)}.pack("c*")
-      
+
       # Pads or truncates a password to 32 bytes as per Alg 3.2.
       def pad_password(password)
         password = password[0, 32]
@@ -186,50 +189,53 @@ module Prawn
       def owner_password_hash
         @owner_password_hash ||= begin
           key = Digest::MD5.digest(pad_password(@owner_password))[0, 5]
-          RC4.new(key).encrypt(pad_password(@user_password))
+          Arcfour.new(key).encrypt(pad_password(@user_password))
         end
       end
 
       # The U (user) value in the encryption dictionary. Algorithm 3.4.
       def user_password_hash
-        RC4.new(user_encryption_key).encrypt(PasswordPadding)
+        Arcfour.new(user_encryption_key).encrypt(PasswordPadding)
       end
 
     end
 
   end
+end
 
-  module Core #:nodoc:
+# @private
+module PDF
+  module Core
     module_function
 
     # Like PdfObject, but returns an encrypted result if required.
     # For direct objects, requires the object identifier and generation number
     # from the indirect object referencing obj.
-    def EncryptedPdfObject(obj, key, id, gen, in_content_stream=false)
+    #
+    # @private
+    def EncryptedPdfObject(obj, key, id, gen, in_content_stream=false) 
       case obj
       when Array
         "[" << obj.map { |e|
             EncryptedPdfObject(e, key, id, gen, in_content_stream)
         }.join(' ') << "]"
       when LiteralString
-        # FIXME: encrypted?
-        obj = obj.gsub(/[\\\n\(\)]/) { |m| "\\#{m}" }
+        obj = ByteString.new(Prawn::Document::Security.encrypt_string(obj, key, id, gen)).gsub(/[\\\n\(\)]/) { |m| "\\#{m}" }
         "(#{obj})"
       when Time
-        # FIXME: encrypted?
         obj = obj.strftime("D:%Y%m%d%H%M%S%z").chop.chop + "'00'"
-        obj = obj.gsub(/[\\\n\(\)]/) { |m| "\\#{m}" }
+        obj = ByteString.new(Prawn::Document::Security.encrypt_string(obj, key, id, gen)).gsub(/[\\\n\(\)]/) { |m| "\\#{m}" }
         "(#{obj})"
       when String
         PdfObject(
           ByteString.new(
-            Document::Security.encrypt_string(obj, key, id, gen)),
+            Prawn::Document::Security.encrypt_string(obj, key, id, gen)),
           in_content_stream)
-      when Hash
+      when ::Hash
         output = "<< "
         obj.each do |k,v|
           unless String === k || Symbol === k
-            raise Prawn::Errors::FailedObjectConversion,
+            raise PDF::Core::Errors::FailedObjectConversion,
               "A PDF Dictionary must be keyed by names"
           end
           output << PdfObject(k.to_sym, in_content_stream) << " " <<
@@ -239,31 +245,44 @@ module Prawn
       when NameTree::Value
         PdfObject(obj.name) + " " +
           EncryptedPdfObject(obj.value, key, id, gen, in_content_stream)
-      when Prawn::OutlineRoot, Prawn::OutlineItem
+      when PDF::Core::OutlineRoot, PDF::Core::OutlineItem
         EncryptedPdfObject(obj.to_hash, key, id, gen, in_content_stream)
       else # delegate back to PdfObject
         PdfObject(obj, in_content_stream)
       end
     end
 
+
+    # @private
+    class Stream
+      def encrypted_object(key, id, gen)
+        if filtered_stream
+          "stream\n#{Prawn::Document::Security.encrypt_string filtered_stream, key, id, gen}\nendstream\n"
+        else
+          ''
+        end
+      end
+    end
+
+    # @private
     class Reference
 
       # Returns the object definition for the object this references, keyed from
       # +key+.
       def encrypted_object(key)
         @on_encode.call(self) if @on_encode
-        output = "#{@identifier} #{gen} obj\n" <<
-          Prawn::Core::EncryptedPdfObject(data, key, @identifier, gen) << "\n"
-        if @stream
-          output << "stream\n" <<
-            Document::Security.encrypt_string(@stream, key, @identifier, gen) <<
-            "\nendstream\n"
+
+        output = "#{@identifier} #{gen} obj\n"
+        unless @stream.empty?
+          output << PDF::Core::EncryptedPdfObject(data.merge(@stream.data), key, @identifier, gen) << "\n" <<
+            @stream.encrypted_object(key, @identifier, gen)
+        else
+          output << PDF::Core::EncryptedPdfObject(data, key, @identifier, gen) << "\n"
         end
+
         output << "endobj\n"
       end
 
     end
   end
-
 end
-

data/lib/prawn/security/arcfour.rb

@@ -0,0 +1,52 @@
+# Implementation of the "ARCFOUR" algorithm ("alleged RC4 (tm)"). Implemented
+# as described at:
+# http://www.mozilla.org/projects/security/pki/nss/draft-kaukonen-cipher-arcfour-03.txt
+#
+# "RC4" is a trademark of RSA Data Security, Inc.
+#
+# Copyright August 2009, Brad Ediger. All Rights Reserved.
+#
+# This is free software. Please see the LICENSE and COPYING files for details.
+
+# @private
+class Arcfour
+  def initialize(key)
+    # Convert string key to Array of integers
+    key = key.unpack('c*') if key.is_a?(String)
+
+    # 1. Allocate an 256 element array of 8 bit bytes to be used as an S-box
+    # 2. Initialize the S-box.  Fill each entry first with it's index
+    @sbox = (0..255).to_a
+    
+    # 3. Fill another array of the same size (256) with the key, repeating
+    #    bytes as necessary.
+    s2 = []
+    while s2.length < 256
+      s2 += key
+    end
+    s2 = s2[0, 256]
+
+    # 4. Set j to zero and initialize the S-box
+    j = 0
+    (0..255).each do |i|
+      j = (j + @sbox[i] + s2[i]) % 256
+      @sbox[i], @sbox[j] = @sbox[j], @sbox[i]
+    end
+
+    @i = @j = 0
+  end
+
+  def encrypt(string)
+    string.unpack('c*').map{|byte| byte ^ key_byte}.pack('c*')
+  end
+  
+  private
+
+  # Produces the next byte of key material in the stream (3.2 Stream Generation)
+  def key_byte
+    @i = (@i + 1) % 256
+    @j = (@j + @sbox[@i]) % 256
+    @sbox[@i], @sbox[@j] = @sbox[@j], @sbox[@i]
+    @sbox[(@sbox[@i] + @sbox[@j]) % 256]
+  end
+end

data/lib/prawn/soft_mask.rb

@@ -10,7 +10,7 @@
 module Prawn
 
   # The Prawn::SoftMask module is used to create arbitrary transparency in
-  # document. Using a soft mask allows creaing more visually rich documents.
+  # document. Using a soft mask allows creating more visually rich documents.
   #
   # You must group soft mask and graphics it's applied to under
   # save_graphics_state because soft mask is a part of graphic state in PDF.
@@ -26,6 +26,8 @@ module Prawn
   #   end
   #
   module SoftMask
+    # @group Stable API
+
     def soft_mask(&block)
       min_version(1.4)
 
@@ -66,13 +68,11 @@ module Prawn
 
       registry_key = {
         :bbox => state.page.dimensions,
-        :mask => group.stream,
+        :mask => [group.stream.filters.normalized, group.stream.filtered_stream],
         :page => state.page_count,
       }.hash
 
       if soft_mask_registry[registry_key]
-        [g_state, mask, group, group_attrs].each { |ref| ref.live = false }
-
         add_content "/#{soft_mask_registry[registry_key]} gs"
       else
         masks = page.resources[:ExtGState] ||= {}

data/lib/prawn/stamp.rb

@@ -28,6 +28,8 @@ module Prawn
   #
   module Stamp
 
+    # @group Stable API
+
     # Renders the stamp named <tt>name</tt> to the page
     # raises <tt>Prawn::Errors::InvalidName</tt> if name.empty?
     # raises <tt>Prawn::Errors::UndefinedObjectName</tt> if no stamp
@@ -80,7 +82,7 @@ module Prawn
 
       state.page.stamp_stream(dictionary, &block)
     end
-    
+
     private
 
     def stamp_dictionary_registry
@@ -121,12 +123,12 @@ module Prawn
                                           :stamp_dictionary      => dictionary }
       dictionary
     end
-    
+
     def freeze_stamp_graphics
       update_colors
       write_line_width
       write_stroke_cap_style
-      write_stroke_join_style     
+      write_stroke_join_style
       write_stroke_dash
     end
 

data/lib/prawn/table.rb

@@ -6,18 +6,21 @@
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
 
-require 'prawn/table/cells'
-require 'prawn/table/cell'
-require 'prawn/table/cell/in_table'
-require 'prawn/table/cell/text'
-require 'prawn/table/cell/subtable'
-require 'prawn/table/cell/image'
-require 'prawn/table/cell/span_dummy'
+require_relative 'table/column_width_calculator'
+require_relative 'table/cell'
+require_relative 'table/cells'
+require_relative 'table/cell/in_table'
+require_relative 'table/cell/text'
+require_relative 'table/cell/subtable'
+require_relative 'table/cell/image'
+require_relative 'table/cell/span_dummy'
 
 module Prawn
 
   class Document
-    
+
+    # @group Experimental API
+
     # Set up and draw a table on this document. A block can be given, which will
     # be run after cell setup but before layout and drawing.
     #
@@ -51,7 +54,7 @@ module Prawn
   #   Produces a text cell. This is the most common usage.
   # Prawn::Table::Cell::
   #   If you have already built a Cell or have a custom subclass of Cell you
-  #   want to use in a table, you can pass through Cell objects. 
+  #   want to use in a table, you can pass through Cell objects.
   # Prawn::Table::
   #   Creates a subtable (a table within a cell). You can use
   #   Prawn::Document#make_table to create a table for use as a subtable
@@ -73,12 +76,12 @@ module Prawn
   #   A hash of style options to style all cells. See the documentation on
   #   Prawn::Table::Cell for all cell style options.
   # +header+::
-  #   If set to +true+, the first row will be repeated on every page. The
-  #   header must be included as the first row of your data. Row numbering
-  #   (for styling and other row-specific options) always indexes based on
-  #   your data array. Whether or not you have a header, row(n) always refers
-  #   to the nth element (starting from 0) of the +data+ array.
-  # +column_widths+:: 
+  #   If set to +true+, the first row will be repeated on every page. If set
+  #   to an Integer, the first +x+ rows will be repeated on every page. Row
+  #   numbering (for styling and other row-specific options) always indexes
+  #   based on your data array. Whether or not you have a header, row(n) always
+  #   refers to the nth element (starting from 0) of the +data+ array.
+  # +column_widths+::
   #   Sets widths for individual columns. Manually setting widths can give
   #   better results than letting Prawn guess at them, as Prawn's algorithm
   #   for defaulting widths is currently pretty boneheaded. If you experience
@@ -101,7 +104,7 @@ module Prawn
   #   pdf.table(data) do |table|
   #     table.rows(1..3).width = 72
   #   end
-  # 
+  #
   # As with Prawn::Document#initialize, if the block has no arguments, it will
   # be evaluated in the context of the object itself. The above code could be
   # rewritten as:
@@ -110,7 +113,7 @@ module Prawn
   #     rows(1..3).width = 72
   #   end
   #
-  class Table  
+  class Table
 
     # Set up a table on the given document. Arguments:
     #
@@ -137,7 +140,7 @@ module Prawn
       set_column_widths
       set_row_heights
       position_cells
-    end                                        
+    end
 
     # Number of rows in the table.
     #
@@ -165,7 +168,7 @@ module Prawn
     # The block is passed a Cells object containing all cells to be rendered on
     # that page. You can change styling of the cells in this block, but keep in
     # mind that the cells have already been positioned and sized.
-    # 
+    #
     def before_rendering_page(&block)
       @before_rendering_page = block
     end
@@ -179,9 +182,9 @@ module Prawn
     # Sets column widths for the table. The argument can be one of the following
     # types:
     #
-    # +Array+:: 
+    # +Array+::
     #   <tt>[w0, w1, w2, ...]</tt> (specify a width for each column)
-    # +Hash+:: 
+    # +Hash+::
     #   <tt>{0 => w0, 1 => w1, ...}</tt> (keys are column names, values are
     #   widths)
     # +Numeric+::
@@ -207,8 +210,9 @@ module Prawn
     end
 
     # If +true+, designates the first row as a header row to be repeated on
-    # every page. Does not change row numbering -- row numbers always index into
-    # the data array provided, with no modification.
+    # every page. If an integer, designates the number of rows to be treated
+    # as a header Does not change row numbering -- row numbers always index
+    # into the data array provided, with no modification.
     #
     attr_writer :header
 
@@ -277,7 +281,13 @@ module Prawn
           # If there isn't enough room left on the page to fit the first data row
           # (excluding the header), start the table on the next page.
           needed_height = row(0).height
-          needed_height += row(1).height if @header
+          if @header
+            if @header.is_a? Integer
+              needed_height += row(1..@header).height
+            else
+              needed_height += row(1).height
+            end
+          end
           if needed_height > @pdf.y - ref_bounds.absolute_bottom
             @pdf.bounds.move_past_bottom
             offset = @pdf.y
@@ -289,7 +299,13 @@ module Prawn
         # modified in before_rendering_page callbacks.
         if @header
           @header_row = Cells.new
-          row(0).each { |cell| @header_row[cell.row, cell.column] = cell.dup }
+          if @header.is_a? Integer
+            @header.times do |r|
+              row(r).each { |cell| @header_row[cell.row, cell.column] = cell.dup }
+            end
+          else
+            row(0).each { |cell| @header_row[cell.row, cell.column] = cell.dup }
+          end
         end
 
         # Track cells to be drawn on this page. They will all be drawn when this
@@ -300,8 +316,8 @@ module Prawn
           if cell.height > (cell.y + offset) - ref_bounds.absolute_bottom &&
              cell.row > started_new_page_at_row
             # Ink all cells on the current page
-            if @before_rendering_page
-              c = Cells.new(cells_this_page.map { |c, _| c })
+            if defined?(@before_rendering_page) && @before_rendering_page
+              c = Cells.new(cells_this_page.map { |ci, _| ci })
               @before_rendering_page.call(c)
             end
             Cell.draw_cells(cells_this_page)
@@ -309,31 +325,49 @@ module Prawn
 
             # start a new page or column
             @pdf.bounds.move_past_bottom
+            x_offset = @pdf.bounds.left_side - @pdf.bounds.absolute_left
             if cell.row > 0 && @header
-              header_height = add_header(cells_this_page, @pdf.cursor, cell.row-1)
+              if @header.is_a? Integer
+                header_height = 0
+                y_coord = @pdf.cursor
+                @header.times do |h|
+                  additional_header_height = add_header(cells_this_page, x_offset, y_coord-header_height, cell.row-1, h)
+                  header_height += additional_header_height
+                end
+              else
+                header_height = add_header(cells_this_page, x_offset, @pdf.cursor, cell.row-1)
+              end
             else
               header_height = 0
             end
             offset = @pdf.y - cell.y - header_height
             started_new_page_at_row = cell.row
           end
-   
+
           # Don't modify cell.x / cell.y here, as we want to reuse the original
           # values when re-inking the table. #draw should be able to be called
           # multiple times.
           x, y = cell.x, cell.y
-          y += offset 
+          y += offset
 
-          # Translate coordinates to the bounds we are in, since drawing is 
+          # Translate coordinates to the bounds we are in, since drawing is
           # relative to the cursor, not ref_bounds.
           x += @pdf.bounds.left_side - @pdf.bounds.absolute_left
           y -= @pdf.bounds.absolute_bottom
 
           # Set background color, if any.
-          if @row_colors && (!@header || cell.row > 0)
+          if defined?(@row_colors) && @row_colors && (!@header || cell.row > 0)
             # Ensure coloring restarts on every page (to make sure the header
             # and first row of a page are not colored the same way).
-            index = cell.row - [started_new_page_at_row, @header ? 1 : 0].max
+            if @header.is_a? Integer
+              rows = @header
+            elsif @header
+              rows = 1
+            else
+              rows = 0
+            end
+            index = cell.row - [started_new_page_at_row, rows].max
+
             cell.background_color ||= @row_colors[index % @row_colors.length]
           end
 
@@ -341,8 +375,8 @@ module Prawn
           last_y = y
         end
         # Draw the last page of cells
-        if @before_rendering_page
-          c = Cells.new(cells_this_page.map { |c, _| c })
+        if defined?(@before_rendering_page) && @before_rendering_page
+          c = Cells.new(cells_this_page.map { |ci, _| ci })
           @before_rendering_page.call(c)
         end
         Cell.draw_cells(cells_this_page)
@@ -426,7 +460,7 @@ module Prawn
       assert_proper_table_data(data)
 
       cells = Cells.new
-      
+
       row_number = 0
       data.each do |row_cells|
         column_number = 0
@@ -449,7 +483,7 @@ module Prawn
               next if i == 0 && j == 0
 
               # It is an error to specify spans that overlap; catch this here
-              if bad_cell = cells[row_number + i, column_number + j]
+              if cells[row_number + i, column_number + j]
                 raise Prawn::Errors::InvalidTableSpan,
                   "Spans overlap at row #{row_number + i}, " +
                   "column #{column_number + j}."
@@ -481,19 +515,22 @@ module Prawn
       cells
     end
 
-    # Add the header row to the given array of cells at the given y-position.
+    # Add the header row(s) to the given array of cells at the given y-position.
     # Number the row with the given +row+ index, so that the header appears (in
     # any Cells built for this page) immediately prior to the first data row on
     # this page.
     #
     # Return the height of the header.
     #
-    def add_header(page_of_cells, y, row)
-      @header_row.each do |cell|
+    def add_header(page_of_cells, x_offset, y, row, row_of_header=nil)
+      rows_to_operate_on = @header_row
+      rows_to_operate_on = @header_row.rows(row_of_header) if row_of_header
+      rows_to_operate_on.each do |cell|
         cell.row = row
-        page_of_cells << [cell, [cell.x, y]]
+        cell.dummy_cells.each {|c| c.row = row }
+        page_of_cells << [cell, [cell.x + x_offset, y]]
       end
-      @header_row.height
+      rows_to_operate_on.height
     end
 
     # Raises an error if the data provided cannot be converted into a valid
@@ -515,21 +552,7 @@ module Prawn
     # Returns an array of each column's natural (unconstrained) width.
     #
     def natural_column_widths
-      @natural_column_widths ||=
-        begin
-          widths_by_column = Hash.new(0)
-          cells.each do |cell|
-            next if cell.is_a?(Cell::SpanDummy)
-
-            # Split the width of colspanned cells evenly by columns
-            width_per_column = cell.width.to_f / cell.colspan
-            cell.colspan.times do |i|
-              widths_by_column[cell.column + i] =
-                [widths_by_column[cell.column + i], width_per_column].max
-            end
-          end
-          widths_by_column.sort_by { |col, _| col }.map { |_, w| w }
-        end
+      @natural_column_widths ||= ColumnWidthCalculator.new(cells).natural_widths
     end
 
     # Returns the "natural" (unconstrained) width of the table. This may be
@@ -547,7 +570,7 @@ module Prawn
     # values that will be used to ink the table.
     #
     def set_column_widths
-      column_widths.each_with_index do |w, col_num| 
+      column_widths.each_with_index do |w, col_num|
         column(col_num).width = w
       end
     end
@@ -564,7 +587,7 @@ module Prawn
     #
     def position_cells
       # Calculate x- and y-positions as running sums of widths / heights.
-      x_positions = column_widths.inject([0]) { |ary, x| 
+      x_positions = column_widths.inject([0]) { |ary, x|
         ary << (ary.last + x); ary }[0..-2]
       x_positions.each_with_index { |x, i| column(i).x = x }
 
@@ -579,7 +602,7 @@ module Prawn
     # :position option, and yields.
     #
     def with_position
-      x = case @position || :left
+      x = case defined?(@position) && @position || :left
           when :left   then return yield
           when :center then (@pdf.bounds.width - width) / 2.0
           when :right  then  @pdf.bounds.width - width