prawn 0.12.0 → 0.13.0

data/prawn.gemspec

@@ -1,26 +1,32 @@
-# Version numbering: http://wiki.github.com/sandal/prawn/development-roadmap
-PRAWN_VERSION = "0.12.0"
-
 Gem::Specification.new do |spec|
   spec.name = "prawn"
-  spec.version = PRAWN_VERSION
+  spec.version = File.read(File.expand_path('VERSION', File.dirname(__FILE__))).strip
   spec.platform = Gem::Platform::RUBY
   spec.summary = "A fast and nimble PDF generator for Ruby"
-  spec.files =  Dir.glob("{examples,lib,spec,data}/**/**/*") +
-                      ["Rakefile", "prawn.gemspec"]
+  spec.files =  Dir.glob("{examples,lib,spec,manual}/**/**/*") +
+                Dir.glob("data/{encodings,images,pdfs}/*") +
+                Dir.glob("data/fonts/{MustRead.html,*.afm}") +
+                ["data/shift_jis_text.txt"] +
+                ["Rakefile", "prawn.gemspec", "Gemfile",
+                 "COPYING", "LICENSE", "GPLv2", "GPLv3"]
   spec.require_path = "lib"
-  spec.required_ruby_version = '>= 1.8.7'
+  spec.required_ruby_version = '>= 1.9.3'
   spec.required_rubygems_version = ">= 1.3.6"
 
   spec.test_files = Dir[ "spec/*_spec.rb" ]
   spec.extra_rdoc_files = %w{README.md LICENSE COPYING GPLv2 GPLv3}
   spec.rdoc_options << '--title' << 'Prawn Documentation' <<
-                       '--main'  << 'README' << '-q'
+                       '--main'  << 'README.md' << '-q'
   spec.authors = ["Gregory Brown","Brad Ediger","Daniel Nelson","Jonathan Greenberg","James Healy"]
   spec.email = ["gregory.t.brown@gmail.com","brad@bradediger.com","dnelson@bluejade.com","greenberg@entryway.net","jimmy@deefa.com"]
   spec.rubyforge_project = "prawn"
-  spec.add_dependency('pdf-reader', '>=0.9.0')
-  spec.add_dependency('ttfunk', '~>1.0.2')
+  spec.add_dependency('pdf-reader', '~>1.2')
+  spec.add_dependency('ttfunk', '~>1.0.3')
+  spec.add_dependency('ruby-rc4')
+  spec.add_dependency('afm')
+  spec.add_development_dependency('pdf-inspector', '~> 1.1.0')
+  spec.add_development_dependency('coderay', '~> 1.0.7')
+  spec.add_development_dependency('rdoc')
   spec.homepage = "http://prawn.majesticseacreature.com"
   spec.description = <<END_DESC
   Prawn is a fast, tiny, and nimble PDF generator for Ruby
@@ -30,11 +36,11 @@ END_DESC
   ********************************************
 
 
-  A lot has changed since 0.8.4
+  A lot has changed recently in Prawn.
 
   Please read the changelog for details:
 
-  https://github.com/sandal/prawn/wiki/CHANGELOG
+  https://github.com/prawnpdf/prawn/wiki/CHANGELOG
 
 
   ********************************************

data/spec/acceptance/png.rb

@@ -0,0 +1,23 @@
+require_relative "../../lib/prawn"
+
+images = [
+      ["Type 0", "#{Prawn::BASEDIR}/data/images/web-links.png"],
+      ["Type 2", "#{Prawn::BASEDIR}/data/images/ruport.png"],
+      ["Type 3", "#{Prawn::BASEDIR}/data/images/indexed_color.png"],
+      ["Type 4", "#{Prawn::BASEDIR}/data/images/page_white_text.png"],
+      ["Type 6", "#{Prawn::BASEDIR}/data/images/dice.png"],
+]
+
+Prawn::Document.generate("png_types.pdf", :page_size => "A5") do
+  images.each do |header, file|
+    start_new_page unless header.include?("0")
+
+    fill_color "FF0000"
+
+    fill_rectangle bounds.top_left, bounds.width, bounds.height
+    text header 
+    
+    image file, :at => [50,450]
+  end 
+end
+

