mm-devise 1.3 → 2.0

data/Gemfile

@@ -2,22 +2,25 @@ source :rubygems
 
 group :test do
   gem "test-unit",  "~> 2.0.9"
-  gem "webrat",     "~> 0.7.2"
+  gem "webrat",     "~> 0.7.0"
   gem "mocha",      "~> 0.9.8", :require => false
 end
 
 group :default do
-  gem "rails",      "~> 3.0.7"
-  gem "webrat",     "~> 0.7.2"
+  gem "rails",      "~> 3.2.0"
+  gem "webrat",     "~> 0.7.0"
 
-  gem 'mongo_mapper',           '~> 0.9.0'
-  gem 'devise',                 '>= 1.2.0'
+  gem 'mongo_mapper',           '~> 0.11.0'
+  gem 'devise',                 '>= 2.1.0'
+  gem 'devise-encryptable'
   gem 'bson_ext',               '>= 1.2.0'
 
   gem 'rake',                   '>= 0.8.7'
   gem "orm_adapter"
-  gem "oa-oauth",   '~> 0.2.0', :require => "omniauth/oauth"
-  gem "oa-openid",  '~> 0.2.0', :require => "omniauth/openid"
+  #gem "oa-oauth",   '~> 0.3.0', :require => "omniauth/oauth"
+  #gem "oa-openid",  '~> 0.3.0', :require => "omniauth/openid"
+  gem "omniauth-openid", '~>1.0.0'
+  gem "omniauth-facebook", '~>1.2.0'
 
   platforms :mri_18 do
     gem "SystemTimer"

data/lib/devise/orm/mongo_mapper.rb

@@ -1,37 +1,5 @@
 require 'orm_adapter/adapters/mongo_mapper'
 
-module Devise
-  module Orm
-    module MongoMapper
-      extend ActiveSupport::Concern
+#MongoMapper::Document.plugin Devise::Orm::MongoMapper
+MongoMapper::Document::ClassMethods.send :include, Devise::Models
 
-      included do
-        extend Devise::Models
-        extend Devise::Orm::MongoMapper::Hook
-      end
-
-      module Hook
-        def devise_modules_hook!
-          extend Schema
-          yield
-          return unless Devise.apply_schema
-          devise_modules.each { |m| send(m) if respond_to?(m, true) }
-        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.plugin Devise::Orm::MongoMapper

data/lib/mm-devise/version.rb

@@ -1,5 +1,5 @@
 module MongoMapper
   module Devise
-    VERSION = '1.3'
+    VERSION = '2.0' #.freeze
   end
 end

data/test/rails_app/app/mongo_mapper/admin.rb

@@ -5,6 +5,25 @@ class Admin
   include Shim
   include SharedAdmin
 
-  key :remember_token, String
+  ## Database authenticatable  
+  key :email, String, :null => true
+  key :encrypted_password, String, :null => true
+  
+  ## Recoverable
+  key :reset_password_token,    String
+  key :reset_password_sent_at,  Time
+
+  ## Rememberable
+  key :remember_created_at,  Time
+
+  ## Confirmable
+  key :confirmation_token, String
+  key :confirmed_at, Time
+  key :confirmation_sent_at, Time
+  key :unconfirmed_email, String
+
+  ## Lockable
+  key :locked_at, Time
+
   timestamps!
 end

data/test/rails_app/app/mongo_mapper/shim.rb

@@ -4,4 +4,21 @@ module Shim
   included do
     self.include_root_in_json = true
   end
+  #
+  
+  module ClassMethods
+    def last(options={})
+      options.delete(:order) if options[:order] == "id"
+      super(options)
+    end
+
+    def find_by_email(email)
+      first(:conditions => { :email => email })
+    end
+  end
+
+  # overwrite equality (because some devise tests use this for asserting model equality)
+  def ==(other)
+    other.is_a?(self.class) && _id == other._id
+  end
 end

data/test/rails_app/app/mongo_mapper/user.rb

@@ -7,5 +7,37 @@ class User
 
   key :username, String
   key :facebook_token, String
+
+  ## Database authenticatable
+  key :email, String, :null => false, :default => ""
+  key :encrypted_password, String, :null => false, :default => ""
+
+  ## Recoverable
+  key :reset_password_token,    String
+  key :reset_password_sent_at,  Time
+
+  ## Rememberable
+  key :remember_created_at,  Time
+
+  ## Trackable
+  key :sign_in_count, Integer, :default => 0
+  key :current_sign_in_at, Time
+  key :last_sign_in_at,     Time
+  key :current_sign_in_ip,  String
+  key :last_sign_in_ip,     String
+
+  ## Confirmable
+  key :confirmation_token, String
+  key :confirmed_at, Time
+  key :confirmation_sent_at, Time
+
+  ## Lockable
+  key :failed_attempts, Integer, :default => 0
+  key :locked_at, Time
+  key :unlock_token, String
+
+  ## Token authenticatable
+  key :authentication_token, String
+
   timestamps!
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mm-devise
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '2.0'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-01 00:00:00.000000000Z
+date: 2011-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &2153906760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153906760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &2153934140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2153934140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: dm-devise adds MongoMapper support to devise (http://github.com/plataformatec/devise)
   for authentication support for Rails
 email: kmandrup@gmail.com
@@ -77,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Support for using MongoMapper ORM with devise
@@ -90,3 +100,4 @@ test_files:
 - test/rails_app/config/application.rb
 - test/rails_app/config/environment.rb
 - test/test_helper.rb
+has_rdoc: