prawn 0.11.1 → 0.12.0

data/spec/data/curves.pdf

@@ -0,0 +1,66 @@
+%PDF-1.3
+%����
+1 0 obj
+<< /Creator (Prawn)
+/Producer (Prawn)
+>>
+endobj
+2 0 obj
+<< /Type /Pages
+/Count 1
+/Kids [5 0 R]
+>>
+endobj
+3 0 obj
+<< /Type /Catalog
+/Pages 2 0 R
+>>
+endobj
+4 0 obj
+<< /Length 380
+>>
+stream
+/DeviceRGB cs
+0.000 0.000 0.000 scn
+/DeviceRGB CS
+0.000 0.000 0.000 SCN
+q
+136.000 136.000 m
+96.000 126.000 96.000 126.000 86.000 86.000 c
+S
+246.000 236.000 m
+246.000 241.523 241.523 246.000 236.000 246.000 c
+230.477 246.000 226.000 241.523 226.000 236.000 c
+226.000 230.477 230.477 226.000 236.000 226.000 c
+241.523 226.000 246.000 230.477 246.000 236.000 c
+236.000 236.000 m
+f
+Q
+
+endstream
+endobj
+5 0 obj
+<< /Type /Page
+/Parent 2 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 4 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+>>
+>>
+endobj
+xref
+0 6
+0000000000 65535 f 
+0000000015 00000 n 
+0000000071 00000 n 
+0000000128 00000 n 
+0000000177 00000 n 
+0000000608 00000 n 
+trailer
+<< /Size 6
+/Root 3 0 R
+/Info 1 0 R
+>>
+startxref
+762
+%%EOF

data/spec/document_spec.rb

@@ -3,6 +3,14 @@ require "tempfile"
 
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper") 
 
+describe "Prawn::Document.new" do
+  it "should not modify its argument" do
+    options = {:page_layout => :landscape}
+    Prawn::Document.new(options)
+    options.should == {:page_layout => :landscape}
+  end
+end
+
 describe "The cursor" do
   it "should equal pdf.y - bounds.absolute_bottom" do
     pdf = Prawn::Document.new
@@ -101,6 +109,31 @@ describe "When beginning each new page" do
   
 end
 
+describe "Prawn::Document#float" do
+  it "should restore the original y-position" do
+    create_pdf
+    orig_y = @pdf.y
+    @pdf.float { @pdf.text "Foo" }
+    @pdf.y.should == orig_y
+  end
+
+  it "should teleport across pages if necessary" do
+    create_pdf
+    
+    @pdf.float do
+      @pdf.text "Foo"
+      @pdf.start_new_page
+      @pdf.text "Bar"
+    end
+    @pdf.text "Baz"
+
+    pages = PDF::Inspector::Page.analyze(@pdf.render).pages
+    pages.size.should == 2
+    pages[0][:strings].should == ["Foo", "Baz"]
+    pages[1][:strings].should == ["Bar"]
+  end
+end
+
 describe "The page_number method" do
   it "should be 1 for a new document" do
     pdf = Prawn::Document.new
@@ -250,6 +283,15 @@ describe "When reopening pages" do
     pages[1][:strings].should == ["New page 2"]
     pages[2][:strings].should == ["Old page 2"]
   end
+
+  it "should update the bounding box to the new page's margin box" do
+    Prawn::Document.new do
+      start_new_page :layout => :landscape
+      lsize = [bounds.width, bounds.height]
+      go_to_page 1
+      [bounds.width, bounds.height].should == lsize.reverse
+    end
+  end
 end
 
 describe "When setting page size" do
@@ -292,7 +334,7 @@ describe "When setting page layout" do
     pages.first[:size].should == Prawn::Document::PageGeometry::SIZES["A4"].reverse
   end   
 
-  it "should retain page layout  by default when starting a new page" do
+  it "should retain page layout by default when starting a new page" do
     @pdf = Prawn::Document.new(:page_layout => :landscape)
     @pdf.start_new_page(:trace => true)
     pages = PDF::Inspector::Page.analyze(@pdf.render).pages