data/spec/annotations_spec.rb

@@ -1,35 +1,19 @@
 # encoding: utf-8
 
-require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")  
-                               
-class PageAnnotations
-  attr_reader :pages
-
-  def self.parse(document)
-    receiver = new
-    PDF::Reader.string(document.render, receiver)
-    return receiver
-  end
+require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 
-  def initialize
-    @pages = []
-  end
 
-  def begin_page(params)
-    @pages << params
-  end
-end
+describe "When creating annotations" do
 
-describe "When creating annotations" do 
- 
   before(:each) { create_pdf }
-  
-  it "should append annotation to current page" do 
+
+  it "should append annotation to current page" do
     @pdf.start_new_page
     @pdf.annotate(:Rect => [0,0,10,10], :Subtype => :Text, :Contents => "Hello world!")
-    obj = PageAnnotations.parse(@pdf)
-    obj.pages[0][:Annots].nil?.should == true
-    obj.pages[1][:Annots].length.should == 1
+    PDF::Reader.open(StringIO.new(@pdf.render)) do |pdf|
+      pdf.page(1).attributes[:Annots].should be_nil
+      pdf.page(2).attributes[:Annots].size.should == 1
+    end
   end
 
   it "should force :Type to be :Annot" do
@@ -42,14 +26,14 @@ describe "When creating annotations" do
 end
 
 describe "When creating text annotations" do
- 
+
   before(:each) do
     @rect = [0,0,10,10]
     @content = "Hello, world!"
     create_pdf
   end
-  
-  it "should build appropriate annotation" do 
+
+  it "should build appropriate annotation" do
     opts = @pdf.text_annotation(@rect, @content)
     opts[:Type].should == :Annot
     opts[:Subtype].should == :Text
@@ -57,7 +41,7 @@ describe "When creating text annotations" do
     opts[:Contents].should == @content
   end
 
-  it "should merge extra options" do 
+  it "should merge extra options" do
     opts = @pdf.text_annotation(@rect, @content, :Open => true, :Subtype => :Bogus)
     opts[:Subtype].should == :Text
     opts[:Open].should == true
@@ -66,14 +50,14 @@ describe "When creating text annotations" do
 end
 
 describe "When creating link annotations" do
- 
+
   before(:each) do
     @rect = [0,0,10,10]
     @dest = "home"
     create_pdf
   end
-  
-  it "should build appropriate annotation" do 
+
+  it "should build appropriate annotation" do
     opts = @pdf.link_annotation(@rect, :Dest => @dest)
     opts[:Type].should == :Annot
     opts[:Subtype].should == :Link
@@ -81,7 +65,7 @@ describe "When creating link annotations" do
     opts[:Dest].should == @dest
   end
 
-  it "should merge extra options" do 
+  it "should merge extra options" do
     opts = @pdf.link_annotation(@rect, :Dest => @dest, :Subtype => :Bogus)
     opts[:Subtype].should == :Link
     opts[:Dest].should == @dest

data/spec/bounding_box_spec.rb

@@ -84,14 +84,14 @@ describe "A bounding box" do
   it "should require width to be set" do
     lambda do
       Prawn::Document::BoundingBox.new(nil, nil, [100,100])
-    end.should.raise(ArgumentError)
+    end.should raise_error(ArgumentError)
   end
 
-  it "should raise an ArgumentError if a block is not passed" do
+  it "should raise_error an ArgumentError if a block is not passed" do
     pdf = Prawn::Document.new
     lambda do
       pdf.bounding_box([0, 0], :width => 200)
-    end.should.raise(ArgumentError)
+    end.should raise_error(ArgumentError)
   end
 
 end
@@ -100,6 +100,15 @@ describe "drawing bounding boxes" do
 
   before(:each) { create_pdf }
 
