prawn-table 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2398c8fa511b1600ca8d94521f5240c5d46ccffd
-  data.tar.gz: 7d39efe42ebc61bf000f59648c4ad1b2c6472e2b
+  metadata.gz: 5bb26b3cd806b99d95c80bc1b14e54727e53ce60
+  data.tar.gz: 9526ad3d0b13f33fc113000409e43e1674604447
 SHA512:
-  metadata.gz: 2bd16b4346b7950c2ab4702d37ff8fa721470a9d16e7974ef0e6cde0d6910fd90221bd0bd3e814008518ba8c625857da6953b081e427b1c0f95f73ea44d0b90c
-  data.tar.gz: 92172c843aee8ed8ffdc2044389a20a3b25a869ba6005b8b5b748243215681b0a3953bc17f234d043669408222293773d21c9ed81927ffb47573fa482d9bb61f
+  metadata.gz: 46f037412934af66b44aebb2b59e46f62161b84426e5d176ebc222211fc9984d8aef573e9c6aff85fb34f8d33757d16192c8de763150ae6735df47746b2e4462
+  data.tar.gz: ad550c5d510339f9464f84c2b8628222701d6163bbb5b05d8e76f08431939c4c41d17e6db93b01c650a6c3743d16176a18f506a1a2b30412ff1552161ad1a176

data/lib/prawn/table.rb

@@ -320,7 +320,11 @@ module Prawn
         cells_this_page = []
 
         @cells.each do |cell|
-          if cell.height > (cell.y + offset) - ref_bounds.absolute_bottom &&
+          # we only need to run this test on the first cell in a row
+          # check if the rows height fits on the page
+          # check if the row is not the first on that page (wouldn't make sense to go to next page in this case)
+          if cell.column == 0 &&
+             row(cell.row).height_with_span > (cell.y + offset) - ref_bounds.absolute_bottom &&
              cell.row > started_new_page_at_row
             # Ink all cells on the current page
             if defined?(@before_rendering_page) && @before_rendering_page

data/lib/prawn/table/cells.rb

@@ -182,6 +182,13 @@ module Prawn
         aggregate_cell_values(:row, :height_ignoring_span, :max)
       end
 
+      # Returns the total height of all rows in the selected set
+      # including spanned cells if the cell is the master cell
+      #
+      def height_with_span
+        aggregate_cell_values(:row, :height, :max)
+      end
+
       # Supports setting arbitrary properties on a group of cells.
       #
       #   table.cells.row(3..6).background_color = 'cc0000'

data/spec/table_spec.rb

@@ -804,6 +804,24 @@ describe "Prawn::Table" do
           'Line 2', 'Line 3']
     end
 
+    context 'when the last row of first page of a table has a rowspan > 1' do
+      it 'should move the cells below that rowspan cell to the next page' do
+        pdf = Prawn::Document.new
+
+        pdf.y = 100 # not enough room for the rowspan cell
+        pdf.table [
+            ['R0C0', 'R0C1', 'R0C2'],
+            ['R1C0', {content: 'R1C1', rowspan: 2}, 'R1C2'],
+            ['R2C0', 'R2C2'],
+        ]
+
+        output = PDF::Inspector::Page.analyze(pdf.render)
+        # Ensure we output the cells of row 2 on the new page only
+        output.pages[0][:strings].should == ['R0C0', 'R0C1', 'R0C2']
+        output.pages[1][:strings].should == ['R1C0', 'R1C1', 'R1C2', 'R2C0', 'R2C2']
+      end
+    end
+
     it "should draw background before borders, but only within pages" do
       seq = sequence("drawing_order")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn-table
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Gregory Brown
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn