MongoMapper >= 0.9.0 support

Gemfile

@@ -11,10 +11,7 @@ group :default do
   gem "rails", "~> 3.0.7"
   gem "webrat",     "~> 0.7.2"
 
-  gem "bcrypt-ruby", :require => "bcrypt"
-  gem "oauth2"
-  gem "warden",                 ">= 0.10.7"  
-  gem 'mongo_mapper',           '>= 0.8.4'
+  gem 'mongo_mapper',           '0.9.0'
   gem 'sugar-high',             '~> 0.3.4'
   gem 'devise',                 '>= 1.1.1'
   gem 'rails3-generators',      '>= 0.13.0'

lib/devise/orm/mongo_mapper.rb

@@ -1,26 +1,37 @@
-require 'mongo_mapper'
-require 'devise/orm/mongo_mapper/compatibility'
-require 'devise/orm/mongo_mapper/schema'
-require 'devise/orm/mongo_mapper/date_time'
-require 'devise/orm/mongo_mapper/mm-validations'
+require 'orm_adapter/adapters/mongo_mapper'
 
 module Devise
   module Orm
     module MongoMapper
+      extend ActiveSupport::Concern
+
+      included do
+        extend Devise::Models
+        extend Devise::Orm::MongoMapper::Hook
+      end
+
       module Hook
         def devise_modules_hook!
           extend Schema
-          include Compatibility 
-          include Validatable
           yield
           return unless Devise.apply_schema
           devise_modules.each { |m| send(m) if respond_to?(m, true) }
-        end                
+        end
+
       end
+
+      module Schema
+        include Devise::Schema
+
+        # Tell how to apply schema methods
+        def apply_devise_schema(name, type, options={})
+          type = Time if type == DateTime
+          key(name, type, options)
+        end
+      end
+
     end
   end
 end
 
-MongoMapper::Document.append_extensions(Devise::Models)
-MongoMapper::Document.append_extensions(Devise::Orm::MongoMapper::Hook)
-
+MongoMapper::Document.plugin Devise::Orm::MongoMapper