mm-devise 1.1.10 → 1.2

data/Changelog.txt

@@ -0,0 +1,9 @@
+June 5, 2011
+---                
+Merged with bmarini/v-0-9-support to be compatible with MongoMapper 0.9 
+Updated various dependencies and removed dependency to rails-generators gem
+Bumped version to 1.2  
+
+March 28, 2011
+---
+Merged with digioi/master to be compatible with MongoMapper 0.9 

data/Gemfile

@@ -1,31 +1,29 @@
 source :rubygems
-source 'http://gems.github.com/'
-
-gem "rails"
-
 
 group :test do
   gem "test-unit",  "~> 2.0.9"
-  gem "webrat",     "~> 0.7.0"
+  gem "webrat",     "~> 0.7.2"
   gem "mocha",      "~> 0.9.8", :require => false
 end
 
 group :default do
-  gem "webrat",     "~> 0.7.0"
+  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 'sugar-high',             '~> 0.3.4'
-  gem 'devise',                 '>= 1.1.1'
-  gem 'rails3-generators',      '>= 0.13.0'
-  gem 'jnunemaker-validatable', '~> 1.8.1'
-  gem 'bson_ext',               '>= 1.0.9'
-  
+  gem 'mongo_mapper',           '~> 0.9.0'
+  gem 'sugar-high',             '~> 0.4.3'
+  gem 'devise',                 '>= 1.2.0'
+  # gem 'rails3-generators',      '>= 0.14.0'
+  gem 'bson_ext',               '>= 1.2.0'
+
+  gem 'rake',                   '>= 0.8.7'
   gem "orm_adapter"
-  gem "omniauth"
-  
+  gem "oa-oauth",   '~> 0.2.0', :require => "omniauth/oauth"
+  gem "oa-openid",  '~> 0.2.0', :require => "omniauth/openid"
+
+  platforms :mri_18 do
+    gem "SystemTimer"
+  end
 
 end
 

data/README.markdown

