Added Rspec-detection and integration

lib/shoulda.rb

@@ -1,23 +1,9 @@
-require 'shoulda/context'
-require 'shoulda/proc_extensions'
-require 'shoulda/assertions'
-require 'shoulda/macros'
-require 'shoulda/helpers'
-require 'shoulda/autoload_macros'
-require 'shoulda/rails' if defined? RAILS_ROOT
-
 module Shoulda
   VERSION = "2.0.6"
 end
 
-module Test # :nodoc: all
-  module Unit
-    class TestCase
-      extend Shoulda::ClassMethods
-      include Shoulda::Assertions
-      extend Shoulda::Macros
-      include Shoulda::Helpers
-    end
-  end
+if defined? Spec
+  require 'shoulda/rspec'
+else
+  require 'shoulda/test_unit'
 end
-

lib/shoulda/matchers.rb

@@ -1,7 +0,0 @@
-require 'shoulda/active_record/matchers'
-
-module Shoulda
-  module Matchers # :nodoc:
-    include Shoulda::ActiveRecord::Matchers
-  end
-end

lib/shoulda/rspec.rb

@@ -0,0 +1,5 @@
+require 'shoulda/active_record/matchers'
+
+Spec::Runner.configure do |config|
+  config.include Shoulda::ActiveRecord::Matchers, :type => :model
+end

lib/shoulda/test_unit.rb

@@ -0,0 +1,19 @@
+require 'shoulda/context'
+require 'shoulda/proc_extensions'
+require 'shoulda/assertions'
+require 'shoulda/macros'
+require 'shoulda/helpers'
+require 'shoulda/autoload_macros'
+require 'shoulda/rails' if defined? RAILS_ROOT
+
+module Test # :nodoc: all
+  module Unit
+    class TestCase
+      extend Shoulda::ClassMethods
+      include Shoulda::Assertions
+      extend Shoulda::Macros
+      include Shoulda::Helpers
+    end
+  end
+end
+