From 02a9753d8bd57a526f9f8d926b16e97416d2bb04 Mon Sep 17 00:00:00 2001
From: Joe Ferris <joe.r.ferris@gmail.com>
Date: Sat, 31 Jan 2009 12:48:56 -0500
Subject: [PATCH] Added Rspec-detection and integration

---
 lib/shoulda.rb           | 22 ++++------------------
 lib/shoulda/matchers.rb  |  7 -------
 lib/shoulda/rspec.rb     |  5 +++++
 lib/shoulda/test_unit.rb | 19 +++++++++++++++++++
 4 files changed, 28 insertions(+), 25 deletions(-)
 delete mode 100644 lib/shoulda/matchers.rb
 create mode 100644 lib/shoulda/rspec.rb
 create mode 100644 lib/shoulda/test_unit.rb

diff --git a/lib/shoulda.rb b/lib/shoulda.rb
index e219f900..df792240 100644
--- a/lib/shoulda.rb
+++ b/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
-
diff --git a/lib/shoulda/matchers.rb b/lib/shoulda/matchers.rb
deleted file mode 100644
index a3fb8990..00000000
--- a/lib/shoulda/matchers.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'shoulda/active_record/matchers'
-
-module Shoulda
-  module Matchers # :nodoc:
-    include Shoulda::ActiveRecord::Matchers
-  end
-end
diff --git a/lib/shoulda/rspec.rb b/lib/shoulda/rspec.rb
new file mode 100644
index 00000000..f4fe7af1
--- /dev/null
+++ b/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
diff --git a/lib/shoulda/test_unit.rb b/lib/shoulda/test_unit.rb
new file mode 100644
index 00000000..1caa4303
--- /dev/null
+++ b/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
+