prawn 0.11.1.pre → 0.11.1

data/spec/template_spec.rb

@@ -48,7 +48,7 @@ describe "Document built from a template" do
 
     @pdf = Prawn::Document.new(:template => filename)
     output = StringIO.new(@pdf.render)
-    hash = PDF::Hash.new(output)
+    hash = PDF::Reader::ObjectHash.new(output)
 
     hash.each_value do |obj|
       next unless obj.kind_of?(PDF::Reader::Stream)
@@ -63,7 +63,7 @@ describe "Document built from a template" do
 
     @pdf = Prawn::Document.new(:template => filename)
     output = StringIO.new(@pdf.render)
-    hash = PDF::Hash.new(output)
+    hash = PDF::Reader::ObjectHash.new(output)
 
     pages = hash.values.select { |obj| obj.kind_of?(Hash) && obj[:Type] == :Page }
 
@@ -75,7 +75,7 @@ describe "Document built from a template" do
 
     @pdf = Prawn::Document.new(:template => filename)
     output = StringIO.new(@pdf.render)
-    hash = PDF::Hash.new(output)
+    hash = PDF::Reader::ObjectHash.new(output)
 
     streams = hash.values.select { |obj| obj.kind_of?(PDF::Reader::Stream) }
 
@@ -96,7 +96,7 @@ describe "Document built from a template" do
 
     @pdf = Prawn::Document.new(:template => filename)
     output = StringIO.new(@pdf.render)
-    hash = PDF::Hash.new(output)
+    hash = PDF::Reader::ObjectHash.new(output)
 
     streams = hash.values.select { |obj| obj.kind_of?(PDF::Reader::Stream) }
 
@@ -126,7 +126,7 @@ describe "Document built from a template" do
     @pdf.text "Adding some text"
 
     text = PDF::Inspector::Text.analyze(@pdf.render)
-    all_text = text.strings.join("")
+    all_text = text.strings.join
     all_text.include?("Adding some text").should == true
   end
 
@@ -146,7 +146,7 @@ describe "Document built from a template" do
     @pdf.text "Hi There"
 
     output = StringIO.new(@pdf.render)
-    hash = PDF::Hash.new(output)
+    hash = PDF::Reader::ObjectHash.new(output)
 
     page_dict = hash.values.detect{ |obj| obj.is_a?(Hash) && obj[:Type] == :Page }
     resources = page_dict[:Resources]
@@ -163,3 +163,129 @@ describe "Document built from a template" do
   end
 
 end