+  it "should not stomp on the arguments to bounding_box" do
+    pdf = Prawn::Document.new
+    x = [100, 500]
+    pdf.bounding_box x, :width => 100 do
+      pdf.text "bork-bork-bork"
+    end
+    x.should == [100, 500]
+  end
+
   it "should restore the margin box when bounding box exits" do
     margin_box = @pdf.bounds
 
@@ -135,7 +144,7 @@ describe "drawing bounding boxes" do
       @pdf.text "The rain in Spain falls mainly on the plains."
     end
 
-    @pdf.y.should.be.close 458.384, 0.001
+    @pdf.y.should be_within(0.001).of(458.384)
   end
 
   it "should keep track of the max height the box was stretched to" do
@@ -153,7 +162,7 @@ describe "drawing bounding boxes" do
         :height => 30 do
       @pdf.text "hello"
     end
-    @pdf.y.should.be.close(orig_y - 30, 0.001)
+    @pdf.y.should be_within(0.001).of(orig_y - 30)
   end
 
   it "should not advance y-position if passed :hold_position => true" do
@@ -163,7 +172,7 @@ describe "drawing bounding boxes" do
       @pdf.text "hello"
     end
     # y only advances by height of one line ("hello")
-    @pdf.y.should.be.close(orig_y - @pdf.height_of("hello"), 0.001)
+    @pdf.y.should be_within(0.001).of(orig_y - @pdf.height_of("hello"))
   end
 
   it "should not advance y-position of a stretchy bbox if it would stretch " +
@@ -179,9 +188,8 @@ describe "drawing bounding boxes" do
     # the bottom of the page, which we don't want. This should be equivalent to
     # a bbox with :hold_position => true, where we only advance by the amount
     # that was actually drawn.
-    @pdf.y.should.be.close(
-      @pdf.margin_box.absolute_top - @pdf.height_of("hello"),
-      0.001
+    @pdf.y.should be_within(0.001).of(
+      @pdf.margin_box.absolute_top - @pdf.height_of("hello")
     )
   end
 
@@ -254,6 +262,111 @@ describe "Indentation" do
       @pdf.bounds.width.should == 200
     end
   end
+
+  describe "in a ColumnBox" do
+    it "should subtract the given indentation from the available width" do
+      @pdf.column_box([0, @pdf.cursor], :width => @pdf.bounds.width,
+                      :height => 200, :columns => 2, :spacer => 20) do
+        width = @pdf.bounds.width
+        @pdf.indent(20) do
+          @pdf.bounds.width.should be_within(0.01).of(width - 20)
+        end
+      end
+    end
+
+    it "should subtract right padding from the available width" do
+      @pdf.column_box([0, @pdf.cursor], :width => @pdf.bounds.width,
+                      :height => 200, :columns => 2, :spacer => 20) do
+        width = @pdf.bounds.width
+        @pdf.indent(20, 30) do
+          @pdf.bounds.width.should be_within(0.01).of(width - 50)
+        end
+      end
+    end
+
+    it "should maintain the same left indentation across column breaks" do
+      @pdf.column_box([0, @pdf.cursor], :width => @pdf.bounds.width, :columns => 3, :spacer => 15) do
+        3.times do |column|
+          x = @pdf.bounds.left_side
+          @pdf.indent(20) do
+            @pdf.bounds.left_side.should == x+20
+          end
+          @pdf.bounds.move_past_bottom
+        end
+      end
+    end
+
+    it "should not change the right margin if only left indentation is requested" do
+      @pdf.column_box([0, @pdf.cursor], :width => @pdf.bounds.width, :columns => 3, :spacer => 15) do
+        3.times do |column|
+          x = @pdf.bounds.right_side
+          @pdf.indent(20) do
+            @pdf.bounds.right_side.should == x
+          end
+          @pdf.bounds.move_past_bottom
+        end
+      end
+    end
+
+    it "should maintain the same right indentation across columns" do
+      @pdf.column_box([0, @pdf.cursor], :width => @pdf.bounds.width, :columns => 3, :spacer => 15) do
+        3.times do |column|
+          x = @pdf.bounds.right_side
+          @pdf.indent(20, 10) do
+            @pdf.bounds.right_side.should == x-10
+          end
+          @pdf.bounds.move_past_bottom
+        end
+      end
+    end
+
+    it "should keep the right indentation after nesting indents" do
+      @pdf.column_box([0, @pdf.cursor], :width => @pdf.bounds.width, :columns => 3, :spacer => 15) do
+        3.times do |column|
+          # I am giving a right indent of 10...
+          @pdf.indent(20, 10) do
+            x = @pdf.bounds.right_side
+            # ...and no right indent here...
+            @pdf.indent(20) do
+              # right indent is inherited from the parent!
+              @pdf.bounds.right_side.should == x
+            end
+          end
+          @pdf.bounds.move_past_bottom
+        end
+      end
+    end
+
+    it "should revert the right indentation if negative indent is given in nested indent" do
+      @pdf.column_box([0, @pdf.cursor], :width => @pdf.bounds.width, :columns => 3, :spacer => 15) do
+        3.times do |column|
+          x = @pdf.bounds.right_side
+          @pdf.indent(20, 10) do
+            # requesting a negative right-indent of equivalent size...
+            @pdf.indent(20, -10) do
+              # ...resets the right margin to that of the column!
+              @pdf.bounds.right_side.should == x
+            end
+          end
+          @pdf.bounds.move_past_bottom
+        end
+      end
+    end
+
+    it "should reduce the available column width by the sum of all nested indents" do
+      @pdf.column_box([0, @pdf.cursor], :width => @pdf.bounds.width, :columns => 3, :spacer => 15) do
+        3.times do |column|
+          w = @pdf.bounds.width
+          @pdf.indent(20, 10) do
+            @pdf.indent(20, 10) do
+              @pdf.bounds.width.should == w - 60
+            end
+          end
+          @pdf.bounds.move_past_bottom
+        end
+      end
+    end
+  end
 end
 
 describe "A canvas" do
@@ -269,12 +382,12 @@ end
 
 describe "Deep-copying" do
   it "should create a new object that does not copy @document" do
-    Prawn::Document.new do
-      orig = bounds
+    Prawn::Document.new do |pdf|
+      orig = pdf.bounds
       copy = orig.deep_copy
 
-      copy.should.not == bounds
-      copy.document.should.be.nil
+      copy.should_not == pdf.bounds
+      copy.document.should be_nil
     end
   end
 
@@ -289,7 +402,7 @@ describe "Deep-copying" do
         copy.parent.height.should == outside.height
 
         # but should not be the same object
-        copy.parent.should.not == outside
+        copy.parent.should_not == outside
       end
     end
   end
@@ -369,7 +482,7 @@ describe "BoundingBox#move_past_bottom" do
     @pdf.text "Foo"
 
     @pdf.bounds.move_past_bottom
-    @pdf.y.should.be.close(top_y, 0.001) # we should be at the top
+    @pdf.y.should be_within(0.001).of(top_y)
     @pdf.text "Bar"
 
     pages = PDF::Inspector::Page.analyze(@pdf.render).pages

data/spec/cell_spec.rb

@@ -1,20 +1,15 @@
 # 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
 
   # Build, but do not draw, a cell on @pdf.
-  # TODO: differentiate class based on :content.
   def cell(options={})
     at = options[:at] || [0, @pdf.cursor]
     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
@@ -31,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
@@ -46,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
@@ -57,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
 
@@ -87,6 +87,12 @@ describe "Prawn::Table::Cell" do
 
       c.style(:padding => 50, :size => 7)
     end
+
+    it "ignores unknown properties" do
+      c = cell(:content => 'text')
+
+      c.style(:foobarbaz => 'frobnitz')
+    end
   end
 
   describe "cell width" do
@@ -104,7 +110,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
@@ -118,7 +124,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
 
@@ -129,17 +135,14 @@ 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
       c = cell(:content => "text", :padding => 10)
       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)
-
-      @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
 