@@ -300,6 +342,13 @@ describe "When setting page layout" do
       page[:size].should == Prawn::Document::PageGeometry::SIZES["LETTER"].reverse
     end
   end
+
+  it "should swap the bounds when starting a new page with different layout" do
+    @pdf = Prawn::Document.new
+    size = [@pdf.bounds.width, @pdf.bounds.height]
+    @pdf.start_new_page(:layout => :landscape)
+    [@pdf.bounds.width, @pdf.bounds.height].should == size.reverse
+  end
 end
 
 describe "The mask() feature" do
@@ -529,13 +578,19 @@ describe "The number_pages method" do
     @pdf.number_pages "test, <total>", {:page_filter => :all}
   end
  
-  it "must print the page if the page number matches" do
+  it "must print each page if given the :all page_filter" do
     10.times { @pdf.start_new_page }
-    @pdf.expects(:text_box).at_least_once
+    @pdf.expects(:text_box).times(10)
     @pdf.number_pages "test", {:page_filter => :all}
   end
+  
+  it "must print each page if no :page_filter is specified" do
+    10.times { @pdf.start_new_page }
+    @pdf.expects(:text_box).times(10)
+    @pdf.number_pages "test"
+  end
 
-  it "must not print the page number without a filter" do
+  it "must not print the page number if given a nil filter" do
     10.times { @pdf.start_new_page }
     @pdf.expects(:text_box).never
     @pdf.number_pages "test", {:page_filter => nil}

data/spec/extensions/mocha.rb

@@ -12,12 +12,10 @@
 class ParameterChecker < Mocha::ParametersMatcher
   def initialize(&matching_block)
     @matching_block = matching_block
-    @run_matching_block = false
   end
 
   def match?(actual_parameters = [])
-    @matching_block.call(*actual_parameters) unless @run_matching_block
-    @run_matching_block = true
+    @matching_block.call(*actual_parameters)
 
     true # always succeed
   end

data/spec/font_spec.rb

@@ -20,6 +20,15 @@ describe "#width_of" do
       @pdf.width_of("hello world").should == original_width + 11 * 7
     end
   end
+
+  it "should exclude newlines" do
+    create_pdf
+    # Use a TTF font that has a non-zero width for \n
+    @pdf.font("#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf")
+
+    @pdf.width_of("\nhello world\n").should ==
+      @pdf.width_of("hello world")
+  end
 end
 
 describe "#font_size" do
@@ -353,3 +362,17 @@ describe "DFont fonts" do
     assert_equal f2.object_id, @pdf.find_font(@file, :font => "ActionMan-Bold").object_id
   end
 end
+
+describe "#character_count(text)" do
+  it "should work on TTF fonts" do
+    create_pdf
+    @pdf.font("#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf")
+    @pdf.font.character_count("こんにちは世界").should == 7
+    @pdf.font.character_count("Hello, world!").should == 13
+  end
+
+  it "should work on AFM fonts" do
+    create_pdf
+    @pdf.font.character_count("Hello, world!").should == 13
+  end
+end

data/spec/formatted_text_box_spec.rb

@@ -75,6 +75,46 @@ describe "Text::Formatted::Box wrapping" do
     text_box.render
     text_box.text.should == "Hello World\n2"
   end