+
+describe "Document#start_new_page with :template option" do
+  filename = "#{Prawn::BASEDIR}/reference_pdfs/curves.pdf"
+  
+  it "should set start the Y cursor at the top of the page" do
+    @pdf = Prawn::Document.new()
+    @pdf.start_new_page(:template => filename)
+    (@pdf.y == nil).should == false
+  end
+  
+  it "should respect margins set by Prawn" do
+    @pdf = Prawn::Document.new(:margin => 0)
+    @pdf.start_new_page(:template => filename)
+    assert_equal @pdf.page.margins, { :left   => 0,
+                                      :right  => 0,
+                                      :top    => 0,
+                                      :bottom => 0 }
+
+    @pdf = Prawn::Document.new(:left_margin => 0)
+    @pdf.start_new_page(:template => filename)
+    assert_equal @pdf.page.margins, { :left   => 0,
+                                    :right  => 36,
+                                    :top    => 36,
+                                    :bottom => 36 }
+    @pdf.start_new_page(:template => filename, :right_margin => 0)
+    assert_equal @pdf.page.margins, { :left   => 0,
+                                      :right  => 0,
+                                      :top    => 36,
+                                      :bottom => 36 }
+  end
+  
+  it "should not add an extra restore_graphics_state operator to the end of any content stream" do
+    @pdf = Prawn::Document.new
+    @pdf.start_new_page(:template => filename)
+    output = StringIO.new(@pdf.render)
+    hash = PDF::Reader::ObjectHash.new(output)
+
+    hash.each_value do |obj|
+      next unless obj.kind_of?(PDF::Reader::Stream)
+
+      data = obj.data.tr(" \n\r","")
+      data.include?("QQ").should == false
+    end
+  end
+  
+  it "should have two content streams if importing a single page template" do
+    filename = "#{Prawn::BASEDIR}/data/pdfs/hexagon.pdf"
+    @pdf = Prawn::Document.new()
+    @pdf.start_new_page(:template => filename)
+    output = StringIO.new(@pdf.render)
+    hash = PDF::Reader::ObjectHash.new(output)
+    pages = hash.values.find {|obj| obj.is_a?(Hash) && obj[:Type] == :Pages}[:Kids]
+    template_page = hash[pages[1]]
+    template_page[:Contents].size.should == 2
+  end
+  
+  it "should have balance q/Q operators on all content streams" do
+    filename = "#{Prawn::BASEDIR}/data/pdfs/hexagon.pdf"
+
+    @pdf = Prawn::Document.new()
+    @pdf.start_new_page(:template => filename)
+    output = StringIO.new(@pdf.render)
+    hash = PDF::Reader::ObjectHash.new(output)
+
+    streams = hash.values.select { |obj| obj.kind_of?(PDF::Reader::Stream) }
+
+    streams.each do |stream|
+      data = stream.unfiltered_data
+      data.scan("q").size.should == 1
+      data.scan("Q").size.should == 1
+    end
+  end
+  
+  it "should allow text to be added to a single page template" do
+
+    @pdf = Prawn::Document.new()
+    @pdf.start_new_page(:template => filename)
+
+    @pdf.text "Adding some text"
+
+    text = PDF::Inspector::Text.analyze(@pdf.render)
+    text.strings.first.should == "Adding some text"
+  end
+  
+  it "should allow PDFs with page resources behind an indirect object to be used as templates" do
+    filename = "#{Prawn::BASEDIR}/data/pdfs/resources_as_indirect_object.pdf"
+
+    @pdf = Prawn::Document.new()
+    @pdf.start_new_page(:template => filename)
+
+    @pdf.text "Adding some text"
+
+    text = PDF::Inspector::Text.analyze(@pdf.render)
+    all_text = text.strings.join
+    all_text.include?("Adding some text").should == true
+  end
+  
+  it "should correctly add a TTF font to a template that has existing fonts" do
+    filename = "#{Prawn::BASEDIR}/data/pdfs/contains_ttf_font.pdf"
+    @pdf = Prawn::Document.new()
+    @pdf.start_new_page(:template => filename)
+    @pdf.font "#{Prawn::BASEDIR}/data/fonts/Chalkboard.ttf"
+    @pdf.move_down(40)
+    @pdf.text "Hi There"
+
+    output = StringIO.new(@pdf.render)
+    hash = PDF::Reader::ObjectHash.new(output)
+    hash = PDF::Reader::ObjectHash.new(output)
+    pages = hash.values.find {|obj| obj.is_a?(Hash) && obj[:Type] == :Pages}[:Kids]
+    template_page = hash[pages[1]]
+    resources = template_page[:Resources]
+    fonts = resources[:Font]
+    fonts.size.should == 2
+  end
+  
+  context "using template_page option" do
+    it "uses the specified page option" do
+      filename = "#{Prawn::BASEDIR}/data/pdfs/multipage_template.pdf"
+      @pdf = Prawn::Document.new()
+      @pdf.start_new_page(:template => filename, :template_page => 2)
+      text = PDF::Inspector::Text.analyze(@pdf.render)
+      text.strings.first.should == "This is template page 2"
+    end
+  end
+
+end

data/spec/text_at_spec.rb

@@ -13,6 +13,12 @@ describe "#draw_text" do
     lambda { @pdf.draw_text("hai", :at => [0, 0], :align => :center) }.should.raise(ArgumentError)
   end
 
+  it "should allow drawing empty strings to the page" do
+    @pdf.draw_text(" ", :at => [100,100])
+    text = PDF::Inspector::Text.analyze(@pdf.render)
+    text.strings.first.should == " "
+  end
+
   it "should default to 12 point helvetica" do
     @pdf.draw_text("Blah", :at => [100,100])
     text = PDF::Inspector::Text.analyze(@pdf.render)
@@ -97,23 +103,27 @@ describe "#draw_text" do
     it "should raise an exception when a utf-8 incompatible string is rendered" do
       str = "Blah \xDD"
       str.force_encoding("ASCII-8BIT")
-      lambda { @pdf.draw_text(str, :at => [0, 0]) }.should.raise(ArgumentError)
+      lambda { @pdf.draw_text(str, :at => [0, 0]) }.should.raise(
+        Prawn::Errors::IncompatibleStringEncoding)
     end
     it "should not raise an exception when a shift-jis string is rendered" do
       datafile = "#{Prawn::BASEDIR}/data/shift_jis_text.txt"
       sjis_str = File.open(datafile, "r:shift_jis") { |f| f.gets }
       @pdf.font("#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf")
-      lambda { @pdf.draw_text(sjis_str, :at => [0, 0]) }.should.not.raise(ArgumentError)
+      lambda { @pdf.draw_text(sjis_str, :at => [0, 0]) }.should.not.raise(
+        Prawn::Errors::IncompatibleStringEncoding)
     end
   else
     # Handle non utf-8 string encodings in a sane way on non-M17N aware VMs
     it "should raise an exception when a corrupt utf-8 string is rendered" do
       str = "Blah \xDD"
-      lambda { @pdf.draw_text(str, :at => [0, 0]) }.should.raise(ArgumentError)
+      lambda { @pdf.draw_text(str, :at => [0, 0]) }.should.raise(
+        Prawn::Errors::IncompatibleStringEncoding)
     end
     it "should raise an exception when a shift-jis string is rendered" do
       sjis_str = File.read("#{Prawn::BASEDIR}/data/shift_jis_text.txt")
-      lambda { @pdf.draw_text(sjis_str, :at => [0, 0]) }.should.raise(ArgumentError)
+      lambda { @pdf.draw_text(sjis_str, :at => [0, 0]) }.should.raise(
+        Prawn::Errors::IncompatibleStringEncoding)
     end
   end
 end

data/spec/text_box_spec.rb

@@ -2,9 +2,102 @@
 
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 
+describe "Text::Box#nothing_printed?" do
+  it "should be true when nothing printed" do
+    create_pdf
+    string = "Hello world, how are you?\nI'm fine, thank you."
+    text_box = Prawn::Text::Box.new(string,
+                                    :height => 2,
+                                    :document => @pdf)
+    text_box.render
+    text_box.nothing_printed?.should.be true
+  end
+  it "should be false when something printed" do
+    create_pdf
+    string = "Hello world, how are you?\nI'm fine, thank you."
+    text_box = Prawn::Text::Box.new(string,
+                                    :height => 14,
+                                    :document => @pdf)
+    text_box.render
+    text_box.nothing_printed?.should.be false
+  end
+end
+
+describe "Text::Box#everything_printed?" do
+  it "should be false when not everything printed" do
+    create_pdf
+    string = "Hello world, how are you?\nI'm fine, thank you."
+    text_box = Prawn::Text::Box.new(string,
+                                    :height => 14,
+                                    :document => @pdf)
+    text_box.render
+    text_box.everything_printed?.should.be false
+  end
+  it "should be true when everything printed" do
+    create_pdf
+    string = "Hello world, how are you?\nI'm fine, thank you."
+    text_box = Prawn::Text::Box.new(string,
+                                    :document => @pdf)
+    text_box.render
+    text_box.everything_printed?.should.be true
+  end
+end
+
+describe "Text::Box#line_gap" do
+  it "should equal the line gap of the font when using a single " +
+    "font and font size" do
+    create_pdf
+    string = "Hello world, how are you?\nI'm fine, thank you."
+    text_box = Prawn::Text::Box.new(string,
+                                    :document => @pdf)
+    text_box.render
+    text_box.line_gap.should.be.close(@pdf.font.line_gap, 0.0001)
+  end
+end
+
+describe "Text::Box" do
+  it "should be able to set text direction document-wide" do
+    create_pdf
+    @pdf.text_direction(:rtl)
+    @pdf.text_direction = :rtl
+    string = "Hello world, how are you?\nI'm fine, thank you."
+    text_box = Prawn::Text::Box.new(string,
+                                    :document => @pdf)
+    text_box.render
+    text = PDF::Inspector::Text.analyze(@pdf.render)
+    text.strings[0].should == "?uoy era woh ,dlrow olleH"
+    text.strings[1].should == ".uoy knaht ,enif m'I"
+  end
+
+  it "should be able to reverse multi-byte text" do
+    create_pdf
+    @pdf.text_direction(:rtl)
+    @pdf.text_direction = :rtl
+    @pdf.text_direction = :rtl
+    @pdf.font("#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf", :size => 16) do
+      @pdf.text "写个小"
+    end
+    text = PDF::Inspector::Text.analyze(@pdf.render)
+    text.strings[0].should == "小个写"
+  end
+
+  it "option should be able to override document-wide text direction" do
+    create_pdf
+    @pdf.text_direction = :rtl
+    string = "Hello world, how are you?\nI'm fine, thank you."
+    text_box = Prawn::Text::Box.new(string,
+                                    :document => @pdf,
+                                    :direction => :ltr)
+    text_box.render
+    text = PDF::Inspector::Text.analyze(@pdf.render)
+    text.strings[0].should == "Hello world, how are you?"
+    text.strings[1].should == "I'm fine, thank you."
+  end
+end
+
 describe "Text::Box" do
 
