prawn 1.0.0.rc1 → 1.0.0.rc2

data/spec/cell_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")  
+require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 
 module CellHelpers
 
@@ -10,10 +10,6 @@ module CellHelpers
     Prawn::Table::Cell::Text.new(@pdf, at, options)
   end
 
-  def close?(actual, expected, epsilon=0.01)
-    (actual - expected).abs < epsilon
-  end
-
 end
 
 describe "Prawn::Table::Cell" do
@@ -30,13 +26,18 @@ describe "Prawn::Table::Cell" do
     end
 
     it "should return a Cell" do
-      @pdf.cell(:content => "text").should.be.a.kind_of Prawn::Table::Cell
+      @pdf.cell(:content => "text").should be_a_kind_of Prawn::Table::Cell
+    end
+
+    it "accepts :content => nil in a hash" do
+      @pdf.cell(:content => nil).should be_a_kind_of(Prawn::Table::Cell::Text)
+      @pdf.make_cell(:content => nil).should be_a_kind_of(Prawn::Table::Cell::Text)
     end
 
     it "should convert nil, Numeric, and Date values to strings" do
       [nil, 123, 123.45, Date.today].each do |value|
         c = @pdf.cell(:content => value)
-        c.should.be.a.kind_of Prawn::Table::Cell::Text
+        c.should be_a_kind_of Prawn::Table::Cell::Text
         c.content.should == value.to_s
       end
     end
@@ -45,7 +46,7 @@ describe "Prawn::Table::Cell" do
       # used for table([[{:text => "...", :font_style => :bold, ...}, ...]])
       c = Prawn::Table::Cell.make(@pdf,
                                   {:content => 'hello', :font_style => :bold})
-      c.should.be.a.kind_of Prawn::Table::Cell::Text
+      c.should be_a_kind_of Prawn::Table::Cell::Text
       c.content.should == "hello"
       c.font.name.should == 'Helvetica-Bold'
     end
@@ -56,22 +57,22 @@ describe "Prawn::Table::Cell" do
       @pdf.expects(:move_down)
       @pdf.expects(:draw_text!).with { |text, options| text == "hello world" }
 
-      @pdf.cell(:content => "hello world", 
+      @pdf.cell(:content => "hello world",
                 :at => [10, 20],
                 :padding => [30, 40],
-                :size => 7, 
+                :size => 7,
                 :font_style => :bold)
     end
   end
-  
+
   describe "Prawn::Document#make_cell" do
     it "should not draw the cell" do
       Prawn::Table::Cell::Text.any_instance.expects(:draw).never
       @pdf.make_cell("text")
     end
-    
+
     it "should return a Cell" do
-      @pdf.make_cell("text", :size => 7).should.be.a.kind_of Prawn::Table::Cell
+      @pdf.make_cell("text", :size => 7).should be_a_kind_of Prawn::Table::Cell
     end
   end
 
@@ -103,7 +104,7 @@ describe "Prawn::Table::Cell" do
 
     it "should incorporate padding when specified" do
       c = cell(:content => "text", :padding => [1, 2, 3, 4])
-      c.width.should.be.close(@pdf.width_of("text") + 6, 0.01)
+      c.width.should be_within(0.01).of(@pdf.width_of("text") + 6)
     end
 
     it "should allow width to be reset after it has been calculated" do
@@ -117,7 +118,7 @@ describe "Prawn::Table::Cell" do
     it "should return proper width with size set" do
       text = "text " * 4
       c = cell(:content => text, :size => 7)
-      c.width.should == 
+      c.width.should ==
         @pdf.width_of(text, :size => 7) + c.padding[1] + c.padding[3]
     end
 
@@ -128,7 +129,7 @@ describe "Prawn::Table::Cell" do
 
     it "content_width should exclude padding even with manual :width" do
       c = cell(:content => "text", :padding => 10, :width => 400)
-      c.content_width.should.be.close(380, 0.01)
+      c.content_width.should be_within(0.01).of(380)
     end
 
     it "should have a reasonable minimum width that can fit @content" do
@@ -136,9 +137,9 @@ describe "Prawn::Table::Cell" do
       min_content_width = c.min_width - c.padding[1] - c.padding[3]
 
       lambda { @pdf.height_of("text", :width => min_content_width) }.
-        should.not.raise(Prawn::Errors::CannotFit)
+        should_not raise_error(Prawn::Errors::CannotFit)
 
-      @pdf.height_of("text", :width => min_content_width).should.be <
+      @pdf.height_of("text", :width => min_content_width).should be <
         (5 * @pdf.height_of("text"))
     end
 
@@ -147,14 +148,14 @@ describe "Prawn::Table::Cell" do
       c.padding = 0
 
       # Make sure we use the new value of padding in calculating min_width
-      c.min_width.should.be < 100
+      c.min_width.should be < 100
     end
 
     it "should defer min_width's evaluation of size" do
       c = cell(:content => "text", :size => 50)
       c.size = 8
       c.padding = 0
-      c.min_width.should.be < 10
+      c.min_width.should be < 10
     end
 
   end
@@ -164,7 +165,7 @@ describe "Prawn::Table::Cell" do
 
     it "should be calculated for text" do
       c = cell(:content => "text")
-      c.height.should == 
+      c.height.should ==
         @pdf.height_of("text", :width => @pdf.width_of("text")) +
         c.padding[0] + c.padding[3]
     end
@@ -176,8 +177,8 @@ describe "Prawn::Table::Cell" do
 
     it "should incorporate :padding when specified" do
       c = cell(:content => "text", :padding => [1, 2, 3, 4])
-      c.height.should.be.close(1 + 3 +
-        @pdf.height_of("text", :width => @pdf.width_of("text")), 0.01)
+      c.height.should be_within(0.01).of(1 + 3 +
+        @pdf.height_of("text", :width => @pdf.width_of("text")))
     end
 
     it "should allow height to be reset after it has been calculated" do
@@ -211,10 +212,10 @@ describe "Prawn::Table::Cell" do
       c = cell(:content => "text", :padding => 10)
       c.content_height.should == @pdf.height_of("text")
     end
-    
+
     it "content_height should exclude padding even with manual :height" do
       c = cell(:content => "text", :padding => 10, :height => 400)
-      c.content_height.should.be.close(380, 0.01)
+      c.content_height.should be_within(0.01).of(380)
     end
   end
 
@@ -235,7 +236,7 @@ describe "Prawn::Table::Cell" do
       c = cell(:content => "text", :padding => [20, 30])
       c.padding.should == [20, 30, 20, 30]
     end
-    
+
     it "should accept [t,h,b]" do
       c = cell(:content => "text", :padding => [10, 20, 30])
       c.padding.should == [10, 20, 30, 20]
@@ -249,7 +250,7 @@ describe "Prawn::Table::Cell" do
     it "should reject other formats" do
       lambda{
         cell(:content => "text", :padding => [10])
-      }.should.raise(ArgumentError)
+      }.should raise_error(ArgumentError)
     end
   end
 
@@ -263,10 +264,10 @@ describe "Prawn::Table::Cell" do
       @pdf.stubs(:fill_color)
       @pdf.expects(:fill_color).with('123456')
       @pdf.expects(:fill_rectangle).checking do |(x, y), w, h|
-        x.should.be.close(0, 0.01)
-        y.should.be.close(@pdf.cursor, 0.01)
-        w.should.be.close(29.344, 0.01)
-        h.should.be.close(23.872, 0.01)
+        x.should be_within(0.01).of(0)
+        y.should be_within(0.01).of(@pdf.cursor)
+        w.should be_within(0.01).of(29.344)
+        h.should be_within(0.01).of(23.872)
       end
       @pdf.cell(:content => "text", :background_color => '123456')
     end
@@ -279,10 +280,10 @@ describe "Prawn::Table::Cell" do
       @pdf.stubs(:fill_color)
       @pdf.expects(:fill_color).with('123456')
       @pdf.expects(:fill_rectangle).checking do |(x, y), w, h|
