@@ -291,8 +291,7 @@ module Prawn contents.first.background_color = C(:header_color) end - rows_to_skip_coloring = C(:headers) ? 1 : 0 - contents.each_with_index do |x,index| + contents.each do |x| unless x.background_color if C(:row_colors) && index >= rows_to_skip_coloring x.background_color = next_row_color lib/prawn/document/table.rb @@ -73,99 +73,6 @@ describe "A table's height" do end -describe "Table background colors" do - setup do - @default_row_count = 6 - @data = [["foo","bar"]] * @default_row_count - @headers = ["baz","foobar"] - end - - def expect_background_color( color ) - Prawn::Graphics::CellBlock.any_instance.expects(:background_color=).with(color) - end - - it "should correctly cycle row colors for PDF::Writer rows and an uncolored header" do - row_colors = :pdf_writer - odd_row_color = "cccccc" # These colors are copied from table.rb Perhaps they - even_row_color = "ffffff" # should be constants in Prawn::Document or elsewhere? - - (@default_row_count/2).times do - expect_background_color( odd_row_color ) - expect_background_color( even_row_color ) - end - - Prawn::Document.new.table(@data, :headers => @headers, :row_colors => row_colors ) - end - - it "should correctly cycle row colors for a custom row color set and an uncolored header" do - odd_row_color = "CC0000" - even_row_color = "0000BB" - row_colors = [ odd_row_color, even_row_color ] - - (@default_row_count/2).times do - expect_background_color( odd_row_color ) - expect_background_color( even_row_color ) - end - - Prawn::Document.new.table(@data, :headers => @headers, :row_colors => row_colors ) - end - - it "should correctly cycle row colors and apply a custom header color when specified" do - header_row_color = "00DD00" - odd_row_color = "CC0000" - even_row_color = "0000BB" - row_colors = [ odd_row_color, even_row_color ] - - expect_background_color( header_row_color ) - (@default_row_count/2).times do - expect_background_color( odd_row_color ) - expect_background_color( even_row_color ) - end - - Prawn::Document.new.table(@data, :headers => @headers, :header_color => header_row_color, :row_colors => row_colors ) - end - - it "should correctly cycle row colors even if a header color is specified for a headerless table" do - header_row_color = "00DD00" - odd_row_color = "CC0000" - even_row_color = "0000BB" - row_colors = [ odd_row_color, even_row_color ] - - (@default_row_count/2).times do - expect_background_color( odd_row_color ) - expect_background_color( even_row_color ) - end - - Prawn::Document.new.table(@data, :header_color => @header_row_color, :row_colors => row_colors ) - end - - it "should correctly cycle row colors even when only one row color is specified" do - row_color = "0000BB" - row_colors = [ row_color ] - - @default_row_count.times do - expect_background_color( row_color ) - end - - Prawn::Document.new.table(@data, :row_colors => row_colors ) - end - - it "should correctly cycle row colors even when more than two row colors are specified" do - row_color_1 = "0000BB" - row_color_2 = "00CC00" - row_color_3 = "DD0000" - row_colors = [ row_color_1, row_color_2, row_color_3 ] - - (@default_row_count/3).times do - expect_background_color( row_color_1 ) - expect_background_color( row_color_2 ) - expect_background_color( row_color_3 ) - end - - Prawn::Document.new.table(@data, :row_colors => row_colors ) - end -end - describe "A table's content" do it "should output content cell by cell, row by row" do @@ -202,7 +109,7 @@ describe "A table's content" do @pdf.table(data) }.should.not.raise end - + it "should paginate for large tables" do # 30 rows fit on the table with default setting, 31 exceed. data = [["foo"]] * 31 spec/table_spec.rb 664a4615e2c301143143065994caa7eb1390bd0e Gregory Brown gregory.t.brown@gmail.com http://github.com/sandal/prawn/commit/62ef569f5b52fff55fe895e42e209c52682b2914 62ef569f5b52fff55fe895e42e209c52682b2914 2008-11-07T19:20:24-08:00 2008-11-07T19:20:24-08:00 fix merge conflicts 93a50ba9f933928dbb512c48900d37b3fdb921dc Gregory Brown gregory.t.brown@gmail.com