-  it "should be able to set leading document wide" do
+  it "should be able to set leading document-wide" do
     create_pdf
     @pdf.default_leading(7)
     @pdf.default_leading = 7
@@ -13,7 +106,7 @@ describe "Text::Box" do
     text_box.leading.should == 7
   end
 
-  it "option should be able to override document wide leading" do
+  it "option should be able to override document-wide leading" do
     create_pdf
     @pdf.default_leading = 7
     text_box = Prawn::Text::Box.new("hello world",
@@ -27,49 +120,67 @@ describe "Text::Box" do
   end
 end
 
-describe "Text::Box#extensions" do
-  it "should be able to override default line wrapping" do
-    create_pdf
-    Prawn::Text::Box.extensions << TestWrapOverride
-    @pdf.text_box("hello world", {})
-    text = PDF::Inspector::Text.analyze(@pdf.render)
-    text.strings[0].should == "all your base are belong to us"
-    Prawn::Text::Box.extensions.delete(TestWrapOverride)
-  end
-end
-
 describe "Text::Box#render with :align => :justify" do
   it "should draw the word spacing to the document" do
     create_pdf
-    string = "hello world " * 10
+    string = "hello world " * 20
     options = { :document => @pdf, :align => :justify }
     text_box = Prawn::Text::Box.new(string, options)
     text_box.render
     contents = PDF::Inspector::Text.analyze(@pdf.render)
     contents.word_spacing[0].should.be > 0
   end
+  it "should not justify the last line of a paragraph" do
+    create_pdf
+    string = "hello world "
+    options = { :document => @pdf, :align => :justify }
+    text_box = Prawn::Text::Box.new(string, options)
+    text_box.render
+    contents = PDF::Inspector::Text.analyze(@pdf.render)
+    contents.word_spacing.should.be.empty
+  end
+end
+
+describe "Text::Box" do
+  it "should only require enough space for the descender and the ascender " +
+     "when determining whether a line can fit" do
+    create_pdf
+    text = "Oh hai text rect"
+    options = { :document => @pdf, :height => @pdf.font.ascender + @pdf.font.descender }
+    text_box = Prawn::Text::Box.new(text, options)
+    text_box.render
+    text_box.text.should == "Oh hai text rect"
+
+    text = "Oh hai text rect\nOh hai text rect"
+    options = { :document => @pdf, :height => @pdf.font.height + @pdf.font.ascender + @pdf.font.descender }
+    text_box = Prawn::Text::Box.new(text, options)
+    text_box.render
+    text_box.text.should == "Oh hai text rect\nOh hai text rect"
+  end
 end
 
 describe "Text::Box#height without leading" do
-  it "should equal the sum of the height of each line" do
+  it "should equal the sum of the height of each line, " +
+    "not including the space below the last line" do
     create_pdf
     text = "Oh hai text rect.\nOh hai text rect."
     options = { :document => @pdf }
     text_box = Prawn::Text::Box.new(text, options)
     text_box.render
-    text_box.height.should == @pdf.font.height * 2
+    text_box.height.should.be.close(@pdf.font.height * 2 - @pdf.font.line_gap, 0.001)
   end
 end
 
 describe "Text::Box#height with leading" do
-  it "should equal the sum of the height of each line" do
+  it "should equal the sum of the height of each line plus leading, " +
+    "but not including the space below the last line" do
     create_pdf
     text = "Oh hai text rect.\nOh hai text rect."
     leading = 12
     options = { :document => @pdf, :leading => leading }
     text_box = Prawn::Text::Box.new(text, options)
     text_box.render
-    text_box.height.should == @pdf.font.height * 2 + leading
+    text_box.height.should.be.close((@pdf.font.height + leading) * 2 - @pdf.font.line_gap - leading, 0.001)
   end
 end
 
@@ -142,7 +253,25 @@ describe "Text::Box#render(:dry_run => true)" do
     @options = { :document => @pdf }
     text_box = Prawn::Text::Box.new(@text, @options)
     text_box.render(:dry_run => true)
-    lambda { text_box.render }.should.not.raise(ArgumentError)
+    lambda { text_box.render }.should.not.raise(
+      Prawn::Errors::IncompatibleStringEncoding)
+  end
+end
+
+describe "Text::Box#render(:valign => :bottom)" do
+  it "#at should be the same from one dry run to the next" do
+    create_pdf
+    text = "this is center text " * 12
+    options = { :width => 162,
+                :valign => :bottom,
+                :document => @pdf }
+    text_box = Prawn::Text::Box.new(text, options)
+
+    text_box.render(:dry_run => true)
+    original_at = text_box.at.dup
+
+    text_box.render(:dry_run => true)
+    text_box.at.should == original_at
   end
 end
 
@@ -303,15 +432,50 @@ describe "Text::Box#render with :rotate option of 30)" do
 end
 
 describe "Text::Box default height" do
+  before(:each) { create_pdf }
+
   it "should be the height from the bottom bound to document.y" do
-    create_pdf
     target_height = @pdf.y - @pdf.bounds.bottom
     @text = "Oh hai\n" * 60
-    @options = { :document => @pdf }
-    text_box = Prawn::Text::Box.new(@text, @options)
+    text_box = Prawn::Text::Box.new(@text, :document => @pdf)
     text_box.render
     text_box.height.should.be.close(target_height, @pdf.font.height)
   end
+
+  it "should use the margin-box bottom if only in a stretchy bbox" do
+    @pdf.bounding_box([0, @pdf.cursor], :width => @pdf.bounds.width) do
+      target_height = @pdf.y - @pdf.bounds.bottom
+      @text = "Oh hai\n" * 60
+      text_box = Prawn::Text::Box.new(@text, :document => @pdf)
+      text_box.render
+      text_box.height.should.be.close(target_height, @pdf.font.height)
+    end
+  end
+
+  it "should use the parent-box bottom if in a stretchy bbox and " +
+    "overflow is :expand, even with an explicit height"do
+    @pdf.bounding_box([0, @pdf.cursor], :width => @pdf.bounds.width) do
+      target_height = @pdf.y - @pdf.bounds.bottom
+      @text = "Oh hai\n" * 60
+      text_box = Prawn::Text::Box.new(@text, :document => @pdf,
+        :height => 100, :overflow => :expand)
+      text_box.render
+      text_box.height.should.be.close(target_height, @pdf.font.height)
+    end
+  end
+
+  it "should use the innermost non-stretchy bbox, not the margin box" do
+    @pdf.bounding_box([0, @pdf.cursor], :width => @pdf.bounds.width,
+                      :height => 200) do
+      @pdf.bounding_box([0, @pdf.cursor], :width => @pdf.bounds.width) do
+        @text = "Oh hai\n" * 60
+        text_box = Prawn::Text::Box.new(@text, :document => @pdf)
+        text_box.render
+        text_box.height.should.be.close(200, @pdf.font.height)
+      end
+    end
+  end
+
 end
 
 describe "Text::Box default at" do
@@ -337,8 +501,10 @@ describe "Text::Box with text than can fit in the box" do
     }
   end
   