-        x.should.be.close(12.0, 0.01)
-        y.should.be.close(34.0, 0.01)
-        w.should.be.close(29.344, 0.01)
-        h.should.be.close(23.872, 0.01)
+        x.should be_within(0.01).of(12.0)
+        y.should be_within(0.01).of(34.0)
+        w.should be_within(0.01).of(29.344)
+        h.should be_within(0.01).of(23.872)
       end
       c = @pdf.make_cell(:content => "text", :background_color => '123456')
       c.draw([12.0, 34.0])
@@ -408,8 +409,34 @@ describe "Prawn::Table::Cell" do
         :border_width => [2, 3, 4, 5])
       c.border_widths.should == [2, 3, 4, 5]
     end
+    
+    it "should set default border lines to :solid" do
+      c = @pdf.cell(:content => "text")
+      c.border_top_line.should == :solid
+      c.border_right_line.should == :solid
+      c.border_bottom_line.should == :solid
+      c.border_left_line.should == :solid
+      c.border_lines.should == [:solid] * 4
+    end
+    
+    it "should set border line with :border_..._line" do
+      c = @pdf.cell(:content => "text", :border_bottom_line => :dotted)
+      c.border_bottom_line.should == :dotted
+      c.border_lines[2].should == :dotted
+    end
+
+    it "should set border lines with :border_lines" do
+      c = @pdf.cell(:content => "text",
+        :border_lines => [:solid, :dotted, :dashed, :solid])
+      c.border_lines.should == [:solid, :dotted, :dashed, :solid]
+    end
   end
 
+
+
+
+
+
   describe "Text cell attributes" do
     include CellHelpers
 
@@ -498,7 +525,6 @@ describe "Prawn::Table::Cell" do
       c.content_width.should == font.compute_width_of("text")
     end
   end
-
 end
 
 describe "Image cells" do
@@ -509,11 +535,11 @@ describe "Image cells" do
   describe "with default options" do
     before(:each) do
       @cell = Prawn::Table::Cell.make(@pdf,
-        :image => "#{Prawn::BASEDIR}/data/images/prawn.png")
+        :image => "#{Prawn::DATADIR}/images/prawn.png")
     end
 
     it "should create a Cell::Image" do
-      @cell.should.be.a.kind_of(Prawn::Table::Cell::Image)
+      @cell.should be_a_kind_of(Prawn::Table::Cell::Image)
     end
 
     it "should pull the natural width and height from the image" do