+
+  it "should properly handle empty slices using default encoding" do
+    texts = [{ :text => "Noua Delineatio Geographica generalis | Apostolicarum peregrinationum | S FRANCISCI XAUERII | Indiarum & Iaponiæ Apostoli", :font => 'Courier', :size => 10 }]
+    text_box = Prawn::Text::Formatted::Box.new(texts, :document => @pdf, :width => @pdf.width_of("Noua Delineatio Geographica gen"))
+    assert_nothing_raised do
+      text_box.render
+    end
+    text_box.text.should == "Noua Delineatio Geographica\ngeneralis | Apostolicarum\nperegrinationum | S FRANCISCI\nXAUERII | Indiarum & Iaponi\346\nApostoli"
+  end
+  
+  describe "Unicode" do
+    before do
+      if RUBY_VERSION < '1.9'
+        @reset_value = $KCODE
+        $KCODE='u'
+      else
+        @reset_value = [Encoding.default_external, Encoding.default_internal]
+        Encoding.default_external = Encoding::UTF_8
+        Encoding.default_internal = Encoding::UTF_8
+      end
+    end
+    
+    after do
+      if RUBY_VERSION < '1.9'
+        $KCODE=@reset_value
+      else
+        Encoding.default_external = @reset_value[0]
+        Encoding.default_internal = @reset_value[1]
+      end
+    end
+
+    it "should properly handle empty slices using Unicode encoding" do
+      texts = [{ :text => "Noua Delineatio Geographica generalis | Apostolicarum peregrinationum | S FRANCISCI XAUERII | Indiarum & Iaponiæ Apostoli", :font => 'Courier', :size => 10 }]
+      text_box = Prawn::Text::Formatted::Box.new(texts, :document => @pdf, :width => @pdf.width_of("Noua Delineatio Geographica gen"))
+      assert_nothing_raised do
+        text_box.render
+      end
+      text_box.text.should == "Noua Delineatio Geographica\ngeneralis | Apostolicarum\nperegrinationum | S FRANCISCI\nXAUERII | Indiarum & Iaponi\346\nApostoli"
+    end
+  end
 end
 
 describe "Text::Formatted::Box with :fallback_fonts option that includes" +

data/spec/images_spec.rb

@@ -91,6 +91,13 @@ describe "the image() function" do
     Set.new(hash[pages[0]][:Resources][:XObject].keys).should ==
       Set.new([:I1, :I2])
   end
+
+  it "should not start a new page just for a stretchy bounding box" do
+    @pdf.expects(:start_new_page).times(0)
+    @pdf.bounding_box([0, @pdf.cursor], :width => @pdf.bounds.width) do
+      @pdf.image @filename
+    end
+  end
   
   describe ":fit option" do
     it "should fit inside the defined constraints" do

data/spec/object_store_spec.rb

@@ -16,20 +16,20 @@ describe "Prawn::ObjectStore" do
   end
 
   it "should import objects from an existing PDF" do
-    filename = "#{Prawn::BASEDIR}/reference_pdfs/curves.pdf"
+    filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
     store = Prawn::Core::ObjectStore.new(:template => filename)
     store.size.should == 5
   end
 
   it "should point to existing roots when importing objects from an existing PDF" do
-    filename = "#{Prawn::BASEDIR}/reference_pdfs/curves.pdf"
+    filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
     store = Prawn::Core::ObjectStore.new(:template => filename)
     store.info.class.should == Prawn::Core::Reference
     store.root.class.should == Prawn::Core::Reference
   end
 
   it "should initialize with pages when importing objects from an existing PDF" do
-    filename = "#{Prawn::BASEDIR}/reference_pdfs/curves.pdf"
+    filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
     store = Prawn::Core::ObjectStore.new(:template => filename)
     store.pages.data[:Count].should == 1
   end

data/spec/snapshot_spec.rb

@@ -112,6 +112,39 @@ describe "Prawn::Document#transaction" do
     end
 
   end
+
+  it "should restore bounds on rollback" do
+    Prawn::Document.new(:page_layout => :landscape) do
+      size = [bounds.width, bounds.height]
+      transaction do
+        start_new_page :layout => :portrait
+        rollback
+      end
+      [bounds.width, bounds.height].should == size
+    end
+  end
+
+  it "should set new bounding box on start_new_page with different layout" do
+    Prawn::Document.new(:page_layout => :landscape) do
+      size = [bounds.width, bounds.height]
+      transaction do
+        start_new_page
+        rollback
+      end
+
+      start_new_page :layout => :portrait
+      [bounds.width, bounds.height].should == size.reverse
+    end
+  end
+
+  it "should work with dests" do
+    Prawn::Document.new do |pdf|
+      pdf.add_dest("dest", pdf.dest_fit_horizontally(pdf.cursor,
+                                                     pdf.page.dictionary))
+      pdf.text("Hello world")
+      lambda { pdf.transaction{} }.should.not.raise
+    end
+  end
   
   describe "with a stamp dictionary present" do
 

