update to use Document#width_of instead of Font#width_of

antunderwood · Jan 28, 2009 · 36be334 · 36be334
1 parent 516f928
commit 36be334
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/prawn/table.rb b/lib/prawn/table.rb
@@ -193,7 +193,7 @@ def calculate_column_widths(manual_widths=nil, width=nil)
       renderable_data.each do |row|
         row.each_with_index do |cell,i|
           length = cell.to_s.lines.map { |e| 
-            @document.font.width_of(e, :size => C(:font_size)) }.max.to_f +
+            @document.width_of(e, :size => C(:font_size)) }.max.to_f +
               2*C(:horizontal_padding)
           @column_widths[i] = length.ceil if length > @column_widths[i]
         end

diff --git a/lib/prawn/table/cell.rb b/lib/prawn/table/cell.rb
@@ -97,7 +97,7 @@ def text_area_width
       # The width of the cell in PDF points
       #
       def width
-        @width || (@document.font.width_of(@text, :size => @font_size)) + 2*@horizontal_padding
+        @width || (@document.width_of(@text, :size => @font_size)) + 2*@horizontal_padding
       end
 
       # The height of the cell in PDF points

diff --git a/spec/table_spec.rb b/spec/table_spec.rb
@@ -19,8 +19,8 @@
     table = Prawn::Table.new( [%w[ foo b ], %w[d foobar]], pdf,
       :horizontal_padding => hpad, :font_size => fs)
 
-    col0_width = pdf.font.width_of("foo", :size => fs)
-    col1_width = pdf.font.width_of("foobar", :size => fs)
+    col0_width = pdf.width_of("foo", :size => fs)
+    col1_width = pdf.width_of("foobar", :size => fs)
 
     table.width.should == col0_width.ceil + col1_width.ceil + 2*columns*hpad
   end
@@ -33,8 +33,8 @@
     stretchy_columns = 2
 
     col0_width = 50
-    col1_width = pdf.font.width_of("foo", :size => fs)
-    col2_width = pdf.font.width_of("foobar", :size => fs)
+    col1_width = pdf.width_of("foo", :size => fs)
+    col2_width = pdf.width_of("foobar", :size => fs)
     col3_width = 150
 
     table = Prawn::Table.new( [%w[snake foo b apple],