prawn-layout 0.7.1 → 0.7.2

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 require "rake/rdoctask"
 require "rake/gempackagetask"  
 
-PRAWN_LAYOUT_VERSION = "0.7.1" 
+PRAWN_LAYOUT_VERSION = "0.7.2" 
 
 task :default => [:test]
        

data/lib/prawn/layout/grid.rb

@@ -3,7 +3,7 @@ module Prawn
     
     # Defines the grid system for a particular document.  Takes the number of 
     # rows and columns and the width to use for the gutter as the 
-    # keys :rows, :columns, :gutter
+    # keys :rows, :columns, :gutter, :row_gutter, :column_gutter
     #
     def define_grid(options = {})
       @grid = Grid.new(self, options)
@@ -171,9 +171,13 @@ module Prawn
       # Diagnostic method
       def show(grid_color = "CCCCCC")
         self.bounding_box do
+          original_stroke_color = pdf.stroke_color
+
           pdf.stroke_color = grid_color
           pdf.text self.name
           pdf.stroke_bounds
+          
+          pdf.stroke_color = original_stroke_color
         end
       end
     

data/lib/prawn/table/cell.rb

@@ -189,7 +189,7 @@ module Prawn
           old_color = @document.fill_color || "000000"
           @document.fill_color @text_color if @text_color                        
           @document.text @text, options
-          @document.fill_color "000000"
+          @document.fill_color old_color
         end
       end
 
@@ -247,7 +247,7 @@ module Prawn
 
       def draw
         y = @document.y
-        x = @document.bounds.absolute_left
+        x = @document.bounds.left_side
 
         @cells.each do |e|
           e.point  = [x - @document.bounds.absolute_left, 

data/lib/prawn/table.rb

@@ -331,11 +331,11 @@ module Prawn
           bbox = @parent_bounds.stretchy? ? @document.margin_box : @parent_bounds
           if c.height > y_pos - bbox.absolute_bottom
             if C(:headers) && page_contents.length == 1
-              @document.start_new_page
+              @parent_bounds.move_past_bottom
               y_pos = @document.y
             else
               draw_page(page_contents)
-              @document.start_new_page
+              @parent_bounds.move_past_bottom
               if C(:headers) && page_contents.any?
                 page_contents = [page_contents[0]]
                 y_pos = @document.y - page_contents[0].height

data/spec/grid_spec.rb

@@ -57,5 +57,29 @@ describe "A document's grid" do
       @pdf.grid([1,3], [2,5]).bottom_left.should  == [330.0, 456.25]
       @pdf.grid([1,3], [2,5]).bottom_right.should == [650.0, 456.25]
     end
+
+    it "should draw outlines without changing global default colors to grid color" do
+      @pdf.grid.show_all('cccccc')
+
+      colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render)
+      colors.fill_color.should.not   == [0.8,0.8,0.8]
+      colors.stroke_color.should.not == [0.8,0.8,0.8]
+      
+      # Hardcoded default color as I haven't been able to come up with a stable converter
+      # between fill_color without lots code.
+      colors.fill_color.should   == [0.0,0.0,0.0]
+      colors.stroke_color.should == [0.0,0.0,0.0]
+    end
+
+    it "should draw outlines without curent color settings" do
+      @pdf.fill_color "ccff00"
+      @pdf.stroke_color "ffcc00"
+
+      @pdf.grid.show_all
+
+      colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render)
+      colors.fill_color.should   == [0.8,1.0,0.0]
+      colors.stroke_color.should == [1.0,0.8,0.0]
+    end
   end
 end

data/spec/table_spec.rb

@@ -319,3 +319,19 @@ describe "An invalid table" do
   end   
 
 end
+
+describe "A table, in a column box" do
+
+  it "should flow to the next column rather than always the next page" do
+    pdf = Prawn::Document.new do
+      column_box [0, cursor], :width => bounds.width, :columns => 2 do
+        # 35 rows fit on two columns but not one
+        table [["data"]] * 35
+      end
+    end
+
+    pdf.page_count.should == 1
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: prawn-layout
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Gregory Brown
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-03 00:00:00 -05:00
+date: 2010-01-31 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: An extension to Prawn that provides table support and other layout functionality
+description: "  An extension to Prawn that provides table support and other layout functionality\n"
 email: "  gregory.t.brown@gmail.com"
 executables: []
 
@@ -22,17 +22,14 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- examples/grid
 - examples/grid/column_gutter_grid.rb
 - examples/grid/show_grid.rb
 - examples/grid/multi_boxes.rb
 - examples/grid/bounding_boxes.rb
 - examples/grid/simple_grid.rb
-- examples/page_layout
 - examples/page_layout/padded_box.rb
 - examples/page_layout/lazy_bounding_boxes.rb
 - examples/example_helper.rb
-- examples/table
 - examples/table/table_header_underline.rb
 - examples/table/currency.csv
 - examples/table/addressbook.csv
@@ -44,12 +41,9 @@ files:
 - examples/table/cell.rb
 - examples/table/table_colspan.rb
 - examples/table/table_header_color.rb
-- lib/prawn
 - lib/prawn/layout.rb
 - lib/prawn/table.rb
-- lib/prawn/table
 - lib/prawn/table/cell.rb
-- lib/prawn/layout
 - lib/prawn/layout/grid.rb
 - lib/prawn/layout/page.rb
 - spec/table_spec.rb
@@ -59,6 +53,8 @@ files:
 - README
 has_rdoc: true
 homepage: http://prawn.majesticseacreature.com
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -83,9 +79,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: prawn
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: An extension to Prawn that provides table support and other layout functionality
 test_files: []