-  it "printed text should match requested text, except for trailing or leading white space and that spaces may be replaced by newlines" do
-    text_box = Prawn::Text::Box.new(@text, @options)
+  it "printed text should match requested text, except that preceding and " +
+    "trailing white space will be stripped from each line, and newlines may " +
+    "be inserted" do
+    text_box = Prawn::Text::Box.new("  " + @text, @options)
     text_box.render
     text_box.text.gsub("\n", " ").should == @text.strip
   end
@@ -356,24 +522,72 @@ describe "Text::Box with text than can fit in the box" do
   end
 end
 
-describe "Text::Box with text than can fit in the box with :ellipses overflow and :valign => :bottom" do
-  it "should not print ellipses" do
+describe "Text::Box with text that fits exactly in the box" do
+  before(:each) do
     create_pdf
-    @text = "Oh hai text rect. " * 10
+    @lines = 3
+    @interlines = @lines - 1
+    @text = (1..@lines).to_a.join("\n")
     @options = {
       :width => 162.0,
-      :height => 162.0,
-      :overflow => :ellipses,
-      :valign => :bottom,
+      :height => @pdf.font.ascender + @pdf.font.height * @interlines + @pdf.font.descender,
       :document => @pdf
     }
-    @text_box = Prawn::Text::Box.new(@text, @options)
-    @text_box.render
-    @text_box.text.should.not =~ /\.\.\./
   end
