prawn 1.0.0.rc1 → 1.0.0.rc2

data/spec/template_spec.rb

@@ -9,6 +9,13 @@ describe "Document built from a template" do
     page_counter.pages.size.should == 1
   end
 
+  it "should not set the template page's parent to the document pages catalog (especially with nested pages)" do
+    filename = "#{Prawn::DATADIR}/pdfs/nested_pages.pdf"
+    @pdf = Prawn::Document.new(:template => filename, :skip_page_creation => true)
+    @pdf.state.page.dictionary.data[:Parent].should_not == @pdf.state.store.pages
+  end
+
+
   it "should have start with the Y cursor at the top of the document" do
     filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
 
@@ -20,27 +27,27 @@ describe "Document built from a template" do
     filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
 
     @pdf = Prawn::Document.new(:template => filename, :margin => 0)
-    assert_equal @pdf.page.margins, { :left   => 0,
-                                      :right  => 0,
-                                      :top    => 0,
-                                      :bottom => 0 }
+    @pdf.page.margins.should == { :left   => 0,
+                                  :right  => 0,
+                                  :top    => 0,
+                                  :bottom => 0 }
 
     @pdf = Prawn::Document.new(:template => filename, :left_margin => 0)
 
-    assert_equal @pdf.page.margins, { :left   => 0,
-                                      :right  => 36,
-                                      :top    => 36,
-                                      :bottom => 36 }
+    @pdf.page.margins.should == { :left   => 0,
+                                  :right  => 36,
+                                  :top    => 36,
+                                  :bottom => 36 }
 
     @pdf.start_new_page(:right_margin => 0)
 
