Upgrade specs to use RSpec 2

Rakefile

@@ -2,15 +2,12 @@ require "rubygems"
 require "rake/gempackagetask"
 require "rake/rdoctask"
 
-require "spec"
-require "spec/rake/spectask"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = %w(--format specdoc --colour)
-  t.libs = ["spec"]
-end
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
 
+task :default => :spec
 
-task :default => ["spec"]
 
 # This builds the actual gem. For details of what all these options
 # mean, and other ones you can add, check the documentation here:

spec/spec_helper.rb

@@ -2,10 +2,9 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
-gem 'rspec'
+require 'rspec'
 
 require 'mm-paranoid'
-require 'spec'
 
 MongoMapper.database = 'mm-paranoid-spec'
 
@@ -23,7 +22,7 @@ class NormalItem
   key :title, String
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before(:each) do
     ParanoidItem.delete_all
     NormalItem.delete_all