-end
+  
+  it "should have the expected height" do
+    expected_height = @options.delete(:height)
+    text_box = Prawn::Text::Box.new(@text, @options)
+    text_box.render
+    text_box.height.should.be.close(expected_height, 0.0001)
+  end
+
+  it "should print everything" do
+    text_box = Prawn::Text::Box.new(@text, @options)
+    text_box.render
+    text_box.text.should == @text
+  end
+
+  describe "with leading" do
+    before(:each) do
+      @options[:leading] = 15
+    end
+
+    it "should not overflow when enough height is added" do
+      @options[:height] += @options[:leading] * @interlines
+      text_box = Prawn::Text::Box.new(@text, @options)
+      text_box.render
+      text_box.text.should == @text
+    end
+
+    it "should overflow when insufficient height is added" do
+      @options[:height] += @options[:leading] * @interlines - 1
+      text_box = Prawn::Text::Box.new(@text, @options)
+      text_box.render
+      text_box.text.should.not == @text
+    end
+  end
+
+  describe "with negative leading" do
+    before(:each) do
+      @options[:leading] = -4
+    end
 
+    it "should not overflow when enough height is removed" do
+      @options[:height] += @options[:leading] * @interlines
+      text_box = Prawn::Text::Box.new(@text, @options)
+      text_box.render
+      text_box.text.should == @text
+    end
 
+    it "should overflow when too much height is removed" do
+      @options[:height] += @options[:leading] * @interlines - 1
+      text_box = Prawn::Text::Box.new(@text, @options)
+      text_box.render
+      text_box.text.should.not == @text
+    end
+  end
+end
 
 describe "Text::Box printing UTF-8 string with higher bit characters" do
   before(:each) do
@@ -407,9 +621,10 @@ describe "Text::Box printing UTF-8 string with higher bit characters" do
       remaining_text = @text_box.render
       lambda {
         @pdf.text_box(remaining_text, :document => @pdf)
-      }.should.not.raise(ArgumentError)
+      }.should.not.raise(Prawn::Errors::IncompatibleStringEncoding)
     end
   end
+
   describe "when using an AFM font" do
     it "unprinted text should be in WinAnsi encoding" do
       remaining_text = @text_box.render
@@ -420,15 +635,14 @@ describe "Text::Box printing UTF-8 string with higher bit characters" do
       remaining_text = @text_box.render
       lambda {
         @pdf.text_box(remaining_text, :document => @pdf)
-      }.should.raise(ArgumentError)
+      }.should.raise(Prawn::Errors::IncompatibleStringEncoding)
       lambda {
         @pdf.text_box(remaining_text, :skip_encoding => true,
                                       :document => @pdf)
-      }.should.not.raise(ArgumentError)
+      }.should.not.raise(Prawn::Errors::IncompatibleStringEncoding)
     end
   end
 end
-          
 
 describe "Text::Box with more text than can fit in the box" do
   before(:each) do
@@ -447,16 +661,12 @@ describe "Text::Box with more text than can fit in the box" do
       @options[:overflow] = :truncate
       @text_box = Prawn::Text::Box.new(@text, @options)
     end
-    it "should not display ellipses" do
-      @text_box.render
-      @text_box.text.should.not =~ /\.\.\./
-    end
     it "should be truncated" do
       @text_box.render
       @text_box.text.gsub("\n", " ").should.not == @text.strip
     end
     it "render should not return an empty string because some text remains unprinted" do
-      @text_box.render.should.not == ""
+      @text_box.render.should.not.be.empty
     end
     it "#height should be no taller than the specified height" do
       @text_box.render