-    assert_equal @pdf.page.margins, { :left   => 0,
-                                      :right  => 0,
-                                      :top    => 36,
-                                      :bottom => 36 }
+    @pdf.page.margins.should == { :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
@@ -57,9 +64,9 @@ describe "Document built from a template" do
       data.include?("QQ").should == false
     end
   end
-    
+
   it "should have a single page object if importing a single page template" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/hexagon.pdf"
+    filename = "#{Prawn::DATADIR}/pdfs/hexagon.pdf"
 
     @pdf = Prawn::Document.new(:template => filename)
     output = StringIO.new(@pdf.render)
@@ -71,7 +78,7 @@ describe "Document built from a template" do
   end
 
   it "should have two content streams if importing a single page template" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/hexagon.pdf"
+    filename = "#{Prawn::DATADIR}/pdfs/hexagon.pdf"
 
     @pdf = Prawn::Document.new(:template => filename)
     output = StringIO.new(@pdf.render)
@@ -83,16 +90,16 @@ describe "Document built from a template" do
   end
 
   it "should not die if using this PDF as a template" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/complex_template.pdf"
+    filename = "#{Prawn::DATADIR}/pdfs/complex_template.pdf"
 
-    assert_nothing_raised do
+    lambda {
       @pdf = Prawn::Document.new(:template => filename)
-    end
+    }.should_not raise_error
   end
 
 
   it "should have balance q/Q operators on all content streams" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/hexagon.pdf"
+    filename = "#{Prawn::DATADIR}/pdfs/hexagon.pdf"
 
     @pdf = Prawn::Document.new(:template => filename)
     output = StringIO.new(@pdf.render)
@@ -108,7 +115,7 @@ describe "Document built from a template" do
   end
 
   it "should allow text to be added to a single page template" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/hexagon.pdf"
+    filename = "#{Prawn::DATADIR}/pdfs/hexagon.pdf"
 
     @pdf = Prawn::Document.new(:template => filename)
 
@@ -119,7 +126,7 @@ describe "Document built from a template" do
   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"
+    filename = "#{Prawn::DATADIR}/pdfs/resources_as_indirect_object.pdf"
 
     @pdf = Prawn::Document.new(:template => filename)
 
@@ -131,7 +138,7 @@ describe "Document built from a template" do
   end
 
   it "should copy the PDF version from the template file" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/version_1_6.pdf"
+    filename = "#{Prawn::DATADIR}/pdfs/version_1_6.pdf"
 
     @pdf = Prawn::Document.new(:template => filename)
     str = @pdf.render
@@ -139,9 +146,9 @@ describe "Document built from a template" do
   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"
+    filename = "#{Prawn::DATADIR}/pdfs/contains_ttf_font.pdf"
     @pdf = Prawn::Document.new(:template => filename)
-    @pdf.font "#{Prawn::BASEDIR}/data/fonts/Chalkboard.ttf"
+    @pdf.font "#{Prawn::DATADIR}/fonts/Chalkboard.ttf"
     @pdf.move_down(40)
     @pdf.text "Hi There"
 
@@ -155,51 +162,74 @@ describe "Document built from a template" do
   end
 
   it "should correctly import a template file that is missing a MediaBox entry" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/page_without_mediabox.pdf"
+    filename = "#{Prawn::DATADIR}/pdfs/page_without_mediabox.pdf"
 
     @pdf = Prawn::Document.new(:template => filename)
     str = @pdf.render
     str[0,4].should == "%PDF"
   end
 
+  context "with the template as a stream" do
+    it "should correctly import a template file from a stream" do
+      filename = "#{Prawn::DATADIR}/pdfs/hexagon.pdf"
+      io = StringIO.new(File.binread(filename))
+      @pdf = Prawn::Document.new(:template => io)
+      str = @pdf.render
+      str[0,4].should == "%PDF"
+    end
+  end
+
+  it "merges metadata info" do
+    filename = "#{Prawn::DATADIR}/pdfs/hexagon.pdf"
+    info = { :Title => "Sample METADATA",
+             :Author => "Me",
+             :Subject => "Not Working",
+             :CreationDate => Time.now }
+
+    @pdf = Prawn::Document.new(:template => filename, :info => info)
+    output = StringIO.new(@pdf.render)
+    hash = PDF::Reader::ObjectHash.new(output)
+    info.keys.each { |k| hash[hash.trailer[:Info]].keys.include?(k).should == true }
+  end
+
 end
 
 describe "Document#start_new_page with :template option" do
   filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
-  
+
   it "should set the imported page's parent to the document pages catalog" do
     @pdf = Prawn::Document.new()
     @pdf.start_new_page(:template => filename)
     @pdf.state.page.dictionary.data[:Parent].should == @pdf.state.store.pages
   end
-  
+
   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.page.margins.should == { :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.page.margins.should == { :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 }
+    @pdf.page.margins.should == { :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)
@@ -213,9 +243,9 @@ describe "Document#start_new_page with :template option" do
       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"
+    filename = "#{Prawn::DATADIR}/pdfs/hexagon.pdf"
     @pdf = Prawn::Document.new()
     @pdf.start_new_page(:template => filename)
     output = StringIO.new(@pdf.render)
@@ -224,9 +254,9 @@ describe "Document#start_new_page with :template option" do
     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"
+    filename = "#{Prawn::DATADIR}/pdfs/hexagon.pdf"
 
     @pdf = Prawn::Document.new()
     @pdf.start_new_page(:template => filename)
@@ -241,7 +271,7 @@ describe "Document#start_new_page with :template option" do
       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()
@@ -252,9 +282,9 @@ describe "Document#start_new_page with :template option" do
     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"
+    filename = "#{Prawn::DATADIR}/pdfs/resources_as_indirect_object.pdf"
 
     @pdf = Prawn::Document.new()
     @pdf.start_new_page(:template => filename)
@@ -265,12 +295,12 @@ describe "Document#start_new_page with :template option" do
     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"
+    filename = "#{Prawn::DATADIR}/pdfs/contains_ttf_font.pdf"
     @pdf = Prawn::Document.new()
     @pdf.start_new_page(:template => filename)
-    @pdf.font "#{Prawn::BASEDIR}/data/fonts/Chalkboard.ttf"
+    @pdf.font "#{Prawn::DATADIR}/fonts/Chalkboard.ttf"
     @pdf.move_down(40)
     @pdf.text "Hi There"
 
@@ -283,10 +313,34 @@ describe "Document#start_new_page with :template option" do
     fonts = resources[:Font]
     fonts.size.should == 2
   end
-  
+
+  it "indexes template pages when used multiple times" do
+    filename = "#{Prawn::DATADIR}/pdfs/multipage_template.pdf"
+    @repeated_pdf = Prawn::Document.new()
+    3.times { @repeated_pdf.start_new_page(:template => filename) }
+    repeated_hash = PDF::Reader::ObjectHash.new(StringIO.new(@repeated_pdf.render))
+    @sequential_pdf = Prawn::Document.new()
+    (1..3).each { |p| @sequential_pdf.start_new_page(:template => filename, :template_page => p ) }
+    sequential_hash = PDF::Reader::ObjectHash.new(StringIO.new(@sequential_pdf.render))
+    (repeated_hash.size < sequential_hash.size).should == true
+  end
+
+  context "with the template as a stream" do
+    it "should correctly import a template file from a stream" do
+      filename = "#{Prawn::DATADIR}/pdfs/hexagon.pdf"
+      io = StringIO.new(File.binread(filename))
+
+      @pdf = Prawn::Document.new()
+      @pdf.start_new_page(:template => io)
+
+      str = @pdf.render
+      str[0,4].should == "%PDF"
+    end
+  end
+
   context "using template_page option" do
     it "uses the specified page option" do
-      filename = "#{Prawn::BASEDIR}/data/pdfs/multipage_template.pdf"
+      filename = "#{Prawn::DATADIR}/pdfs/multipage_template.pdf"
       @pdf = Prawn::Document.new()
       @pdf.start_new_page(:template => filename, :template_page => 2)
       text = PDF::Inspector::Text.analyze(@pdf.render)

data/spec/text_at_spec.rb

@@ -5,12 +5,12 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 describe "#draw_text" do
   before(:each) { create_pdf }
 
-  it "should raise ArgumentError if :at option omitted" do
-    lambda { @pdf.draw_text("hai", { }) }.should.raise(ArgumentError)
+  it "should raise_error ArgumentError if :at option omitted" do
+    lambda { @pdf.draw_text("hai", { }) }.should raise_error(ArgumentError)
   end
 
-  it "should raise ArgumentError if :align option included" do
-    lambda { @pdf.draw_text("hai", :at => [0, 0], :align => :center) }.should.raise(ArgumentError)
+  it "should raise_error ArgumentError if :align option included" do
+    lambda { @pdf.draw_text("hai", :at => [0, 0], :align => :center) }.should raise_error(ArgumentError)
   end
 
   it "should allow drawing empty strings to the page" do
@@ -85,8 +85,8 @@ describe "#draw_text" do
     text.font_settings[1][:name].should == :Courier
   end
 
-  it "should raise an exception when an unknown font is used" do
-    lambda { @pdf.font "Pao bu" }.should.raise(Prawn::Errors::UnknownFont)
+  it "should raise_error an exception when an unknown font is used" do
+    lambda { @pdf.font "Pao bu" }.should raise_error(Prawn::Errors::UnknownFont)
   end
 
   it "should correctly render a utf-8 string when using a built-in font" do
@@ -100,29 +100,29 @@ describe "#draw_text" do
 
   if "spec".respond_to?(:encode!)
     # Handle non utf-8 string encodings in a sane way on M17N aware VMs
-    it "should raise an exception when a utf-8 incompatible string is rendered" do
+    it "should raise_error 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(
+      lambda { @pdf.draw_text(str, :at => [0, 0]) }.should raise_error(
         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"
+    it "should_not raise_error an exception when a shift-jis string is rendered" do
+      datafile = "#{Prawn::DATADIR}/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(
+      @pdf.font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf")
+      lambda { @pdf.draw_text(sjis_str, :at => [0, 0]) }.should_not raise_error(
         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
+    it "should raise_error an exception when a corrupt utf-8 string is rendered" do
       str = "Blah \xDD"
-      lambda { @pdf.draw_text(str, :at => [0, 0]) }.should.raise(
+      lambda { @pdf.draw_text(str, :at => [0, 0]) }.should raise_error(
         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(
+    it "should raise_error an exception when a shift-jis string is rendered" do
+      sjis_str = File.read("#{Prawn::DATADIR}/shift_jis_text.txt")
+      lambda { @pdf.draw_text(sjis_str, :at => [0, 0]) }.should raise_error(
         Prawn::Errors::IncompatibleStringEncoding)
     end
   end

data/spec/text_box_spec.rb

@@ -3,55 +3,55 @@
 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
+  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
+    text_box.nothing_printed?.should be_true
   end
-  it "should be false when something printed" do
+  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
+    text_box.nothing_printed?.should be_false
   end
 end
 
 describe "Text::Box#everything_printed?" do
-  it "should be false when not 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
+    text_box.everything_printed?.should be_false
   end
-  it "should be true when everything printed" do
+  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
+    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 " +
+  it "should == 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)
+    text_box.line_gap.should be_within(0.0001).of(@pdf.font.line_gap)
   end
 end
 
@@ -74,7 +74,7 @@ describe "Text::Box" do
     @pdf.text_direction(:rtl)
     @pdf.text_direction = :rtl
     @pdf.text_direction = :rtl
-    @pdf.font("#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf", :size => 16) do
+    @pdf.font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf", :size => 16) do
       @pdf.text "写个小"
     end
     text = PDF::Inspector::Text.analyze(@pdf.render)
@@ -128,7 +128,7 @@ describe "Text::Box#render with :align => :justify" do
     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
+    contents.word_spacing[0].should be > 0
   end
   it "should not justify the last line of a paragraph" do
     create_pdf
@@ -137,7 +137,7 @@ describe "Text::Box#render with :align => :justify" do
     text_box = Prawn::Text::Box.new(string, options)
     text_box.render
     contents = PDF::Inspector::Text.analyze(@pdf.render)
-    contents.word_spacing.should.be.empty
+    contents.word_spacing.should be_empty
   end
 end
 
@@ -160,19 +160,19 @@ describe "Text::Box" do
 end
 
 describe "Text::Box#height without leading" do
-  it "should equal the sum of the height of each line, " +
+  it "should == 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.be.close(@pdf.font.height * 2 - @pdf.font.line_gap, 0.001)
+    text_box.height.should be_within(0.001).of(@pdf.font.height * 2 - @pdf.font.line_gap)
   end
 end
 
 describe "Text::Box#height with leading" do
-  it "should equal the sum of the height of each line plus leading, " +
+  it "should == 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."
@@ -180,7 +180,38 @@ describe "Text::Box#height with leading" do
     options = { :document => @pdf, :leading => leading }
     text_box = Prawn::Text::Box.new(text, options)
     text_box.render
-    text_box.height.should.be.close((@pdf.font.height + leading) * 2 - @pdf.font.line_gap - leading, 0.001)
+    text_box.height.should be_within(0.001).of((@pdf.font.height + leading) * 2 - @pdf.font.line_gap - leading)
+  end
+end
+
+describe "Text::Box with :draw_text_callback" do
+  before(:each) { create_pdf }
+
+  it "hits the callback whenever text is drawn" do
+    draw_block = stub()
+    draw_block.expects(:kick).with("this text is long enough to")
+    draw_block.expects(:kick).with("span two lines")
+
+    @pdf.text_box "this text is long enough to span two lines",
+      :width => 150,
+      :draw_text_callback => lambda { |text, _| draw_block.kick(text) }
+  end
+
+  it "hits the callback once per fragment for :inline_format" do
+    draw_block = stub()
+    draw_block.expects(:kick).with("this text has ")
+    draw_block.expects(:kick).with("fancy")
+    draw_block.expects(:kick).with(" formatting")
+
+    @pdf.text_box "this text has <b>fancy</b> formatting",
+      :inline_format => true, :width => 500,
+      :draw_text_callback => lambda { |text, _| draw_block.kick(text) }
+  end
+
+  it "does not call #draw_text!" do
+    @pdf.expects(:draw_text!).never
+    @pdf.text_box "some text", :width => 500,
+      :draw_text_callback => lambda { |_, _| }
   end
 end
 
@@ -188,7 +219,7 @@ describe "Text::Box#valid_options" do
   it "should return an array" do
     create_pdf
     text_box = Prawn::Text::Box.new("", :document => @pdf)
-    text_box.valid_options.should.be.kind_of(Array)
+    text_box.valid_options.should be_a_kind_of(Array)
   end
 end
 
@@ -211,7 +242,7 @@ describe "Text::Box#render" do
     text_box = Prawn::Text::Box.new(@text, @options)
     text_box.render
     text = PDF::Inspector::Text.analyze(@pdf.render)
-    text.strings.should.not.be.empty
+    text.strings.should_not be_empty
   end
   it "should not draw a transformation matrix" do
     create_pdf
@@ -245,15 +276,15 @@ describe "Text::Box#render(:dry_run => true)" do
     text_box = Prawn::Text::Box.new(@text, @options)
     text_box.render(:dry_run => true)
     text = PDF::Inspector::Text.analyze(@pdf.render)
-    text.strings.should.be.empty
+    text.strings.should be_empty
   end
-  it "subsequent calls to render should not raise an ArgumentError exception" do
+  it "subsequent calls to render should_not raise_error an ArgumentError exception" do
     create_pdf
     @text = "™©"
     @options = { :document => @pdf }
     text_box = Prawn::Text::Box.new(@text, @options)
     text_box.render(:dry_run => true)
-    lambda { text_box.render }.should.not.raise(
+    lambda { text_box.render }.should_not raise_error(
       Prawn::Errors::IncompatibleStringEncoding)
   end
 end
@@ -329,7 +360,7 @@ describe "Text::Box#render with :rotate option of 30)" do
                                       reduce_precision(@cos), 0, 0]
 
       text = PDF::Inspector::Text.analyze(@pdf.render)
-      text.strings.should.not.be.empty
+      text.strings.should_not be_empty
     end
   end
   context ":rotate_around option of :upper_left" do
@@ -352,7 +383,7 @@ describe "Text::Box#render with :rotate option of 30)" do
                                       reduce_precision(@cos), 0, 0]
 
       text = PDF::Inspector::Text.analyze(@pdf.render)
-      text.strings.should.not.be.empty
+      text.strings.should_not be_empty
     end
   end
   context "default :rotate_around" do
@@ -374,7 +405,7 @@ describe "Text::Box#render with :rotate option of 30)" do
                                       reduce_precision(@cos), 0, 0]
 
       text = PDF::Inspector::Text.analyze(@pdf.render)
-      text.strings.should.not.be.empty
+      text.strings.should_not be_empty
     end
   end
   context ":rotate_around option of :upper_right" do
@@ -397,7 +428,7 @@ describe "Text::Box#render with :rotate option of 30)" do
                                       reduce_precision(@cos), 0, 0]
 
       text = PDF::Inspector::Text.analyze(@pdf.render)
-      text.strings.should.not.be.empty
+      text.strings.should_not be_empty
     end
   end
   context ":rotate_around option of :lower_right" do
@@ -420,7 +451,7 @@ describe "Text::Box#render with :rotate option of 30)" do
                                       reduce_precision(@cos), 0, 0]
 
       text = PDF::Inspector::Text.analyze(@pdf.render)
-      text.strings.should.not.be.empty
+      text.strings.should_not be_empty
     end
   end
   context ":rotate_around option of :lower_left" do
@@ -443,7 +474,7 @@ describe "Text::Box#render with :rotate option of 30)" do
                                       reduce_precision(@cos), 0, 0]
 
       text = PDF::Inspector::Text.analyze(@pdf.render)
-      text.strings.should.not.be.empty
+      text.strings.should_not be_empty
     end
   end
 end
@@ -456,7 +487,7 @@ describe "Text::Box default height" do
     @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)
+    text_box.height.should be_within(@pdf.font.height).of(target_height)
   end
 
   it "should use the margin-box bottom if only in a stretchy bbox" do
@@ -465,7 +496,7 @@ describe "Text::Box default height" do
       @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)
