pdf-wrapper 0.4.1 → 0.4.4

data/CHANGELOG

@@ -1,3 +1,16 @@
+v0.4.4 (19th November 2010)
+* packaging improvements, switch to bundler for development
+* require ruby-gnome2 0.90.5 or greater. The gnome2 gems are still
+  fairly new, Kou seems to be improving them rapidly
+
+v0.4.3 (25th October 2010)
+* simplify the way I require the various gnome2 gems for maximum bundler
+  compatibility
+
+v0.4.2 (24th October 2010)
+* Siwtch back to using the ruby-gnome2 gems to satisfy dependencies
+  * the latest versions can be installed without root permissions
+
 v0.4.1 (12th October 2010)
 * Stop using the ruby-gnome2 gems to satisfy dependencies
   * They can't be installed by non-root users, so don't play nice

data/README.rdoc

@@ -50,21 +50,15 @@ James Healy <jimmy@deefa.com>
 
 = Dependencies
 
-* ruby/cairo[http://cairographics.org/rcairo/]
-* ruby/pango[http://ruby-gnome2.sourceforge.jp/] (optional, required to add text)
-* ruby/rsvg2[http://ruby-gnome2.sourceforge.jp/] (optional, required for SVG support)
-* ruby/gdkpixbuf[http://ruby-gnome2.sourceforge.jp/] (optional, required for GIF/JPG support)
-* ruby/poppler[http://ruby-gnome2.sourceforge.jp/] (optional, required for embedding PDF images)
-
-These are all ruby bindings to C libraries. On Debian/Ubuntu based systems
-(which I develop on) you can get them by running:
-
-    aptitude install libcairo-ruby libpango1-ruby librsvg2-ruby libpoppler-glib-ruby
+As of September 2010 all these dependencies are satisfied by gems. All of them are bindings
+to C libraries, so you will need the libraries and headers installed on your system
+before installing them.
 
-For users of other systems, I'd love to receive info on how you set these bindings up.
-
-ruby/cairo is also available as a gem (cairo), which may be installable if you have a copy
-of the cairo source available on your system.
+* ruby/cairo[http://cairographics.org/rcairo/]
+* ruby/pango[http://ruby-gnome2.sourceforge.jp/]
+* ruby/rsvg2[http://ruby-gnome2.sourceforge.jp/]
+* ruby/gdkpixbuf[http://ruby-gnome2.sourceforge.jp/]
+* ruby/poppler[http://ruby-gnome2.sourceforge.jp/]
 
 = Compatibility
 

data/Rakefile

@@ -1,45 +1,20 @@
 require "rubygems"
+require "bundler"
+Bundler.setup
+
 require 'rake'
-require 'rake/clean'
 require 'rake/rdoctask'
-require 'rake/testtask'
-require "rake/gempackagetask"
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 require 'roodi'
 require 'roodi_task'
 
-
-PKG_VERSION = "0.4.1"
-PKG_NAME = "pdf-wrapper"
-PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
-
 desc "Default Task"
 task :default => [ :spec ]
 
 # run all rspecs
 desc "Run all rspec files"
-Spec::Rake::SpecTask.new("spec") do |t|
-  # spec files listed explicitly so that load_spec is the first one run
-  t.spec_files = ['specs/load_spec.rb','specs/image_spec.rb','specs/graphics_spec.rb','specs/tables_spec.rb','specs/text_spec.rb','specs/wrapper_spec.rb']
-  t.spec_opts = ['-c']
-  t.libs << File.dirname(__FILE__) + "/specs"
-end
-
-# generate specdocs
-desc "Generate Specdocs"
-Spec::Rake::SpecTask.new("specdocs") do |t|
-  t.spec_files = FileList['specs/**/*.rb']
-  t.spec_opts = ["--format", "rdoc"]
-  t.out = (ENV['CC_BUILD_ARTIFACTS'] || 'doc') + '/specdoc.rd'
-end
-
-# generate failing spec report
-desc "Generate failing spec report"
-Spec::Rake::SpecTask.new("spec_report") do |t|
-  t.spec_files = FileList['specs/**/*.rb']
-  t.spec_opts = ["--format", "html", "--diff"]
-  t.out = (ENV['CC_BUILD_ARTIFACTS'] || 'doc') + '/spec_report.html'
-  t.fail_on_error = false
+RSpec::Core::RakeTask.new("spec") do |t|
+  t.rspec_opts = ['-c']
 end
 
 # Genereate the RDoc documentation
@@ -54,40 +29,4 @@ Rake::RDocTask.new("doc") do |rdoc|
   rdoc.options << "--inline-source"
 end
 
-desc "Publish rdocs to rubyforge"
-task :publish_rdoc => [ :doc ] do
-  rdoc_dir = File.dirname(__FILE__) + "/doc/rdoc/"
-  `scp -r #{rdoc_dir} yob@rubyforge.org:/var/www/gforge-projects/pdf-wrapper/`
-end
-
-# a gemspec for packaging this library 
-spec = Gem::Specification.new do |spec|
-  spec.name = PKG_NAME
-  spec.version = PKG_VERSION
-  spec.platform = Gem::Platform::RUBY
-  spec.summary = "A PDF generating library built on top of cairo"
-  spec.files =  Dir.glob("{examples,lib,specs}/**/**/*") + ["Rakefile"]
-  spec.require_path = "lib"
-  spec.has_rdoc = true
-  spec.extra_rdoc_files = %w{README.rdoc CHANGELOG TODO}
-  spec.rdoc_options << '--title' << 'PDF::Wrapper Documentation' << '--main'  << 'README.rdoc' << '-q'
-  spec.author = "James Healy"
-  spec.homepage = "http://pdf-wrapper.rubyforge.org/"
-  spec.email = "jimmy@deefa.com"
-  spec.rubyforge_project = "pdf-wrapper"
-  spec.description = "A unicode aware PDF writing library that uses the ruby bindings to various c libraries ( like cairo, pango, poppler and rsvg ) to do the heavy lifting."
-  spec.add_dependency("cairo", "~>1.8")
-  #spec.add_dependency("pango")
-  #spec.add_dependency("poppler")
-  #spec.add_dependency("gdkpixbuf")
-  # TODO - add rsvg2
-end
-
-# package the library into a gem
-desc "Generate a gem for pdf-wrapper"
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
-end
-
 RoodiTask.new 'roodi', ['lib/**/*.rb']

data/lib/pdf/wrapper.rb

@@ -8,7 +8,6 @@ require 'fileutils'
 
 require "pdf/wrapper/graphics"
 require "pdf/wrapper/images"
-require "pdf/wrapper/loading"
 require "pdf/wrapper/text_cell"
 require "pdf/wrapper/text_image_cell"
 require "pdf/wrapper/table"
@@ -16,6 +15,18 @@ require "pdf/wrapper/text"
 require "pdf/wrapper/page"
 
 require 'cairo'
+require 'pango'
+require 'gdk_pixbuf2'
+
+begin
+  require 'gtk2'
+rescue Gtk::InitError
+  # ignore this error, it's thrown when gtk2 is loaded with no xsession available.
+  # as advised at http://www.ruby-forum.com/topic/182949
+end
+
+require 'poppler'
+require 'rsvg2'
 
 module PDF
   # Create PDF files by using the cairo and pango libraries.

data/lib/pdf/wrapper/images.rb

@@ -125,7 +125,6 @@ module PDF
 
     def draw_pdf(filename, opts = {})
       # based on a similar function in rabbit. Thanks Kou.
-      load_libpoppler
       x, y = current_point
       page = Poppler::Document.new(filename).get_page(0)
       w, h = page.size
@@ -141,7 +140,6 @@ module PDF
 
     def draw_pixbuf(filename, opts = {})
       # based on a similar function in rabbit. Thanks Kou.
-      load_libpixbuf
       x, y = current_point
       pixbuf = Gdk::Pixbuf.new(filename)
       if opts[:rotate]
@@ -181,7 +179,6 @@ module PDF
 
     def draw_svg(filename, opts = {})
       # based on a similar function in rabbit. Thanks Kou.
-      load_librsvg
       x, y = current_point
       handle = RSVG::Handle.new_from_file(filename)
       width, height = calc_image_dimensions(opts[:width], opts[:height], handle.width, handle.height, opts[:proportional])
@@ -200,18 +197,15 @@ module PDF
 
       case detect_image_type(filename)
       when :pdf   then
-        load_libpoppler
         page = Poppler::Document.new(filename).get_page(0)
         return page.size
       when :png   then
         img_surface = Cairo::ImageSurface.from_png(filename)
         return img_surface.width, img_surface.height
       when :svg   then
-        load_librsvg
         handle = RSVG::Handle.new_from_file(filename)
         return handle.width, handle.height
       else
-        load_libpixbuf
         begin
           pixbuf = Gdk::Pixbuf.new(filename)
           return pixbuf.width, pixbuf.height

data/lib/pdf/wrapper/text.rb

@@ -283,9 +283,6 @@ module PDF
         end
       end
 
-      # The pango way:
-      load_libpango
-
       # create a new Pango layout that our text will be added to
       layout = @context.create_pango_layout
       if options[:markup] == :pango

data/{specs → spec}/graphics_spec.rb

@@ -2,11 +2,11 @@
 
 require 'spec_helper'
 
-context "The PDF::Wrapper class" do
+describe "The PDF::Wrapper class" do
 
   before(:each) { create_pdf }
 
-  specify "should be able to draw a single line onto the canvas" do
+  it "should be able to draw a single line onto the canvas" do
     x0 = y0 = 100
     x1 = y1 = 200
     @pdf.line(x0,y0,x1,y1)
@@ -22,7 +22,7 @@ context "The PDF::Wrapper class" do
     receiver.first_occurance_of(:append_line)[:args].should eql([x1, 641.89])
   end
 
-  specify "should be able to draw a single line onto the canvas with a width of 5" do
+  it "should be able to draw a single line onto the canvas with a width of 5" do
     x0 = y0 = 100
     x1 = y1 = 200
     width = 5
@@ -41,9 +41,9 @@ context "The PDF::Wrapper class" do
     receiver.first_occurance_of(:append_line)[:args].should eql([x1, 641.89])
   end
 
-  specify "should be able to draw a cubic bezier spline onto the canvas"
+  it "should be able to draw a cubic bezier spline onto the canvas"
 
-  specify "should be able to draw an empty rectangle onto the canvas" do
+  it "should be able to draw an empty rectangle onto the canvas" do
     x = y = 100
     w = h = 200
     @pdf.rectangle(x,y,w,h)
@@ -60,7 +60,7 @@ context "The PDF::Wrapper class" do
     callbacks.shift[:args].should eql([100, 741.89, 200, -200])
   end
 
-  specify "should be able to draw an empty rectangle onto the canvas with a line width of 5" do
+  it "should be able to draw an empty rectangle onto the canvas with a line width of 5" do
     x = y = 100
     w = h = 200
     width = 5
@@ -82,7 +82,7 @@ context "The PDF::Wrapper class" do
     callbacks.shift[:args].should eql([100, 741.89, 200, -200])
   end
 
-  specify "should be able to draw a filled rectangle onto the canvas"
+  it "should be able to draw a filled rectangle onto the canvas"
 =begin
   do
     x = y = 100
@@ -97,7 +97,7 @@ context "The PDF::Wrapper class" do
   end
 =end
 
-  specify "should be able to draw an empty rounded rectangle onto the canvas"
+  it "should be able to draw an empty rounded rectangle onto the canvas"
 =begin
   do
     x = y = 100
@@ -113,7 +113,7 @@ context "The PDF::Wrapper class" do
   end
 =end
 
-  specify "should be able to draw an empty rounded rectangle onto the canvas with a line width of 5"
+  it "should be able to draw an empty rounded rectangle onto the canvas with a line width of 5"
 =begin
   do
     x = y = 100
@@ -130,7 +130,7 @@ context "The PDF::Wrapper class" do
   end
 =end
 
-  specify "should be able to draw a filled rounded rectangle onto the canvas"
+  it "should be able to draw a filled rounded rectangle onto the canvas"
 =begin
   do
     x = y = 100
@@ -146,7 +146,7 @@ context "The PDF::Wrapper class" do
   end
 =end
 
-  specify "should be able to draw an empty circle onto the canvas"
+  it "should be able to draw an empty circle onto the canvas"
 =begin
   do
     x = 100
@@ -162,7 +162,7 @@ context "The PDF::Wrapper class" do
   end
 =end
 
-  specify "should be able to draw an empty circle onto the canvas with a line width of 5"
+  it "should be able to draw an empty circle onto the canvas with a line width of 5"
 =begin
   do
     x = 100
@@ -179,7 +179,7 @@ context "The PDF::Wrapper class" do
   end
 =end
 
-  specify "should be able to draw a filled circle onto the canvas"
+  it "should be able to draw a filled circle onto the canvas"
 =begin
   do
     x = 100

data/{specs → spec}/image_spec.rb

@@ -2,11 +2,11 @@
 
 require 'spec_helper'
 
-context "The PDF::Wrapper class" do
+describe "The PDF::Wrapper class" do
 
   before(:each) { create_pdf }
 
-  specify "should be able to detect the filetype of an image" do
+  it "should be able to detect the filetype of an image" do
     @pdf.detect_image_type(File.dirname(__FILE__) + "/data/google.png").should eql(:png)
     @pdf.detect_image_type(File.dirname(__FILE__) + "/data/zits.gif").should eql(:gif)
     @pdf.detect_image_type(File.dirname(__FILE__) + "/data/orc.svg").should eql(:svg)
@@ -14,7 +14,7 @@ context "The PDF::Wrapper class" do
     @pdf.detect_image_type(File.dirname(__FILE__) + "/data/shipsail.jpg").should eql(:jpg)
   end
 
-  specify "should be able to determine image dimensions correctly" do
+  it "should be able to determine image dimensions correctly" do
     @pdf.image_dimensions(File.dirname(__FILE__) + "/data/google.png").should eql([166,55])
     @pdf.image_dimensions(File.dirname(__FILE__) + "/data/zits.gif").should eql([525,167])
     @pdf.image_dimensions(File.dirname(__FILE__) + "/data/orc.svg").should eql([734, 772])
@@ -22,19 +22,19 @@ context "The PDF::Wrapper class" do
     @pdf.image_dimensions(File.dirname(__FILE__) + "/data/shipsail.jpg").should eql([192,128])
   end
 
-  specify "should be able to calculate scaled image dimensions correctly" do
+  it "should be able to calculate scaled image dimensions correctly" do
     @pdf.calc_image_dimensions(100, 100, 200, 200).should eql([100.0,100.0])
     @pdf.calc_image_dimensions(nil, nil, 200, 200).should eql([200.0,200.0])
     @pdf.calc_image_dimensions(150, 200, 200, 200, true).should eql([150.0,150.0])
     @pdf.calc_image_dimensions(300, 250, 200, 200, true).should eql([250.0,250.0])
   end
 
-  specify "should be able to draw rotated images correctly" do
+  it "should be able to draw rotated images correctly" do
     @pdf.image(File.dirname(__FILE__) + "/data/shipsail.jpg", :rotate => :clockwise)
     @pdf.image(File.dirname(__FILE__) + "/data/shipsail.jpg", :rotate => :counterclockwise)
     @pdf.image(File.dirname(__FILE__) + "/data/shipsail.jpg", :rotate => :upsidedown)
     @pdf.image(File.dirname(__FILE__) + "/data/shipsail.jpg", :rotate => :none)
   end
 
-  specify "should be able to draw an image with padding correctly"
+  it "should be able to draw an image with padding correctly"
 end

data/{specs → spec}/spec_helper.rb

@@ -1,14 +1,12 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+require "rubygems"
+require "bundler"
+Bundler.setup
 
 require 'pdf/wrapper'
-require 'tempfile'
-require 'rubygems'
-
-gem "pdf-reader", ">=0.7.3"
-
 require 'pdf/reader'
+require 'tempfile'
 
 def create_pdf
   @output = StringIO.new
@@ -26,10 +24,6 @@ class PDF::Wrapper
   public :draw_png
   public :draw_svg
   public :image_dimensions
-  public :load_librsvg
-  public :load_libpixbuf
-  public :load_libpango
-  public :load_libpoppler
   public :user_x_to_device_x
   public :user_y_to_device_y
   public :device_x_to_user_x

data/{specs → spec}/tables_spec.rb

@@ -2,11 +2,11 @@
 
 require 'spec_helper'
 
-context PDF::Wrapper do
+describe PDF::Wrapper do
 
   before(:each) { create_pdf }
 
-  specify "should be able to draw a table on the canvas using an array of data" do
+  it "should be able to draw a table on the canvas using an array of data" do
     data = [%w{data1 data2}, %w{data3 data4}]
     @pdf.table(data)
     @pdf.finish
@@ -20,7 +20,7 @@ context PDF::Wrapper do
     receiver.content.first.include?("data4").should be_true
   end
 
-  specify "should be able to draw a table on the canvas using an array of TextCells" do
+  it "should be able to draw a table on the canvas using an array of TextCells" do
     data = [
       [ PDF::Wrapper::TextCell.new("data1"), PDF::Wrapper::TextCell.new("data2")],
       [ PDF::Wrapper::TextCell.new("data3"), PDF::Wrapper::TextCell.new("data4")]
@@ -37,7 +37,7 @@ context PDF::Wrapper do
     receiver.content.first.include?("data4").should be_true
   end
 
-  specify "should be able to draw a table on the canvas using an array of TextImageCells" do
+  it "should be able to draw a table on the canvas using an array of TextImageCells" do
     filename = File.dirname(__FILE__) + "/data/orc.svg"
     data = [
       [ "data1", PDF::Wrapper::TextImageCell.new("data2", filename, 100, 100)],
@@ -55,7 +55,7 @@ context PDF::Wrapper do
     receiver.content.first.include?("data4").should be_true
   end
 
-  specify "should be able to draw a table on the canvas using a PDF::Wrapper::Table object" do
+  it "should be able to draw a table on the canvas using a PDF::Wrapper::Table object" do
     table = PDF::Wrapper::Table.new do |t|
       t.data = [%w{data1 data2}, %w{data3 data4}]
     end
@@ -72,7 +72,7 @@ context PDF::Wrapper do
     receiver.content.first.include?("data4").should be_true
   end
 
-  specify "should be able to draw a table on the canvas with no headings" do
+  it "should be able to draw a table on the canvas with no headings" do
     
     table = PDF::Wrapper::Table.new do |t|
       t.data = (1..50).collect { [1,2] }
@@ -90,7 +90,7 @@ context PDF::Wrapper do
     receiver.content.first.include?("col2").should be_false
   end
 
-  specify "should be able to draw a table on the canvas with headers on the first page only" do
+  it "should be able to draw a table on the canvas with headers on the first page only" do
     
     table = PDF::Wrapper::Table.new do |t|
       t.data = (1..50).collect { [1,2] }
@@ -110,7 +110,7 @@ context PDF::Wrapper do
     receiver.content[1].include?("col2").should be_false
   end
 
-  specify "should be able to draw a table on the canvas with headers on all pages" do
+  it "should be able to draw a table on the canvas with headers on all pages" do
     
     table = PDF::Wrapper::Table.new do |t|
       t.data = (1..50).collect { [1,2] }
@@ -130,21 +130,21 @@ context PDF::Wrapper do
     receiver.content[1].include?("col2").should be_true
   end
 
-  specify "should leave the cursor in the bottom left when adding a table" do
+  it "should leave the cursor in the bottom left when adding a table" do
     data = [%w{head1 head2},%w{data1 data2}]
     @pdf.table(data, :left => @pdf.margin_left)
     x,y = @pdf.current_point
     x.to_i.should eql(@pdf.margin_left)
   end
 
-  specify "should default to using as much available space when adding a table that isn't left aligned with the left margin" do
+  it "should default to using as much available space when adding a table that isn't left aligned with the left margin" do
     data = [%w{head1 head2},%w{data1 data2}]
     @pdf.table(data, :left => 100)
     x,y = @pdf.current_point
     x.to_i.should eql(100)
   end
 
-  specify "should be able to draw a table with escaped content markup on the canvas" do
+  it "should be able to draw a table with escaped content markup on the canvas" do
     table = PDF::Wrapper::Table.new(:markup => :pango) do |t|
       t.data = [%w{data1 data2}, %w{data3 data4&5}]
     end
@@ -162,15 +162,15 @@ context PDF::Wrapper do
 
 end
 
-context PDF::Wrapper, "data= method" do
+describe PDF::Wrapper, "data= method" do
 
-  specify "should raise an exception if given rows of uneven size" do
+  it "should raise an exception if given rows of uneven size" do
     data = [%w{head1 head2},%w{data1}]
     table = PDF::Wrapper::Table.new
     lambda { table.data = data }.should raise_error(ArgumentError)
   end
 
-  specify "should convert all non cell objects to TextCells" do
+  it "should convert all non cell objects to TextCells" do
     data = [%w{head1 head2},%w{data1 data2}]
     table = PDF::Wrapper::Table.new
     table.data = data
@@ -179,7 +179,7 @@ context PDF::Wrapper, "data= method" do
     end
   end
 
-  specify "should leave existing TextCells unchanged" do
+  it "should leave existing TextCells unchanged" do
     manual_cell_one = PDF::Wrapper::TextCell.new("data1")
     manual_cell_two = PDF::Wrapper::TextCell.new("data2")
     data = [[manual_cell_one, manual_cell_two]]
@@ -195,7 +195,7 @@ context PDF::Wrapper, "data= method" do
     (cells[1] === manual_cell_two).should be_true
   end
 
-  specify "should leave existing TextImageCells unchanged" do
+  it "should leave existing TextImageCells unchanged" do
     manual_cell_one = PDF::Wrapper::TextImageCell.new("data1", "image.png", 100, 100)
     manual_cell_two = PDF::Wrapper::TextImageCell.new("data2", "image.png", 100, 100)
     data = [[manual_cell_one, manual_cell_two]]
@@ -211,7 +211,7 @@ context PDF::Wrapper, "data= method" do
     (cells[1] === manual_cell_two).should be_true
   end
 
-  specify "should set the default table options on all cells" do
+  it "should set the default table options on all cells" do
     data = [%w{head1 head2},%w{data1 data2}]
     table = PDF::Wrapper::Table.new(:markup => :pango)
 
@@ -223,9 +223,9 @@ context PDF::Wrapper, "data= method" do
   end
 end
 
-context PDF::Wrapper, "headers method" do
+describe PDF::Wrapper, "headers method" do
 
-  specify "should raise an exception if given cell count does not match existing data" do
+  it "should raise an exception if given cell count does not match existing data" do
     data = [%w{data1 data2},%w{data1 data2}]
     headers = %w{head1}
 
@@ -235,7 +235,7 @@ context PDF::Wrapper, "headers method" do
     lambda { table.headers(headers) }.should raise_error(ArgumentError)
   end
 
-  specify "should wrap non-cell objects in a TextCell" do
+  it "should wrap non-cell objects in a TextCell" do
     headers = [["head1","head2"]]
 
     table = PDF::Wrapper::Table.new
@@ -247,7 +247,7 @@ context PDF::Wrapper, "headers method" do
     end
   end
 
-  specify "should leave TextCell objects untouched" do
+  it "should leave TextCell objects untouched" do
     manual_cell_one = PDF::Wrapper::TextCell.new("data1")
     manual_cell_two = PDF::Wrapper::TextCell.new("data2")
     headers = [manual_cell_one, manual_cell_two]
@@ -260,7 +260,7 @@ context PDF::Wrapper, "headers method" do
     (set_headers[1] === manual_cell_two).should be_true
   end
 
-  specify "should leave TextImageCell objects untouched" do
+  it "should leave TextImageCell objects untouched" do
     manual_cell_one = PDF::Wrapper::TextImageCell.new("data1", "image.png", 100, 100)
     manual_cell_two = PDF::Wrapper::TextImageCell.new("data2", "image.png", 100, 100)
     headers = [manual_cell_one, manual_cell_two]
@@ -273,7 +273,7 @@ context PDF::Wrapper, "headers method" do
     (set_headers[1] === manual_cell_two).should be_true
   end
 
-  specify "should set options on all cells" do
+  it "should set options on all cells" do
     headers = ["head1","head2"]
 
     table = PDF::Wrapper::Table.new
@@ -285,7 +285,7 @@ context PDF::Wrapper, "headers method" do
     end
   end
 
-  specify "should set default table options on all cells" do
+  it "should set default table options on all cells" do
     headers = ["head1","head2"]
 
     table = PDF::Wrapper::Table.new(:markup => :pango)
@@ -298,9 +298,9 @@ context PDF::Wrapper, "headers method" do
   end
 end
 
-context PDF::Wrapper, "cell method" do
+describe PDF::Wrapper, "cell method" do
 
-  specify "should return the appropriate cell" do
+  it "should return the appropriate cell" do
     data = [%w{data1 data2},%w{data3 data4}]
     headers = %w{head1}
 
@@ -315,9 +315,9 @@ context PDF::Wrapper, "cell method" do
   end
 end
 
-context PDF::Wrapper, "cell_options method" do
+describe PDF::Wrapper, "cell_options method" do
 
-  specify "should set options on the appropriate cell" do
+  it "should set options on the appropriate cell" do
     data = [%w{data1 data2},%w{data3 data4}]
 
     table = PDF::Wrapper::Table.new
@@ -328,9 +328,9 @@ context PDF::Wrapper, "cell_options method" do
   end
 end
 
-context PDF::Wrapper, "col_options method" do
+describe PDF::Wrapper, "col_options method" do
 
-  specify "should set options on all cells in the appropriate column" do
+  it "should set options on all cells in the appropriate column" do
     data = [%w{data1 data2},%w{data3 data4}]
 
     table = PDF::Wrapper::Table.new
@@ -344,9 +344,9 @@ context PDF::Wrapper, "col_options method" do
   end
 end
 
-context PDF::Wrapper, "row_options method" do
+describe PDF::Wrapper, "row_options method" do
 
-  specify "should set options on all cells in the appropriate row" do
+  it "should set options on all cells in the appropriate row" do
     data = [%w{data1 data2},%w{data3 data4}]
 
     table = PDF::Wrapper::Table.new