mm-devise 1.1.7 → 1.1.8

data/Gemfile

@@ -1,7 +1,8 @@
 source :rubygems
 source 'http://gems.github.com/'
 
-gem "rails", :git => "git://github.com/rails/rails.git"
+gem "rails"
+
 
 group :test do
   gem "test-unit",  "~> 2.0.9"
@@ -15,11 +16,16 @@ group :default do
   gem "bcrypt-ruby", :require => "bcrypt"
   gem "oauth2"
   gem "warden",                 ">= 0.10.7"  
-  gem 'mongo_mapper',           '~> 0.8.4'
-  gem 'sugar-high',             '~> 0.2.10'
+  gem 'mongo_mapper',           '>= 0.8.4'
+  gem 'sugar-high',             '~> 0.3.0'
   gem 'devise',                 '>= 1.1.1'
   gem 'rails3-generators',      '>= 0.13.0'
   gem 'jnunemaker-validatable', '~> 1.8.1'
-  gem 'bson_ext',               '~> 1.0.7'
+  gem 'bson_ext',               '>= 1.0.9'
+  
+  gem "orm_adapter"
+  gem "omniauth"
+  
+
 end
 

data/README.markdown

@@ -2,7 +2,7 @@
 
 *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.1*. It may work with earlier versions of devise, but it's not been tested.
+*mm-devise* is intended for use with *Rails 3* and *Devise 1.1.5* 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)
 
@@ -27,10 +27,10 @@ Add *devise*, *mm-devise* and *MongoMapper* gems to your Gemfile (your Rails app
 
 <pre>  gem 'mongo_mapper',           '>= 0.8.2'
   gem 'jnunemaker-validatable', '>= 1.8.4'
-  gem 'bson_ext',               '>= 1.0.4'
-  gem 'devise',                 '~> 1.1.1'
-  gem 'mm-devise',              '>= 1.1.0'
-  gem 'rails3-generators',      '>= 0.12.1' # optional</pre>
+  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>
 
 You can install [rails3-generators](http://github.com/indirect/rails3-generators) which includes a *mongo_mapper* Model generator
 
@@ -49,7 +49,7 @@ 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.
 
-  require 'devise/orm/mongo_mapper'
+<pre>require 'devise/orm/mongo_mapper'</pre>  
 
 Note: The model generator should do this automatically.
 
@@ -96,6 +96,7 @@ This is NOT due to any errors in <code>mm-devise</code> but rather due to a few
 
 ## Contributors
 
+*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,38 +1,50 @@
 # encoding: UTF-8
 
 require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+
 require 'rake/testtask'
 require 'rake/rdoctask'
 require File.join(File.dirname(__FILE__), 'lib', 'mm-devise', 'version')
 
-desc 'Default: run tests for all MongoMapper ORM setups.'
-task :default => :pre_commit
+desc 'Run Devise tests using MongoMapper. Specify path to devise with DEVISE_PATH'
 
-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
 
-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.expand_path('../devise')
+  ENV['DEVISE_PATH'] ||=  File.join(File.dirname(__FILE__), '../devise')
   unless File.exist?(ENV['DEVISE_PATH'])
     puts "Specify the path to devise (e.g. rake DEVISE_PATH=/path/to/devise). Not found at #{ENV['DEVISE_PATH']}"
     exit
   end
+  
   test.libs << 'lib' << 'test'
   test.libs << "#{ENV['DEVISE_PATH']}/lib"
   test.libs << "#{ENV['DEVISE_PATH']}/test"
-  test.test_files = FileList["#{ENV['DEVISE_PATH']}/test/**/*_test.rb"] + FileList['test/**/*_test.rb']
+  test.test_files = FileList["#{ENV['DEVISE_PATH']}/test/**/*_test.rb"] +  FileList['test/**/*_test.rb'] 
   test.verbose = true
 end
 
-task :test => :check_dependencies
+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|
@@ -67,3 +79,4 @@ begin
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
+=end

data/lib/devise/orm/mongo_mapper/compatibility.rb

@@ -63,7 +63,7 @@ module Devise
         # def changed?
         #   dirty?
         # end
-
+=begin
         def save(options=nil)
           if options.is_a?(Hash) && options[:validate] == false
             save!
@@ -79,7 +79,7 @@ module Devise
         # def update_attributes(*args)
         #   update(*args)
         # end
-
+=end
         def invalid?
           !valid?
         end

data/lib/mm-devise/version.rb

@@ -1,5 +1,5 @@
 module MongoMapper
   module Devise
-    VERSION = '1.1.7'.freeze
+    VERSION = '1.1.9'.freeze
   end
 end

data/mm-devise.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mm-devise}
-  s.version = "1.1.7"
+  s.version = "1.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-11-27}
+  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 = [

data/test/rails_app/config/application.rb

@@ -35,3 +35,5 @@ module RailsApp
     config.action_mailer.default_url_options = { :host => "localhost:3000" }
   end
 end
+
+

data/test/test_helper.rb

@@ -8,7 +8,7 @@ require "rails_app/config/environment"
 require "rails/test_help"
 require "orm/#{DEVISE_ORM}"
 
-MongoMapper.connection = Mongo::Connection.new('localhost')
+MongoMapper.connection = Mongo::Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost')
 MongoMapper.database = 'mm-devise-db'
 
 I18n.load_path << "#{DEVISE_PATH}/test/support/locale/en.yml"
@@ -19,7 +19,7 @@ Webrat.configure do |config|
   config.open_error_files = false
 end
 
-Devise::Oauth.test_mode!
+#Devise::Oauth.test_mode!
 
 # Add support to load paths so we can overwrite broken webrat setup
 $:.unshift "#{DEVISE_PATH}/test/support"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 7
-  version: 1.1.7
+  - 8
+  version: 1.1.8
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-27 00:00:00 +01:00
+date: 2011-01-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency