From 666fa7710638d9a7f9bbf7e89bf6ad349b09d5b9 Mon Sep 17 00:00:00 2001
From: Edmund Salvacion <edmund@schematiclabs.com>
Date: Fri, 21 Jan 2011 10:17:00 -0800
Subject: [PATCH] added mongoid support

---
 lib/active_support/cache/mongo_store.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/active_support/cache/mongo_store.rb b/lib/active_support/cache/mongo_store.rb
index 82eb7f6..ad494d5 100644
--- a/lib/active_support/cache/mongo_store.rb
+++ b/lib/active_support/cache/mongo_store.rb
@@ -169,9 +169,14 @@ def clear
       end
       
       private
+
       def mongomapper?
         Kernel.const_defined?(:MongoMapper) && MongoMapper.respond_to?(:database) && MongoMapper.database
       end
+
+      def mongoid?
+        Kernel.const_defined?(:Mongoid) && Mongoid.respond_to?(:database) && Mongoid.database
+      end
       
       def make_collection
         db = case options[:db]
@@ -180,6 +185,8 @@ def make_collection
         else
           if mongomapper?
             MongoMapper.database
+          elsif mongoid?
+            Mongoid.database
           else
             Mongo::DB.new(options[:db_name], Mongo::Connection.new)
           end
@@ -191,4 +198,4 @@ def make_collection
         
     end
   end
-end
\ No newline at end of file
+end