+      text_box.height.should be_within(@pdf.font.height).of(target_height)
     end
   end
 
@@ -477,7 +508,7 @@ describe "Text::Box default height" do
       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)
+      text_box.height.should be_within(@pdf.font.height).of(target_height)
     end
   end
 
@@ -488,7 +519,7 @@ describe "Text::Box default height" 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)
+        text_box.height.should be_within(@pdf.font.height).of(200)
       end
     end
   end
@@ -535,7 +566,7 @@ describe "Text::Box with text than can fit in the box" do
     @options[:leading] = 40
     text_box = Prawn::Text::Box.new(@text, @options)
     text_box.render
-    text_box.text.gsub("\n", " ").should.not == @text.strip
+    text_box.text.gsub("\n", " ").should_not == @text.strip
   end
 end
 
@@ -556,7 +587,7 @@ describe "Text::Box with text that fits exactly in the box" 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)
+    text_box.height.should be_within(0.0001).of(expected_height)
   end
 
   it "should print everything" do
@@ -581,7 +612,7 @@ describe "Text::Box with text that fits exactly in the box" do
       @options[:height] += @options[:leading] * @interlines - 1
       text_box = Prawn::Text::Box.new(@text, @options)
       text_box.render
-      text_box.text.should.not == @text
+      text_box.text.should_not == @text
     end
   end
 
