dm-devise 1.1.8 → 1.2.0.beta

data/.gitignore

@@ -0,0 +1,5 @@
+coverage/*
+.bundle
+rdoc/*
+pkg
+log

data/Gemfile

@@ -2,16 +2,15 @@ source :rubygems
 
 gemspec
 
-group :development do
-  gem "rails", '~> 3.0.3'
+gem 'rails', '3.0.3'
 
-  gem "webrat", "0.7.2"
-  gem "mocha", :require => false
-  gem "oauth2"
+gem 'webrat', '0.7.1'
+gem 'mocha', :require => false
+gem "oa-oauth", :require => "omniauth/oauth"
+gem "oa-openid", :require => "omniauth/openid"
 
-  gem 'dm-sqlite-adapter', '~> 1.0.2'
-  gem 'jeweler', '~> 1.5.2'
-end
+gem 'sugar-high',        '~> 0.2.10'
+gem 'dm-sqlite-adapter', '~> 1.0.2'
 
 group :data_mapper do
   gem 'dm-validations',    '~> 1.0.0'

data/Gemfile.lock

@@ -1,55 +1,55 @@
 PATH
   remote: .
   specs:
-    dm-devise (1.1.8)
-      bcrypt-ruby (~> 2.1.2)
-      devise (~> 1.1.0)
-      dm-core (~> 1.0.0)
-      dm-migrations (~> 1.0.0)
+    dm-devise (1.2.0.beta)
+      devise (~> 1.2.rc)
+      dm-core (~> 1.0.2)
+      dm-migrations (~> 1.0.2)
       dm-rails (>= 1.0.3)
-      dm-serializer (~> 1.0.0)
-      dm-timestamps (~> 1.0.0)
+      dm-serializer (~> 1.0.2)
+      dm-timestamps (~> 1.0.2)
       sugar-high (~> 0.2.10)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.4)
-      actionpack (= 3.0.4)
-      mail (~> 2.2.15)
-    actionpack (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4)
       rack (~> 1.2.1)
       rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.7)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-    activesupport (3.0.4)
-    addressable (2.2.4)
-    arel (2.0.8)
-    bcrypt-ruby (2.1.4)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    addressable (2.2.2)
+    arel (2.0.6)
+    bcrypt-ruby (2.1.3)
     builder (2.1.2)
-    data_objects (0.10.3)
+    data_objects (0.10.2)
       addressable (~> 2.1)
-    devise (1.1.5)
+    devise (1.2.rc)
       bcrypt-ruby (~> 2.1.2)
-      warden (~> 1.0.2)
+      orm_adapter (~> 0.0.2)
+      warden (~> 1.0.0)
     dm-active_model (1.0.3)
       activemodel (~> 3.0.0)
       dm-core (~> 1.0.2)
@@ -78,68 +78,83 @@ GEM
       dm-core (~> 1.0.2)
     dm-validations (1.0.2)
       dm-core (~> 1.0.2)
-    do_sqlite3 (0.10.3)
-      data_objects (= 0.10.3)
+    do_sqlite3 (0.10.2)
+      data_objects (= 0.10.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     extlib (0.9.15)
-    faraday (0.5.5)
-      addressable (~> 2.2.4)
-      multipart-post (~> 1.1.0)
+    faraday (0.5.3)
+      addressable (~> 2.2.2)
+      multipart-post (~> 1.0.1)
       rack (>= 1.1.0, < 2)
-    fastercsv (1.5.4)
-    git (1.2.5)
+    fastercsv (1.5.3)
     i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    json_pure (1.5.1)
-    mail (2.2.15)
+    json_pure (1.4.6)
+    mail (2.2.12)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mocha (0.9.11)
+    mocha (0.9.10)
       rake
     multi_json (0.0.5)
-    multipart-post (1.1.0)
+    multipart-post (1.0.1)
     nokogiri (1.4.4)
-    oauth2 (0.1.1)
+    oa-core (0.1.6)
+      rack (~> 1.1)
+    oa-oauth (0.1.6)
+      multi_json (~> 0.0.2)
+      nokogiri (~> 1.4.2)
+      oa-core (= 0.1.6)
+      oauth (~> 0.4.0)
+      oauth2 (~> 0.1.0)
+    oa-openid (0.1.6)
+      oa-core (= 0.1.6)
+      rack-openid (~> 1.2.0)
+      ruby-openid-apps-discovery
+    oauth (0.4.4)
+    oauth2 (0.1.0)
       faraday (~> 0.5.0)
       multi_json (~> 0.0.4)
+    orm_adapter (0.0.3)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-openid (1.2.0)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    rack-test (0.5.6)
       rack (>= 1.0)
-    rails (3.0.4)
-      actionmailer (= 3.0.4)
-      actionpack (= 3.0.4)
-      activerecord (= 3.0.4)
-      activeresource (= 3.0.4)
-      activesupport (= 3.0.4)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
       bundler (~> 1.0)
-      railties (= 3.0.4)
-    railties (3.0.4)
-      actionpack (= 3.0.4)
-      activesupport (= 3.0.4)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
     require_all (1.2.0)
+    ruby-openid (2.1.8)
+    ruby-openid-apps-discovery (1.2.0)
+      ruby-openid (>= 2.1.7)
     sugar-high (0.2.12)
       mocha (~> 0.9.8)
       require_all (~> 1.2.0)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
+    tzinfo (0.3.23)
     warden (1.0.3)
       rack (>= 1.0.0)
-    webrat (0.7.2)
+    webrat (0.7.1)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
@@ -148,19 +163,18 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bcrypt-ruby (~> 2.1.2)
-  devise (~> 1.1.0)
-  dm-core (~> 1.0.0)
+  devise (~> 1.2.rc)
+  dm-core (~> 1.0.2)
   dm-devise!
-  dm-migrations (~> 1.0.0)
+  dm-migrations (~> 1.0.2)
   dm-rails (>= 1.0.3)
-  dm-serializer (~> 1.0.0)
+  dm-serializer (~> 1.0.2)
   dm-sqlite-adapter (~> 1.0.2)
-  dm-timestamps (~> 1.0.0)
+  dm-timestamps (~> 1.0.2)
   dm-validations (~> 1.0.0)
-  jeweler (~> 1.5.2)
   mocha
-  oauth2
-  rails (~> 3.0.3)
+  oa-oauth
+  oa-openid
+  rails (= 3.0.3)
   sugar-high (~> 0.2.10)
-  webrat (= 0.7.2)
+  webrat (= 0.7.1)

data/README.rdoc

@@ -20,7 +20,7 @@ earlier versions, but it's not been tested (if you try, please let Jared Morgan
 This README only covers dm-devise specifics. Make sure to read the devise
 README http://github.com/plataformatec/devise/blob/master/README.rdoc
 
-Last tested against devise release: v1.1.5
+Last tested against devise master: 2011-01-31, commit 76a480044688672acdd40469c74c6abfea35f8a4
 
 == Installation
 
@@ -32,7 +32,7 @@ Add dm-devise and dm gems to your Gemfile. The following gems are required:
   gem 'dm-timestamps',     '~> 1.0.2'
   gem 'dm-rails',          '~> 1.0.3'
   gem 'dm-validations',    '~> 1.0.2' # Do not include if using data_mapper_active_model
-  gem 'dm-devise',         '~> 1.1.0'
+  gem 'dm-devise',         '~> 1.1.4'
 
 If you're using data_mapper_active_model do not include dm-validations in your
 Gemfile.
@@ -57,6 +57,19 @@ Read the README for devise at http://github.com/plataformatec/devise/blob/master
 * Example app
 * Rails templates
 
+== Testing
+
+The dm-devise test rake task runs all of devise's tests using the data_mapper
+and data_mapper_active_model ORM setups. In order to run tests, you'll need a
+local copy of devise (a gem is fine as long as you specify the path). By default,
+dm-devise looks for devise in [path-to-dm-devise]/../devise. You can override
+this by setting a DEVISE_PATH env variable. For example:
+
+  rake test DEVISE_PATH=/path/to/devise
+
+Tests of the master branch should be run against devise master. Tests of the
+1.1 branch should be run against the devise 1.1 branch (or a 1.1.x gem).
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -1,14 +1,5 @@
 # encoding: UTF-8
 
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
@@ -60,13 +51,12 @@ begin
     gem.email = "jmorgan@morgancreative.net"
     gem.homepage = "http://github.com/jm81/dm-devise"
     gem.authors = ["Jared Morgan"]
-    gem.add_dependency 'dm-core',        '~> 1.0.0'
-    gem.add_dependency 'dm-migrations',  '~> 1.0.0'
-    gem.add_dependency 'dm-serializer',  '~> 1.0.0'
-    gem.add_dependency 'dm-timestamps',  '~> 1.0.0'
+    gem.add_dependency 'dm-core',        '~> 1.0.2'
+    gem.add_dependency 'dm-migrations',  '~> 1.0.2'
+    gem.add_dependency 'dm-serializer',  '~> 1.0.2'
+    gem.add_dependency 'dm-timestamps',  '~> 1.0.2'
     gem.add_dependency 'dm-rails',       '>= 1.0.3'
-    gem.add_dependency 'devise',         '~> 1.1.0'
-    gem.add_dependency 'bcrypt-ruby',    '~> 2.1.2'
+    gem.add_dependency 'devise',         '~> 1.2.rc'
     gem.add_dependency 'sugar-high',     '~> 0.2.10'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/dm-devise.gemspec

@@ -1,72 +1,72 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dm-devise}
-  s.version = "1.1.8"
+  s.version = "1.2.0.beta"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jared Morgan"]
-  s.date = %q{2011-02-09}
+  s.date = %q{2011-02-03}
   s.description = %q{dm-devise adds DataMapper 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.rdoc"
+     "README.rdoc"
   ]
   s.files = [
     ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "dm-devise.gemspec",
-    "lib/devise/orm/data_mapper.rb",
-    "lib/devise/orm/data_mapper/compatibility.rb",
-    "lib/devise/orm/data_mapper/date_time.rb",
-    "lib/devise/orm/data_mapper/dm-validations.rb",
-    "lib/devise/orm/data_mapper/schema.rb",
-    "lib/devise/orm/data_mapper_active_model.rb",
-    "lib/dm-devise.rb",
-    "lib/dm-devise/version.rb",
-    "lib/generators/data_mapper/devise_generator.rb",
-    "test/data_mapper/compatibility_test.rb",
-    "test/data_mapper/schema_test.rb",
-    "test/orm/data_mapper.rb",
-    "test/orm/data_mapper_active_model.rb",
-    "test/overrides/data_mapper_test.rb",
-    "test/overrides/dm_validations_test.rb",
-    "test/rails_app/app/data_mapper/admin.rb",
-    "test/rails_app/app/data_mapper/shim.rb",
-    "test/rails_app/app/data_mapper/user.rb",
-    "test/rails_app/app/data_mapper_active_model/admin.rb",
-    "test/rails_app/app/data_mapper_active_model/user.rb",
-    "test/rails_app/config/application.rb",
-    "test/rails_app/config/environment.rb",
-    "test/test_helper.rb"
+     ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "dm-devise.gemspec",
+     "lib/devise/orm/data_mapper.rb",
+     "lib/devise/orm/data_mapper/compatibility.rb",
+     "lib/devise/orm/data_mapper/date_time.rb",
+     "lib/devise/orm/data_mapper/dm-validations.rb",
+     "lib/devise/orm/data_mapper/schema.rb",
+     "lib/devise/orm/data_mapper_active_model.rb",
+     "lib/dm-devise.rb",
+     "lib/dm-devise/version.rb",
+     "lib/generators/data_mapper/devise_generator.rb",
+     "test/data_mapper/compatibility_test.rb",
+     "test/orm/data_mapper.rb",
+     "test/orm/data_mapper_active_model.rb",
+     "test/overrides/data_mapper_test.rb",
+     "test/overrides/dm_validations_test.rb",
+     "test/rails_app/app/data_mapper/admin.rb",
+     "test/rails_app/app/data_mapper/shim.rb",
+     "test/rails_app/app/data_mapper/user.rb",
+     "test/rails_app/app/data_mapper_active_model/admin.rb",
+     "test/rails_app/app/data_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/jm81/dm-devise}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Support for using DataMapper ORM with devise}
   s.test_files = [
-    "test/data_mapper/compatibility_test.rb",
-    "test/data_mapper/schema_test.rb",
-    "test/orm/data_mapper.rb",
-    "test/orm/data_mapper_active_model.rb",
-    "test/overrides/data_mapper_test.rb",
-    "test/overrides/dm_validations_test.rb",
-    "test/rails_app/app/data_mapper/admin.rb",
-    "test/rails_app/app/data_mapper/shim.rb",
-    "test/rails_app/app/data_mapper/user.rb",
-    "test/rails_app/app/data_mapper_active_model/admin.rb",
-    "test/rails_app/app/data_mapper_active_model/user.rb",
-    "test/rails_app/config/application.rb",
-    "test/rails_app/config/environment.rb",
-    "test/test_helper.rb"
+    "test/test_helper.rb",
+     "test/data_mapper/compatibility_test.rb",
+     "test/rails_app/config/environment.rb",
+     "test/rails_app/config/application.rb",
+     "test/rails_app/app/data_mapper/admin.rb",
+     "test/rails_app/app/data_mapper/shim.rb",
+     "test/rails_app/app/data_mapper/user.rb",
+     "test/rails_app/app/data_mapper_active_model/admin.rb",
+     "test/rails_app/app/data_mapper_active_model/user.rb",
+     "test/overrides/data_mapper_test.rb",
+     "test/overrides/dm_validations_test.rb",
+     "test/orm/data_mapper.rb",
+     "test/orm/data_mapper_active_model.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -74,50 +74,29 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rails>, ["~> 3.0.3"])
-      s.add_development_dependency(%q<webrat>, ["= 0.7.2"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<oauth2>, [">= 0"])
-      s.add_development_dependency(%q<dm-sqlite-adapter>, ["~> 1.0.2"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<dm-migrations>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.2"])
+      s.add_runtime_dependency(%q<dm-migrations>, ["~> 1.0.2"])
+      s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.0.2"])
+      s.add_runtime_dependency(%q<dm-timestamps>, ["~> 1.0.2"])
       s.add_runtime_dependency(%q<dm-rails>, [">= 1.0.3"])
-      s.add_runtime_dependency(%q<devise>, ["~> 1.1.0"])
-      s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
+      s.add_runtime_dependency(%q<devise>, ["~> 1.2.rc"])
       s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.10"])
     else
-      s.add_dependency(%q<rails>, ["~> 3.0.3"])
-      s.add_dependency(%q<webrat>, ["= 0.7.2"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<oauth2>, [">= 0"])
-      s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.0.2"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
-      s.add_dependency(%q<dm-migrations>, ["~> 1.0.0"])
-      s.add_dependency(%q<dm-serializer>, ["~> 1.0.0"])
-      s.add_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
+      s.add_dependency(%q<dm-migrations>, ["~> 1.0.2"])
+      s.add_dependency(%q<dm-serializer>, ["~> 1.0.2"])
+      s.add_dependency(%q<dm-timestamps>, ["~> 1.0.2"])
       s.add_dependency(%q<dm-rails>, [">= 1.0.3"])
-      s.add_dependency(%q<devise>, ["~> 1.1.0"])
-      s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
+      s.add_dependency(%q<devise>, ["~> 1.2.rc"])
       s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 3.0.3"])
-    s.add_dependency(%q<webrat>, ["= 0.7.2"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<oauth2>, [">= 0"])
-    s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.0.2"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
-    s.add_dependency(%q<dm-migrations>, ["~> 1.0.0"])
-    s.add_dependency(%q<dm-serializer>, ["~> 1.0.0"])
-    s.add_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
+    s.add_dependency(%q<dm-migrations>, ["~> 1.0.2"])
+    s.add_dependency(%q<dm-serializer>, ["~> 1.0.2"])
+    s.add_dependency(%q<dm-timestamps>, ["~> 1.0.2"])
     s.add_dependency(%q<dm-rails>, [">= 1.0.3"])
-    s.add_dependency(%q<devise>, ["~> 1.1.0"])
-    s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
+    s.add_dependency(%q<devise>, ["~> 1.2.rc"])
     s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
   end
 end

data/lib/devise/orm/data_mapper.rb

@@ -3,6 +3,7 @@ require 'devise/orm/data_mapper/compatibility'
 require 'devise/orm/data_mapper/schema'
 require 'devise/orm/data_mapper/date_time'
 require 'devise/orm/data_mapper/dm-validations'
+require 'orm_adapter/adapters/data_mapper'
 
 module Devise
   module Orm

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

@@ -31,16 +31,6 @@ module Devise
               METHOD
             end
           end
-
-          # Add ActiveRecord like finder
-          def find(*args)
-            case args.first
-            when :first, :all
-              send(args.shift, *args)
-            else
-              get(*args)
-            end
-          end
         end
 
         def changed?

data/lib/devise/orm/data_mapper/dm-validations.rb

@@ -50,6 +50,6 @@ DataMapper::Validate::ValidationErrors.default_error_messages = {
   :even => 'must be even',
   :primitive => '%s must be of type %s',
   :not_found => '%s not found',
-  :already_confirmed => '%s was already confirmed',
+  :already_confirmed => '%s was already confirmed, please try signing in',
   :not_locked => '%s was not locked'
 }

data/lib/devise/orm/data_mapper_active_model.rb

@@ -2,6 +2,7 @@ require 'dm-devise'
 require 'devise/orm/data_mapper/compatibility'
 require 'devise/orm/data_mapper/schema'
 require 'devise/orm/data_mapper/date_time'
+require 'orm_adapter/adapters/data_mapper'
 
 module Devise
   module Orm

data/lib/dm-devise/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Devise
-    VERSION = '1.1.8'.freeze
+    VERSION = '1.2.0.beta'.freeze
   end
 end

data/lib/generators/data_mapper/devise_generator.rb

@@ -1,17 +1,25 @@
 require 'generators/devise/orm_helpers'
 require 'sugar-high/file'
 
+# Reload Active Support's String#blank?, overridden by sugar-high. Active Support's
+# version considers any all-space String blank, behavior that devise expects.
+class String #:nodoc:
+  def blank?
+    self !~ /\S/
+  end
+end
+
 module DataMapper
   module Generators
     class DeviseGenerator < Rails::Generators::NamedBase
       include ::Devise::Generators::OrmHelpers
 
       def generate_model
-        invoke "data_mapper:model", [name] unless model_exists?
+        invoke "data_mapper:model", [name] unless model_exists? && behavior == :invoke
       end
 
       def inject_devise_content
-        inject_into_file model_path, model_contents, :after => "include DataMapper::Resource\n"
+        inject_into_file model_path, model_contents, :after => "include DataMapper::Resource\n" if model_exists?
       end
 
       def replace_default_devise_orm

data/test/overrides/data_mapper_test.rb

@@ -48,3 +48,32 @@ class TrackableHooksTest < ActionController::IntegrationTest
   end
 end
 
+class DatabaseAuthenticatableTest < ActiveSupport::TestCase
+  undef test_should_downcase_case_insensitive_keys_when_saving
+
+  # save! is used in devise version of this test. In AR, save! runs callbacks
+  # (and raises an error if any return false, which I assume is why its being
+  # used). In DM, save! skips callbacks. Therefore, override and change #save!
+  # to #save.
+  test 'should downcase case insensitive keys when saving' do
+    # case_insensitive_keys is set to :email by default.
+    email = 'Foo@Bar.com'
+    user = new_user(:email => email)
+
+    assert_equal email, user.email
+    user.save
+    assert_equal email.downcase, user.email
+  end
+end
+
+class AuthenticationRedirectTest < ActionController::IntegrationTest
+  undef test_sign_in_with_xml_format_returns_xml_response
+
+  # It appears DM's to_xml does not add the xml header
+  test 'sign in with xml format returns xml response' do
+    create_user
+    post user_session_path(:format => 'xml', :user => {:email => "user@test.com", :password => '123456'})
+    assert_response :success
+    assert_match /\A<user><id/, response.body
+  end
+end

data/test/overrides/dm_validations_test.rb

@@ -29,13 +29,13 @@ if DEVISE_ORM == :data_mapper
 
   class AuthenticationOthersTest < ActionController::IntegrationTest
 
-    undef test_registration_in_xml_format
+    undef test_registration_in_xml_format_works_when_recognizing_path
 
     # DM's validates_confirmation_of requires the confirmation field to be present,
     # while ActiveModel by default skips the confirmation test if the confirmation
     # value is nil. This test takes advantage of AM's behavior, so just add the
     # :password_confirmation value.
-    test 'registration in xml format' do
+    test 'registration in xml format works when recognizing path' do
       assert_nothing_raised do
         # post user_registration_path(:format => 'xml', :user => {:email => "test@example.com", :password => "invalid"} )
         post user_registration_path(:format => 'xml', :user => {:email => "test@example.com", :password => "invalid", :password_confirmation => "invalid"} )

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

@@ -1,10 +1,13 @@
+require 'shared_admin'
+
 class Admin
   include DataMapper::Resource
 
   property :id,   Serial
   property :username, String
-  
+
+  include SharedAdmin
   include Shim
-  
-  devise :database_authenticatable, :timeoutable, :registerable, :recoverable, :lockable, :unlock_strategy => :time
+
+  property :remember_token, String
 end

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

@@ -1,3 +1,5 @@
+require 'shared_user'
+
 class User
   include DataMapper::Resource
 
@@ -6,10 +8,7 @@ class User
   property :facebook_token, String
   timestamps :at
 
-  devise :database_authenticatable, :confirmable, :lockable, :recoverable,
-         :registerable, :rememberable, :timeoutable, :token_authenticatable,
-         :trackable, :validatable
-
+  include SharedUser
   include Shim
 
   before :valid?, :update_password_confirmation

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

@@ -1,3 +1,4 @@
+require 'shared_admin'
 require File.join(File.dirname(__FILE__), '../data_mapper/shim.rb')
 
 class Admin
@@ -6,7 +7,8 @@ class Admin
   property :id,   Serial
   property :username, String
 
+  include SharedAdmin
   include Shim
 
-  devise :database_authenticatable, :timeoutable, :registerable, :recoverable, :lockable, :unlock_strategy => :time
+  property :remember_token, String
 end

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

@@ -1,3 +1,4 @@
+require 'shared_user'
 require File.join(File.dirname(__FILE__), '../data_mapper/shim.rb')
 
 class User
@@ -8,9 +9,6 @@ class User
   property :facebook_token, String
   timestamps :at
 
-  devise :database_authenticatable, :confirmable, :lockable, :recoverable,
-         :registerable, :rememberable, :timeoutable, :token_authenticatable,
-         :trackable, :validatable
-
+  include SharedUser
   include Shim
 end

data/test/rails_app/config/application.rb

@@ -6,7 +6,7 @@ require "action_mailer/railtie"
 require "active_resource/railtie"
 require "rails/test_unit/railtie"
 
-Bundler.require :default, :development, DEVISE_ORM
+Bundler.require :default, DEVISE_ORM
 
 begin
   require "#{DEVISE_ORM}/railtie"

data/test/test_helper.rb

@@ -16,6 +16,13 @@ Webrat.configure do |config|
   config.open_error_files = false
 end
 
+Devise::OmniAuth.test_mode!
+
 # Add support to load paths so we can overwrite broken webrat setup
 $:.unshift "#{DEVISE_PATH}/test/support"
 Dir["#{DEVISE_PATH}/test/support/**/*.rb"].each { |f| require f }