@@ -2,10 +2,14 @@
 
 *mm-devise* will let you use [devise](http://github.com/plataformatec/devise) with [MongoMapper](http://github.com/jnunemaker/mongomapper). 
 
-*mm-devise* is intended for use with *Rails 3* and *Devise 1.1.5* and above. It may work with earlier versions of devise.
+*mm-devise* is intended for use with *Rails 3+* and *Devise 1.2* and above. It may work with earlier versions of devise.
 
 This README only covers *mm-devise* specifics. Make sure to read the [devise README](http://github.com/plataformatec/devise/blob/master/README.rdoc)
 
+## Status update, June 2011
+
+Recently upgraded to (hopefully!) support Devise > 1.2 and MongoMapper 0.9.0. 
+
 ## Usage options
 
 The gem gives you the options of 2 ORM setups depending on what library you wish to use for validations:   
@@ -25,18 +29,13 @@ ActiveModel support will likely be part of *MongoMapper 1.0* (as mentioned by jn
 
 Add *devise*, *mm-devise* and *MongoMapper* gems to your Gemfile (your Rails app Gemfile). The following gems are required
 
-<pre>  gem 'mongo_mapper',           '>= 0.8.2'
+<pre>  gem 'mongo_mapper',           '>= 0.9.0'
   gem 'jnunemaker-validatable', '>= 1.8.4'
-  gem 'bson_ext',               '>= 1.0.9'
-  gem 'devise',                 '>= 1.1.1'
-  gem 'mm-devise',              '>= 1.1.8'
-  # gem 'rails3-generators',      '>= 0.14.0' # optional</pre>
+  gem 'devise',                 '>= 1.2'
+  gem 'mm-devise',              '>= 1.2'
+</pre>
 
-You can install [rails3-generators](http://github.com/indirect/rails3-generators) which includes a *mongo_mapper* Model generator
-
-<pre>gem install rails3-generators</pre>
-  
-Alternatively use bundler to install all required gems in your Rails 3 app 
+Use bundler to install all required gems in your Rails 3 app 
 
 <pre>bundle install</pre>
 
@@ -49,6 +48,8 @@ configuration options and you MUST take a look at it. Make sure to specify
 either <code>mongo_mapper</code> or <code>mongo_mapper_active_model</code> (ActiveModel::Validations) 
 as the orm in the configuration file.
 
+Note: Is this still required in recent versions of Devise > 1.2 ?
+
 <pre>require 'devise/orm/mongo_mapper'</pre>  
 
 Note: The model generator should do this automatically.
@@ -77,8 +78,13 @@ cd mm-devise
 bundle install
 rake test</pre>
 
-When you run <code>rake test</code>, you will (as of Aug 6, 2010) still get a few errors and failures.
-This is NOT due to any errors in <code>mm-devise</code> but rather due to a few "issues" with a few of the devise tests themselves IMO. 
+## Gem install
+
+<pre>$ rake install</pre>
+
+## Gem release (push to RubyGems)
+
+<pre>$ gem push pkg/mm-devis-xxxx.gem</pre>
 
 ## Note on Patches/Pull Requests
  
@@ -96,6 +102,7 @@ This is NOT due to any errors in <code>mm-devise</code> but rather due to a few
 
 ## Contributors
 
+*bmarini* - Updated to support MongoMapper 0.9 (June 2011)
 *bhbryant* - Fixed some issues and updated gem (Jan 2011)
 *Jared Morgan* - Created the dm-devise gem which was used as a template for the development of this gem.
 Also made suggestions for a few critical fixes and improvements in the code. Thanks :)

data/Rakefile

@@ -1,17 +1,16 @@
 # encoding: UTF-8
 
 require 'rake'
+include Rake::DSL if defined?(Rake::DSL)
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-
 require 'rake/testtask'
 require 'rake/rdoctask'
 require File.join(File.dirname(__FILE__), 'lib', 'mm-devise', 'version')
 
 desc 'Run Devise tests using MongoMapper. Specify path to devise with DEVISE_PATH'
-
-
 Rake::TestTask.new(:test) do |test|
   ENV['DEVISE_ORM'] ||= 'mongo_mapper'
   ENV['DEVISE_PATH'] ||=  File.join(File.dirname(__FILE__), '../devise')
@@ -27,56 +26,5 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-desc 'Default: run tests for all ORMs.'
-task :default => :tests
-
-=begin
-desc 'Default: run tests for all MongoMapper ORM setups.'
-task :default => :pre_commit
-
-desc 'Run Devise tests for all MongoMapper ORM setups.'
-task :pre_commit do
-  Dir[File.join(File.dirname(__FILE__), 'test', 'orm', '*.rb')].each do |file|
-    orm = File.basename(file).split(".").first
-    ENV['DEVISE_PATH'] ||= File.expand_path('../devise')
-    system "rake test DEVISE_ORM=#{orm} DEVISE_PATH=#{ENV['DEVISE_PATH']}"
-  end
-end
-
-
-task :test 
-
-desc 'Generate documentation for dm-devise.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'mm-devise #{version}'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "mm-devise"
-    gem.version = MongoMapper::Devise::VERSION.dup
-    gem.summary = %Q{Support for using MongoMapper ORM with devise}
-    gem.description = %Q{dm-devise adds MongoMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails}
-    gem.email = "jmorgan@morgancreative.net"
-    gem.homepage = "http://github.com/kristianmandrup/mm-devise"
-    gem.authors = ["Kristian Mandrup"]
-    gem.add_dependency 'mongo_mapper',            '>= 0.8.4'        
-    gem.add_dependency 'bson',                    '>= 1.0.9'
-    gem.add_dependency 'rails3-generators',       '>= 0.13.0'    
-    gem.add_dependency 'jnunemaker-validatable',  '>= 1.8.1'
-    gem.add_dependency 'devise',                  '>= 1.1.1'
-    gem.add_dependency 'sugar-high',              '~> 0.3.0'
-    gem.add_dependency 'warden',                  '>= 0.10.7'
-    gem.add_dependency 'bcrypt-ruby',             '>= 2.1.2'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-=end
+desc 'Default: run tests for MongoMapper'
+task :default => :test

data/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

data/lib/mm-devise/version.rb

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

data/mm-devise.gemspec

@@ -1,104 +1,23 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "mm-devise/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{mm-devise}
-  s.version = "1.1.10"
+  s.name        = "mm-devise"
+  s.version     = MongoMapper::Devise::VERSION
+  s.date        = "2011-06-01"
+  s.summary     = %Q{Support for using MongoMapper ORM with devise}
+  s.description = %Q{dm-devise adds MongoMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails}
+  s.email       = "kmandrup@gmail.com"
+  s.homepage    = "http://github.com/kristianmandrup/mm-devise"
+  s.authors     = ["Kristian Mandrup"]
+  s.files       = Dir.glob("lib/**/*") + %w(Changelog.txt mm-devise.gemspec Gemfile LICENSE Rakefile README.markdown)
+  s.test_files  = Dir.glob("test/**/*")
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-01-11}
-  s.description = %q{dm-devise adds MongoMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails}
-  s.email = %q{jmorgan@morgancreative.net}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.markdown"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "lib/devise/orm/mongo_mapper.rb",
-     "lib/devise/orm/mongo_mapper/compatibility.rb",
-     "lib/devise/orm/mongo_mapper/date_time.rb",
-     "lib/devise/orm/mongo_mapper/mm-validations.rb",
-     "lib/devise/orm/mongo_mapper/schema.rb",
-     "lib/devise/orm/mongo_mapper_active_model.rb",
-     "lib/generators/mongo_mapper/devise_generator.rb",
-     "lib/mm-devise/version.rb",
-     "mm-devise.gemspec",
-     "test/mongo_mapper/compatibility_test.rb",
-     "test/orm/mongo_mapper.rb",
-     "test/orm/mongo_mapper_active_model.rb",
-     "test/overrides/mm_validations_test.rb",
-     "test/overrides/mongo_mapper_test.rb",
-     "test/rails_app/app/mongo_mapper/admin.rb",
-     "test/rails_app/app/mongo_mapper/shim.rb",
-     "test/rails_app/app/mongo_mapper/user.rb",
-     "test/rails_app/app/mongo_mapper_active_model/admin.rb",
-     "test/rails_app/app/mongo_mapper_active_model/user.rb",
-     "test/rails_app/config/application.rb",
-     "test/rails_app/config/environment.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/kristianmandrup/mm-devise}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Support for using MongoMapper ORM with devise}
-  s.test_files = [
-    "test/mongo_mapper/compatibility_test.rb",
-     "test/orm/mongo_mapper.rb",
-     "test/orm/mongo_mapper_active_model.rb",
-     "test/overrides/mm_validations_test.rb",
-     "test/overrides/mongo_mapper_test.rb",
-     "test/rails_app/app/mongo_mapper/admin.rb",
-     "test/rails_app/app/mongo_mapper/shim.rb",
-     "test/rails_app/app/mongo_mapper/user.rb",
-     "test/rails_app/app/mongo_mapper_active_model/admin.rb",
-     "test/rails_app/app/mongo_mapper_active_model/user.rb",
-     "test/rails_app/config/application.rb",
-     "test/rails_app/config/environment.rb",
-     "test/test_helper.rb"
-  ]
+  s.add_dependency 'mongo_mapper', '>= 0.9.0'
+  s.add_dependency 'devise', '>= 1.2'
+  # s.add_dependency 'rails3-generators', '>= 0.14.0'
+  s.add_dependency 'sugar-high', '~> 0.4.3'
+  s.add_dependency "SystemTimer", "~> 1.2" if RUBY_VERSION < "1.9"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongo_mapper>, [">= 0.8.4"])
-      s.add_runtime_dependency(%q<bson>, [">= 1.0.9"])
-      s.add_runtime_dependency(%q<rails3-generators>, [">= 0.13.0"])
-      s.add_runtime_dependency(%q<jnunemaker-validatable>, [">= 1.8.1"])
-      s.add_runtime_dependency(%q<devise>, [">= 1.1.1"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.0"])
-      s.add_runtime_dependency(%q<warden>, [">= 0.10.7"])
-      s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 2.1.2"])
-    else
-      s.add_dependency(%q<mongo_mapper>, [">= 0.8.4"])
-      s.add_dependency(%q<bson>, [">= 1.0.9"])
-      s.add_dependency(%q<rails3-generators>, [">= 0.13.0"])
-      s.add_dependency(%q<jnunemaker-validatable>, [">= 1.8.1"])
-      s.add_dependency(%q<devise>, [">= 1.1.1"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.3.4"])
-      s.add_dependency(%q<warden>, [">= 0.10.7"])
-      s.add_dependency(%q<bcrypt-ruby>, [">= 2.1.2"])
-    end
-  else
-    s.add_dependency(%q<mongo_mapper>, [">= 0.8.4"])
-    s.add_dependency(%q<bson>, [">= 1.0.9"])
-    s.add_dependency(%q<rails3-generators>, [">= 0.13.0"])
-    s.add_dependency(%q<jnunemaker-validatable>, [">= 1.8.1"])
-    s.add_dependency(%q<devise>, [">= 1.1.1"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
-    s.add_dependency(%q<warden>, [">= 0.10.7"])
-    s.add_dependency(%q<bcrypt-ruby>, [">= 2.1.2"])
-  end
 end
-

data/test/orm/mongo_mapper.rb

@@ -1,30 +1,10 @@
-require 'rails/test_help'
+MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017)
+MongoMapper.database = "devise-test-suite"
+MongoMapper.database.collections.each { |c| c.drop_indexes }
 
 class ActiveSupport::TestCase
   setup do
-    User.destroy_all
-    Admin.destroy_all
-  end
-end
-
-module MongoMapper
-  module Validate
-    class ValidationErrors
-
-      # ActiveModel prepends field names in +#full_messages+, and so the
-      # expected result of calling errors[field_name] will not include the
-      # field name in the message. However, DM expects the field name to be
-      # included in the original message. Assuming that the field name will
-      # begin the message, just strip it out (plus the following space) for
-      # testing purposes. This has no effect on #full_messages.
-
-      # def [](property_name)
-      #   if property_errors = errors[property_name.to_sym]
-      #     property_errors.collect do |message|
-      #       message[(property_name.to_s.length + 1)..-1]
-      #     end
-      #   end
-      # end
-    end
+    User.collection.remove
+    Admin.collection.remove
   end
 end

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

@@ -2,11 +2,9 @@ require 'shared_admin'
 
 class Admin
   include MongoMapper::Document
+  include Shim
+  include SharedAdmin
 
-  key :username, String
-
+  key :remember_token, String
   timestamps!
-
-  include SharedAdmin
-  include Shim
 end

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

@@ -1,21 +1,7 @@
-# Shim should be included after SharedUser / SharedAdmin
 module Shim
-  def self.included(klass)
-    klass.extend(ModelMethods)
-  end
+  extend ::ActiveSupport::Concern
 
-  module ModelMethods
-    # Override version in SharedUser which uses #find_by_email.
-    def find_for_facebook_oauth(access_token, signed_in_resource=nil)
-      data = ActiveSupport::JSON.decode(access_token.get('/me'))
-      user = signed_in_resource || User.first(:email => data["email"]) || User.new
-      user.update_with_facebook_oauth(access_token, data)
-      user.save
-      user
-    end
-    
-    def create!(*args)
-      create(*args)
-    end
+  included do
+    self.include_root_in_json = true
   end
 end