data/spec/table_spec.rb

@@ -219,6 +219,13 @@ describe "Prawn::Table" do
         table.width.should == 300
       end
 
+      it "should accept Numeric for column_widths" do
+        table = Prawn::Table.new([%w[ a b c ], %w[d e f]], @pdf) do |t|
+          t.column_widths = 50
+        end
+        table.width.should == 150
+      end
+
       it "should calculate unspecified column widths as "+
          "(max(string_width) + 2*horizontal_padding)" do
         hpad, fs = 3, 12
@@ -485,6 +492,37 @@ describe "Prawn::Table" do
       output.pages[0][:strings].should.be.empty
       output.pages[1][:strings].should == ["Header", "Body"]
     end
+
+    it "should draw background before borders, but only within pages" do
+      seq = sequence("drawing_order")
+
+      @pdf = Prawn::Document.new
+
+      # give enough room for only the first row
+      @pdf.y = @pdf.bounds.absolute_bottom + 30
+      t = @pdf.make_table([["A", "B"],
+                           ["C", "D"]],
+            :cell_style => {:background_color => 'ff0000'})
+
+      ca = t.cells[0, 0]
+      cb = t.cells[0, 1]
+      cc = t.cells[1, 0]
+      cd = t.cells[1, 1]
+
+      # All backgrounds should draw before any borders on page 1...
+      ca.expects(:draw_background).in_sequence(seq)
+      cb.expects(:draw_background).in_sequence(seq)
+      ca.expects(:draw_borders).in_sequence(seq)
+      cb.expects(:draw_borders).in_sequence(seq)
+      # ...and page 2
+      @pdf.expects(:start_new_page).in_sequence(seq)
+      cc.expects(:draw_background).in_sequence(seq)
+      cd.expects(:draw_background).in_sequence(seq)
+      cc.expects(:draw_borders).in_sequence(seq)
+      cd.expects(:draw_borders).in_sequence(seq)
+
+      t.draw
+    end
   end
 
   describe "#style" do
@@ -581,6 +619,27 @@ describe "Prawn::Table" do
       end
     end
 
+    it "should draw all backgrounds before any borders" do
+      # lest backgrounds overlap borders:
+      # https://github.com/sandal/prawn/pull/226
+
+      seq = sequence("drawing_order")
+
+      t = @pdf.make_table([["A", "B"]],
+            :cell_style => {:background_color => 'ff0000'})
+      ca = t.cells[0, 0]
+      cb = t.cells[0, 1]
+
+      # XXX Not a perfectly general test, because it would still be acceptable
+      # if we drew B then A
+      ca.expects(:draw_background).in_sequence(seq)
+      cb.expects(:draw_background).in_sequence(seq)
+      ca.expects(:draw_borders).in_sequence(seq)
+      cb.expects(:draw_borders).in_sequence(seq)
+
+      t.draw
+    end
+
     it "should allow multiple inkings of the same table" do
       pdf = Prawn::Document.new
       t = Prawn::Table.new([["foo"]], pdf)
@@ -595,6 +654,22 @@ describe "Prawn::Table" do
       pdf.move_cursor_to(400)
       t.draw
     end
+
+    describe "in stretchy bounding boxes" do
+      it "should draw all cells on a row at the same y-position" do
+        pdf = Prawn::Document.new
+        
+        text_y = pdf.y.to_i - 5 # text starts 5pt below current y pos (padding)
+
+        pdf.bounding_box([0, pdf.cursor], :width => pdf.bounds.width) do
+          pdf.expects(:draw_text!).checking { |text, options|
+            pdf.bounds.absolute_top.should == text_y
+          }.times(3)
+
+          pdf.table([%w[a b c]])
+        end
+      end
+    end
   end
 
   describe "headers" do