+
+# For generators
+require "rails/generators/test_case"
+require "generators/devise/install_generator"
+require "generators/devise/views_generator"

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-devise
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 31098177
+  prerelease: true
   segments: 
   - 1
-  - 1
-  - 8
-  version: 1.1.8
+  - 2
+  - 0
+  - beta
+  version: 1.2.0.beta
 platform: ruby
 authors: 
 - Jared Morgan
@@ -15,73 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -06:00
+date: 2011-02-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: dm-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: webrat
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 7
-        - 2
-        version: 0.7.2
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: oauth2
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: dm-sqlite-adapter
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,92 +33,60 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: dm-migrations
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 2
+        version: 1.0.2
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: dm-serializer
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 2
+        version: 1.0.2
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: dm-timestamps
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 2
+        version: 1.0.2
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: dm-rails
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -189,43 +98,27 @@ dependencies:
         - 3
         version: 1.0.3
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: devise
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-  type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 7712074
         segments: 
-        - 2
         - 1
         - 2
-        version: 2.1.2
+        - rc
+        version: 1.2.rc
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: sugar-high
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -237,7 +130,7 @@ dependencies:
         - 10
         version: 0.2.10
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id007
 description: dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails
 email: jmorgan@morgancreative.net
 executables: []
@@ -249,6 +142,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -265,7 +159,6 @@ files:
 - lib/dm-devise/version.rb
 - lib/generators/data_mapper/devise_generator.rb
 - test/data_mapper/compatibility_test.rb