@@ -525,7 +551,7 @@ describe "Image cells" do
   describe "hash syntax" do
     before(:each) do
       @table = @pdf.make_table([[{
-        :image => "#{Prawn::BASEDIR}/data/images/prawn.png",
+        :image => "#{Prawn::DATADIR}/images/prawn.png",
         :scale => 2,
         :fit => [100, 200],
         :image_width => 123,
@@ -538,7 +564,7 @@ describe "Image cells" do
 
 
     it "should create a Cell::Image" do
-      @cell.should.be.a.kind_of(Prawn::Table::Cell::Image)
+      @cell.should be_a_kind_of(Prawn::Table::Cell::Image)
     end
 
     it "should pass through image options" do

data/spec/column_box_spec.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
+
+describe "A column box" do
+  it "has sensible left and right values" do
+    create_pdf
+    @pdf.column_box [0, @pdf.cursor], :width => @pdf.bounds.width,
+      :height => 200, :columns => 3, :spacer => 25 do
+        left = @pdf.bounds.left
+        right = @pdf.bounds.right
+
+        @pdf.bounds.move_past_bottom # next column
+
+        @pdf.bounds.left.should be > left
+        @pdf.bounds.left.should be > right
+        @pdf.bounds.right.should be > @pdf.bounds.left
+      end
+  end
+
+  it "includes spacers between columns but not at the end" do
+    create_pdf
+    @pdf.column_box [0, @pdf.cursor], :width => 500,
+      :height => 200, :columns => 3, :spacer => 25 do
+        @pdf.bounds.width.should == 150 # (500 - (25 * 2)) / 3
+
+        @pdf.bounds.move_past_bottom
+        @pdf.bounds.move_past_bottom
+
+        @pdf.bounds.right.should == 500
+      end
+  end
+end

data/spec/document_spec.rb

@@ -12,7 +12,7 @@ describe "Prawn::Document.new" do
 end
 
 describe "The cursor" do
-  it "should equal pdf.y - bounds.absolute_bottom" do
+  it "should == pdf.y - bounds.absolute_bottom" do
     pdf = Prawn::Document.new
     pdf.cursor.should == pdf.bounds.top
     
@@ -34,7 +34,7 @@ describe "when generating a document from a subclass" do
     custom_document = Class.new(Prawn::Document)
     custom_document.generate(Tempfile.new("generate_test").path) do |e| 
       e.class.should == custom_document
-      e.should.be.kind_of(Prawn::Document)
+      e.should be_a_kind_of(Prawn::Document)
     end
   end
 
@@ -45,20 +45,20 @@ describe "when generating a document from a subclass" do
     Prawn::Document.extensions << mod1 << mod2
 
     custom_document = Class.new(Prawn::Document)
-    assert_equal [mod1, mod2], custom_document.extensions
+    custom_document.extensions.should == [mod1, mod2]
 
     # remove the extensions we added to prawn document
     Prawn::Document.extensions.delete(mod1)
     Prawn::Document.extensions.delete(mod2)
 
-    assert ! Prawn::Document.new.respond_to?(:test_extensions1)
-    assert ! Prawn::Document.new.respond_to?(:test_extensions2)
+    Prawn::Document.new.respond_to?(:test_extensions1).should be_false
+    Prawn::Document.new.respond_to?(:test_extensions2).should be_false
 
     # verify these still exist on custom class
-    assert_equal [mod1, mod2], custom_document.extensions
+    custom_document.extensions.should == [mod1, mod2]
 
-    assert custom_document.new.respond_to?(:test_extensions1)
-    assert custom_document.new.respond_to?(:test_extensions2)
+    custom_document.new.respond_to?(:test_extensions1).should be_true
+    custom_document.new.respond_to?(:test_extensions2).should be_true
   end
 
 end
@@ -89,7 +89,7 @@ describe "When beginning each new page" do
 
   describe "Background template feature" do
     before(:each) do
-      @filename = "#{Prawn::BASEDIR}/data/images/pigs.jpg"
+      @filename = "#{Prawn::DATADIR}/images/pigs.jpg"
       @pdf = Prawn::Document.new(:background => @filename)
     end
     it "should place a background image if it is in options block" do
@@ -235,11 +235,11 @@ describe "Document compression" do
     doc_uncompressed = Prawn::Document.new
     doc_compressed   = Prawn::Document.new(:compress => true)
     [doc_compressed, doc_uncompressed].each do |pdf|
-       pdf.font "#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf"
+       pdf.font "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
        pdf.text "更可怕的是，同质化竞争对手可以按照URL中后面这个ID来遍历" * 10
     end
 
-    doc_compressed.render.length.should.be < doc_uncompressed.render.length
+    doc_compressed.render.length.should be < doc_uncompressed.render.length
   end 
 
 end                                 
@@ -266,7 +266,7 @@ describe "When reopening pages" do
     # MalformedPDFError raised if content stream actual length does not match
     # dictionary length
     lambda{ PDF::Inspector::Page.analyze(@pdf.render) }.
-      should.not.raise(PDF::Reader::MalformedPDFError)
+      should_not raise_error(PDF::Reader::MalformedPDFError)
   end
 
   it "should insert pages after the current page when calling start_new_page" do
@@ -358,8 +358,8 @@ describe "The mask() feature" do
     @pdf.mask(:y, :line_width) do
       @pdf.y = y + 1
       @pdf.line_width = line_width + 1
-      @pdf.y.should.not == y
-      @pdf.line_width.should.not == line_width
+      @pdf.y.should_not == y
+      @pdf.line_width.should_not == line_width
     end
     @pdf.y.should == y
     @pdf.line_width.should == line_width 
@@ -391,14 +391,14 @@ describe "The group() feature" do
     pages[1][:strings].should == ["Hello", "World"]
   end
 
-  it "should raise CannotGroup if the content is too tall" do
+  it "should raise_error CannotGroup if the content is too tall" do
     lambda {
       Prawn::Document.new do
         group do
           100.times { text "Too long" }
         end
       end.render
-    }.should.raise(Prawn::Errors::CannotGroup)
+    }.should raise_error(Prawn::Errors::CannotGroup)
   end
 
    it "should group within individual column boxes" do
@@ -478,7 +478,7 @@ describe "The :optimize_objects option" do
     wasteful_pdf = Prawn::Document.new(&@wasteful_doc)
     frugal_pdf   = Prawn::Document.new(:optimize_objects => true,
                                        &@wasteful_doc)
-    frugal_pdf.render.size.should.be < wasteful_pdf.render.size
+    frugal_pdf.render.size.should be < wasteful_pdf.render.size
   end
 
   it "should default to :false" do
@@ -676,6 +676,27 @@ describe "The number_pages method" do
       end
     end
   end
+
+  context "height option" do
+    before do
+      @pdf.start_new_page
+    end
+
+    it "with 10 height" do
+      @pdf.expects(:text_box).with("1 1", { :height => 10 })
+      @pdf.number_pages "<page> <total>", :height => 10
+    end
+
+    it "with nil height" do
+      @pdf.expects(:text_box).with("1 1", { :height => nil })
+      @pdf.number_pages "<page> <total>", :height => nil
+    end
+
+    it "with no height" do
+      @pdf.expects(:text_box).with("1 1", { :height => 50 })
+      @pdf.number_pages "<page> <total>"
+    end
+  end
 end
 
 describe "The page_match? method" do
@@ -685,31 +706,31 @@ describe "The page_match? method" do
   end
   
   it "returns nil given no filter" do
-    assert ! @pdf.page_match?(:nil, 1)
+    @pdf.page_match?(:nil, 1).should be_false
   end
   
   it "must provide an :all filter" do
-    assert (1..@pdf.page_count).all? { |i| @pdf.page_match?(:all, i) }
+    (1..@pdf.page_count).all? { |i| @pdf.page_match?(:all, i) }.should be_true
   end
 
   it "must provide an :odd filter" do
     odd, even = (1..@pdf.page_count).partition { |e| e % 2 == 1 }
-    assert odd.all? { |i| @pdf.page_match?(:odd, i) }
-    assert ! even.any? { |i| @pdf.page_match?(:odd, i) }
+    odd.all? { |i| @pdf.page_match?(:odd, i) }.should be_true
+    even.any? { |i| @pdf.page_match?(:odd, i) }.should be_false
   end
 
   it "must be able to filter by an array of page numbers" do
     fltr = [1,2,7]
-    assert_equal [1,2,7], (1..10).select { |i| @pdf.page_match?(fltr, i) }
+    (1..10).select { |i| @pdf.page_match?(fltr, i) }.should == [1,2,7]
   end
 
   it "must be able to filter by a range of page numbers" do
     fltr = 2..4
-    assert_equal [2,3,4], (1..10).select { |i| @pdf.page_match?(fltr, i) }
+    (1..10).select { |i| @pdf.page_match?(fltr, i) }.should == [2,3,4]
   end
 
   it "must be able to filter by an arbitrary proc" do
     fltr = lambda { |x| x == 1 or x % 3 == 0 }
-    assert_equal [1,3,6,9], (1..10).select { |i| @pdf.page_match?(fltr, i) }
+    (1..10).select { |i| @pdf.page_match?(fltr, i) }.should == [1,3,6,9]
   end    
 end