@@ -601,7 +632,7 @@ describe "Text::Box with text that fits exactly in the box" do
       @options[:height] += @options[:leading] * @interlines - 1
       text_box = Prawn::Text::Box.new(@text, @options)
       text_box.render
-      text_box.text.should.not == @text
+      text_box.text.should_not == @text
     end
   end
 end
@@ -617,7 +648,7 @@ describe "Text::Box printing UTF-8 string with higher bit characters" do
       :height => bounding_height,
       :document => @pdf
     }
-    file = "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont"
+    file = "#{Prawn::DATADIR}/fonts/Action Man.dfont"
     @pdf.font_families["Action Man"] = {
       :normal      => { :file => file, :font => "ActionMan" },
       :italic      => { :file => file, :font => "ActionMan-Italic" },
@@ -638,7 +669,7 @@ 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(Prawn::Errors::IncompatibleStringEncoding)
+      }.should_not raise_error(Prawn::Errors::IncompatibleStringEncoding)
     end
   end
 
@@ -652,11 +683,11 @@ 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(Prawn::Errors::IncompatibleStringEncoding)
+      }.should raise_error(Prawn::Errors::IncompatibleStringEncoding)
       lambda {
         @pdf.text_box(remaining_text, :skip_encoding => true,
                                       :document => @pdf)
-      }.should.not.raise(Prawn::Errors::IncompatibleStringEncoding)
+      }.should_not raise_error(Prawn::Errors::IncompatibleStringEncoding)
     end
   end
 end
@@ -680,18 +711,18 @@ describe "Text::Box with more text than can fit in the box" do
     end
     it "should be truncated" do
       @text_box.render
-      @text_box.text.gsub("\n", " ").should.not == @text.strip
+      @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.be.empty
+      @text_box.render.should_not be_empty
     end
     it "#height should be no taller than the specified height" do
       @text_box.render
-      @text_box.height.should.be <= @bounding_height
+      @text_box.height.should be <= @bounding_height
     end
     it "#height should be within one font height of the specified height" do
       @text_box.render
-      @bounding_height.should.be.close(@text_box.height, @pdf.font.height)
+      @bounding_height.should be_within(@pdf.font.height).of(@text_box.height)
     end
     context "with :rotate option" do
       it "unrendered text should be the same as when not rotated" do
@@ -800,7 +831,7 @@ describe "Text::Box with a solid block of Chinese characters" do
       :height => 162.0,
       :document => @pdf
     }
-    @pdf.font "#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf"
+    @pdf.font "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
     @options[:overflow] = :truncate
     text_box = Prawn::Text::Box.new(@text, @options)
     text_box.render