@@ -484,17 +694,17 @@ describe "Text::Box with more text than can fit in the box" do
     end
   end
   
-  context "ellipses overflow" do
-    before(:each) do
-      @options[:overflow] = :ellipses
+  context "truncated with text and size taken from the manual" do
+    it "should return the right text" do
+      @text = "This is the beginning of the text. It will be cut somewhere and " +
+        "the rest of the text will procede to be rendered this time by " +
+        "calling another method." + " . " * 50
+      @options[:width] = 300
+      @options[:height] = 50
+      @options[:size] = 18
       @text_box = Prawn::Text::Box.new(@text, @options)
-    end
-    it "should display ellipses" do
-      @text_box.render
-      @text_box.text.should =~ /\.\.\./
-    end
-    it "render should not return an empty string because some text remains unprinted" do
-      @text_box.render.should.not == ""
+      remaining_text = @text_box.render
+      remaining_text.should == "text will procede to be rendered this time by calling another method. .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  . "
     end
   end
 
@@ -530,6 +740,38 @@ describe "Text::Box with more text than can fit in the box" do
       @text_box.render.should == ""
     end
   end
+
+  context "shrink_to_fit overflow" do
+    it "should not drop below the minimum font size" do
+      @options[:overflow] = :shrink_to_fit
+      @options[:min_font_size] = 10.1
+      @text_box = Prawn::Text::Box.new(@text, @options)
+      @text_box.render
+
+      text = PDF::Inspector::Text.analyze(@pdf.render)
+      text.font_settings[0][:size].should == 10.1
+    end
+  end
+end
+
+describe "Text::Box with enough space to fit the text but using the " +
+  "shrink_to_fit overflow" do
+  it "should not shrink the text when there is no need to" do
+    create_pdf
+    @bounding_height = 162.0
+    @options = {
+      :width => 162.0,
+      :height => @bounding_height,
+      :overflow => :shrink_to_fit,
+      :min_font_size => 5,
+      :document => @pdf
+    }
+    @text_box = Prawn::Text::Box.new("hello\nworld", @options)
+    @text_box.render
+
+    text = PDF::Inspector::Text.analyze(@pdf.render)
+    text.font_settings[0][:size].should == 12
+  end
 end
 
 describe "Text::Box with a solid block of Chinese characters" do
@@ -545,13 +787,12 @@ describe "Text::Box with a solid block of Chinese characters" do
     @options[:overflow] = :truncate
     text_box = Prawn::Text::Box.new(@text, @options)
     text_box.render
-    text_box.text.gsub("\n", "").should == @text.strip
+    text_box.text.gsub("\n", "").should == @text
   end
 end
 
 
 describe "drawing bounding boxes" do    
-  
   before(:each) { create_pdf }   
 
   it "should restore the margin box when bounding box exits" do
@@ -562,7 +803,6 @@ describe "drawing bounding boxes" do
     @pdf.bounds.should == margin_box
 
   end
-  
 end
 
 
@@ -703,7 +943,7 @@ describe "Text::Box wrapping" do
 
     expected = "©" * 25 + "\n" + "©" * 5
     @pdf.font.normalize_encoding!(expected)
-
+    expected = expected.force_encoding("utf-8") if expected.respond_to?(:force_encoding)
     text_box.text.should == expected
   end
 
@@ -722,21 +962,20 @@ describe "Text::Box wrapping" do
 
     results_with_accent.first_line.length.should == results_without_accent.first_line.length
   end
-  
 end
 
-def reduce_precision(float)
-  ("%.5f" % float).to_f
+describe "Text::Box#render with :mode option" do
+  it "should alter the text rendering mode of the document" do
+    create_pdf
+    string = "hello world"
+    options = { :document => @pdf, :mode => :fill_stroke }
+    text_box = Prawn::Text::Box.new(string, options)
+    text_box.render
+    contents = PDF::Inspector::Text.analyze(@pdf.render)
+    contents.text_rendering_mode.should == [2,0]
+  end
 end
 
-module TestWrapOverride
-  def wrap(string)
-    @text = nil
-    @line_height = @document.font.height
-    @descender   = @document.font.descender
-    @ascender    = @document.font.ascender
-    @baseline_y  = -@ascender
-    draw_line("all your base are belong to us")
-    ""
-  end
+def reduce_precision(float)
+  ("%.5f" % float).to_f
 end