-- test/data_mapper/schema_test.rb
 - test/orm/data_mapper.rb
 - test/orm/data_mapper_active_model.rb
 - test/overrides/data_mapper_test.rb
@@ -283,8 +176,8 @@ homepage: http://github.com/jm81/dm-devise
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -299,12 +192,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -313,17 +208,16 @@ signing_key:
 specification_version: 3
 summary: Support for using DataMapper ORM with devise
 test_files: 
+- test/test_helper.rb
 - test/data_mapper/compatibility_test.rb
-- test/data_mapper/schema_test.rb
-- test/orm/data_mapper.rb
-- test/orm/data_mapper_active_model.rb
-- test/overrides/data_mapper_test.rb
-- test/overrides/dm_validations_test.rb
+- test/rails_app/config/environment.rb
+- test/rails_app/config/application.rb
 - test/rails_app/app/data_mapper/admin.rb
 - test/rails_app/app/data_mapper/shim.rb
 - test/rails_app/app/data_mapper/user.rb
 - test/rails_app/app/data_mapper_active_model/admin.rb
 - test/rails_app/app/data_mapper_active_model/user.rb
-- test/rails_app/config/application.rb
-- test/rails_app/config/environment.rb
-- test/test_helper.rb
+- test/overrides/data_mapper_test.rb
+- test/overrides/dm_validations_test.rb
+- test/orm/data_mapper.rb
+- test/orm/data_mapper_active_model.rb

data/test/data_mapper/schema_test.rb

@@ -1,16 +0,0 @@
-require 'test_helper'
-
-class DataMapperSchemaTest < ActiveSupport::TestCase
-  test 'required explicitly set to false' do
-    begin
-      DataMapper::Property.required(true)
-      model = Class.new(User)
-      model.apply_devise_schema :required_string, String, :required => true
-      model.apply_devise_schema :not_required_string, String
-      assert model.properties['required_string'].required?
-      assert !model.properties['not_required_string'].required?
-    ensure
-      DataMapper::Property.required(false)
-    end
-  end
-end