@@ -148,14 +151,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
@@ -165,7 +168,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
@@ -177,8 +180,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
@@ -212,10 +215,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
 
@@ -236,7 +239,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]
@@ -250,7 +253,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
 
@@ -264,10 +267,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
@@ -280,10 +283,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])
@@ -409,8 +412,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
 
@@ -440,6 +469,47 @@ describe "Prawn::Table::Cell" do
       c.draw
     end
 
+    it "supports variant styles of the current font" do
+      font_path = "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont"
+      @pdf.font_families.merge!("Action Man" => {
+        :normal    => { :file => font_path, :font => "ActionMan" },
+        :bold      => { :file => font_path, :font => "ActionMan-Bold" },
+      })
+      @pdf.font "Action Man"
+
+      c = cell(:content => "text", :font_style => :bold)
+
+      box = Prawn::Text::Box.new("text", :document => @pdf)
+      Prawn::Text::Box.expects(:new).checking do |text, options|
+        text.should == "text"
+        options[:style].should == :bold
+        @pdf.font.family.should == 'Action Man'
+      end.at_least_once.returns(box)
+
+      c.draw
+    end
+
+
+    it "uses the style of the current font if none given" do
+      font_path = "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont"
+      @pdf.font_families.merge!("Action Man" => {
+        :normal    => { :file => font_path, :font => "ActionMan" },
+        :bold      => { :file => font_path, :font => "ActionMan-Bold" },
+      })
+      @pdf.font "Action Man", :style => :bold
+
+      c = cell(:content => "text")
+
+      box = Prawn::Text::Box.new("text", :document => @pdf)
+      Prawn::Text::Box.expects(:new).checking do |text, options|
+        text.should == "text"
+        @pdf.font.family.should == 'Action Man'
+        @pdf.font.options[:style].should == :bold
+      end.at_least_once.returns(box)
+
+      c.draw
+    end
+
     it "should allow inline formatting in cells" do
       c = cell(:content => "foo <b>bar</b> baz", :inline_format => true)
 
@@ -492,6 +562,67 @@ describe "Prawn::Table::Cell" do
       font = @pdf.find_font('Helvetica-Bold')
       c.content_width.should == font.compute_width_of("text")
     end
+
+    it "should properly calculate inline-formatted text" do
+      c = cell(:content => "<b>text</b>", :inline_format => true)
+      font = @pdf.find_font('Helvetica-Bold')
+      c.content_width.should == font.compute_width_of("text")
+    end
+  end
+end
+
+describe "Image cells" do
+  before(:each) do
+    create_pdf
+  end
+
+  describe "with default options" do
+    before(:each) do
+      @cell = Prawn::Table::Cell.make(@pdf,
+        :image => "#{Prawn::DATADIR}/images/prawn.png")
+    end
+
+    it "should create a Cell::Image" do
+      @cell.should be_a_kind_of(Prawn::Table::Cell::Image)
+    end
+
+    it "should pull the natural width and height from the image" do
+      @cell.natural_content_width.should == 141
+      @cell.natural_content_height.should == 142
+    end
+  end
+
+  describe "hash syntax" do
+    before(:each) do
+      @table = @pdf.make_table([[{
+        :image => "#{Prawn::DATADIR}/images/prawn.png",
+        :scale => 2,
+        :fit => [100, 200],
+        :image_width => 123,
+        :image_height => 456,
+        :position => :center,
+        :vposition => :center
+      }]])
+      @cell = @table.cells[0, 0]
+    end
+
+
+    it "should create a Cell::Image" do
+      @cell.should be_a_kind_of(Prawn::Table::Cell::Image)
+    end
+
+    it "should pass through image options" do
+      @pdf.expects(:embed_image).checking do |_, _, options|
+        options[:scale].should == 2
+        options[:fit].should == [100, 200]
+        options[:width].should == 123
+        options[:height].should == 456
+        options[:position].should == :center
+        options[:vposition].should == :center
+      end
+
+      @table.draw
+    end
   end
 
 end