dm-devise 0.1.0 → 1.1.0

data/Gemfile

@@ -6,7 +6,6 @@ gem "warden", "0.10.7"
 gem "webrat", "0.7.0"
 gem "mocha", :require => false
 gem "bcrypt-ruby", :require => "bcrypt"
-gem 'devise',            '~> 1.1.0', :git => 'git://github.com/plataformatec/devise'
 
 gem 'dm-core',           '~> 1.0.0'
 gem 'dm-migrations',     '~> 1.0.0'

data/Gemfile.lock

@@ -8,31 +8,11 @@ GIT
       dm-active_model (~> 1.0.0)
       dm-core (~> 1.0.0)
       railties (~> 3.0.0.beta3)
-    dm-rails (1.0.0)
-      actionpack (~> 3.0.0.beta3)
-      activesupport (~> 3.0.0.beta3)
-      dm-active_model (~> 1.0.0)
-      dm-core (~> 1.0.0)
-      railties (~> 3.0.0.beta3)
-
-GIT
-  remote: git://github.com/plataformatec/devise
-  revision: ae6322e
-  specs:
-    devise (1.1.0)
-      bcrypt-ruby (~> 2.1.2)
-      warden (~> 0.10.7)
-    devise (1.1.0)
-      bcrypt-ruby (~> 2.1.2)
-      warden (~> 0.10.7)
 
 GIT
   remote: git://github.com/rails/rails.git
   revision: 8079484
   specs:
-    actionmailer (3.0.0.beta4)
-      actionpack (= 3.0.0.beta4)
-      mail (~> 2.2.3)
     actionmailer (3.0.0.beta4)
       actionpack (= 3.0.0.beta4)
       mail (~> 2.2.3)
@@ -45,28 +25,10 @@ GIT
       rack (~> 1.2.1)
       rack-test (~> 0.5.4)
       tzinfo (~> 0.3.16)
-    actionpack (3.0.0.beta4)
-      activemodel (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
-      rack (~> 1.2.1)
-      rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.16)
     activemodel (3.0.0.beta4)
       activesupport (= 3.0.0.beta4)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activemodel (3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0.beta4)
-      activemodel (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-      arel (~> 0.4.0)
-      tzinfo (~> 0.3.16)
     activerecord (3.0.0.beta4)
       activemodel (= 3.0.0.beta4)
       activesupport (= 3.0.0.beta4)
@@ -75,19 +37,7 @@ GIT
     activeresource (3.0.0.beta4)
       activemodel (= 3.0.0.beta4)
       activesupport (= 3.0.0.beta4)
-    activeresource (3.0.0.beta4)
-      activemodel (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-    activesupport (3.0.0.beta4)
     activesupport (3.0.0.beta4)
-    rails (3.0.0.beta4)
-      actionmailer (= 3.0.0.beta4)
-      actionpack (= 3.0.0.beta4)
-      activerecord (= 3.0.0.beta4)
-      activeresource (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-      bundler (>= 1.0.0.beta.2)
-      railties (= 3.0.0.beta4)
     rails (3.0.0.beta4)
       actionmailer (= 3.0.0.beta4)
       actionpack (= 3.0.0.beta4)
@@ -101,57 +51,29 @@ GIT
       activesupport (= 3.0.0.beta4)
       rake (>= 0.8.3)
       thor (~> 0.13.7)
-    railties (3.0.0.beta4)
-      actionpack (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-      rake (>= 0.8.3)
-      thor (~> 0.13.7)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
     abstract (1.0.0)
     addressable (2.1.2)
-    addressable (2.1.2)
-    arel (0.4.0)
-      activesupport (>= 3.0.0.beta)
     arel (0.4.0)
       activesupport (>= 3.0.0.beta)
     bcrypt-ruby (2.1.2)
-    bcrypt-ruby (2.1.2)
-    builder (2.1.2)
     builder (2.1.2)
     data_objects (0.10.2)
       addressable (~> 2.1)
-    data_objects (0.10.2)
-      addressable (~> 2.1)
-    dm-active_model (1.0.0)
-      activemodel (~> 3.0.0.beta3)
-      dm-core (~> 1.0.0)
     dm-active_model (1.0.0)
       activemodel (~> 3.0.0.beta3)
       dm-core (~> 1.0.0)
     dm-core (1.0.0)
       addressable (~> 2.1)
       extlib (~> 0.9.15)
-    dm-core (1.0.0)
-      addressable (~> 2.1)
-      extlib (~> 0.9.15)
-    dm-do-adapter (1.0.0)
-      data_objects (~> 0.10.1)
-      dm-core (~> 1.0.0)
     dm-do-adapter (1.0.0)
       data_objects (~> 0.10.1)
       dm-core (~> 1.0.0)
     dm-migrations (1.0.0)
       dm-core (~> 1.0.0)
-    dm-migrations (1.0.0)
-      dm-core (~> 1.0.0)
-    dm-serializer (1.0.0)
-      dm-core (~> 1.0.0)
-      fastercsv (~> 1.5.3)
-      json_pure (~> 1.4.3)
     dm-serializer (1.0.0)
       dm-core (~> 1.0.0)
       fastercsv (~> 1.5.3)
@@ -159,75 +81,37 @@ GEM
     dm-sqlite-adapter (1.0.0)
       dm-do-adapter (~> 1.0.0)
       do_sqlite3 (~> 0.10.2)
-    dm-sqlite-adapter (1.0.0)
-      dm-do-adapter (~> 1.0.0)
-      do_sqlite3 (~> 0.10.2)
-    dm-timestamps (1.0.0)
-      dm-core (~> 1.0.0)
     dm-timestamps (1.0.0)
       dm-core (~> 1.0.0)
     dm-validations (1.0.0)
       dm-core (~> 1.0.0)
-    dm-validations (1.0.0)
-      dm-core (~> 1.0.0)
-    do_sqlite3 (0.10.2)
-      data_objects (= 0.10.2)
     do_sqlite3 (0.10.2)
       data_objects (= 0.10.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
     extlib (0.9.15)
-    extlib (0.9.15)
-    fastercsv (1.5.3)
     fastercsv (1.5.3)
     i18n (0.4.1)
-    i18n (0.4.1)
-    json_pure (1.4.3)
     json_pure (1.4.3)
     mail (2.2.5)
       activesupport (>= 2.3.6)
       mime-types
       treetop (>= 1.4.5)
-    mail (2.2.5)
-      activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
-    mime-types (1.16)
     mime-types (1.16)
-    mocha (0.9.8)
-      rake
     mocha (0.9.8)
       rake
     nokogiri (1.4.2)
-    nokogiri (1.4.2)
-    polyglot (0.3.1)
     polyglot (0.3.1)
     rack (1.2.1)
-    rack (1.2.1)
-    rack-test (0.5.4)
-      rack (>= 1.0)
     rack-test (0.5.4)
       rack (>= 1.0)
     rake (0.8.7)
-    rake (0.8.7)
-    thor (0.13.7)
     thor (0.13.7)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
-    treetop (1.4.8)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.22)
     tzinfo (0.3.22)
     warden (0.10.7)
       rack (>= 1.0.0)
-    warden (0.10.7)
-      rack (>= 1.0.0)
-    webrat (0.7.0)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
     webrat (0.7.0)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
@@ -238,7 +122,6 @@ PLATFORMS
 
 DEPENDENCIES
   bcrypt-ruby
-  devise (~> 1.1.0)!
   dm-core (~> 1.0.0)
   dm-migrations (~> 1.0.0)
   dm-rails (~> 1.0.0)!

data/README.rdoc

@@ -20,15 +20,14 @@ 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
 
-== Installation
+Last tested against devise release: v1.1.1
 
-Rails, devise and dm-rails all need to be following master while rails and
-devise are in beta/pre-release stage.
+Last tested against devise master: 2010-07-27, commit 879b64edc945e3531e65abf4a6b7970052927e39
 
-Make sure the following are in your Gemfile (the :git => 'path' arguments are
-needed for now):
+== Installation
 
-  gem "rails", :git => "git://github.com/rails/rails.git"
+Add devise, dm-devise and dm gems to your Gemfile. The following gems are
+required (although devise version may differ)
 
   gem 'dm-core',           '~> 1.0.0'
   gem 'dm-migrations',     '~> 1.0.0'
@@ -38,8 +37,8 @@ needed for now):
   gem 'dm-rails',          '~> 1.0.0', :git => 'git://github.com/datamapper/dm-rails'
   gem 'dm-validations',    '~> 1.0.0' # Do not include if using data_mapper_active_model
 
-  gem 'devise',            '~> 1.1.0', :git => 'git://github.com/plataformatec/devise'
-  gem 'dm-devise',         '~> 0.1.0', :git => 'git://github.com/jm81/dm-devise'
+  gem 'devise',            '~> 1.1.1'
+  gem 'dm-devise',         '~> 1.1.0'
 
 If you're using data_mapper_active_model do not include dm-validations in your
 Gemfile. Note that it's fine to follow master on DM gems other than dm-rails,
@@ -63,8 +62,6 @@ Read the README for devise at http://github.com/plataformatec/devise/blob/master
 == TODO
 
 * Example app
-* Publish gem
-* Updates when Rails 3 / Devise 1.1 are released (remove :git sources in Gemfile)
 * Rails templates
 
 == Note on Patches/Pull Requests

data/Rakefile

@@ -62,7 +62,7 @@ begin
     gem.add_dependency 'dm-serializer',  '~> 1.0.0'
     gem.add_dependency 'dm-timestamps',  '~> 1.0.0'
     gem.add_dependency 'dm-rails',       '~> 1.0.0'
-    # gem.add_dependency 'devise',         '~> 1.1.0'
+    gem.add_dependency 'devise'
     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

data/dm-devise.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-devise}
-  s.version = "0.1.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jared Morgan"]
-  s.date = %q{2010-07-06}
+  s.date = %q{2010-07-28}
   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 = [
@@ -79,6 +79,7 @@ Gem::Specification.new do |s|
       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-rails>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<devise>, [">= 0"])
       s.add_runtime_dependency(%q<warden>, ["~> 0.10.7"])
       s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
     else
@@ -88,6 +89,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<dm-serializer>, ["~> 1.0.0"])
       s.add_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
       s.add_dependency(%q<dm-rails>, ["~> 1.0.0"])
+      s.add_dependency(%q<devise>, [">= 0"])
       s.add_dependency(%q<warden>, ["~> 0.10.7"])
       s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
     end
@@ -98,6 +100,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<dm-serializer>, ["~> 1.0.0"])
     s.add_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
     s.add_dependency(%q<dm-rails>, ["~> 1.0.0"])
+    s.add_dependency(%q<devise>, [">= 0"])
     s.add_dependency(%q<warden>, ["~> 0.10.7"])
     s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
   end

data/lib/dm-devise/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Devise
-    VERSION = "0.1.0".freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/test/overrides/dm_validations_test.rb

@@ -26,7 +26,7 @@ class ValidatableTest < ActiveSupport::TestCase
 
 end
 
-class AuthenticationWithScopesTest < ActionController::IntegrationTest
+class AuthenticationOthersTest < ActionController::IntegrationTest
 
   undef test_registration_in_xml_format
 

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

@@ -4,7 +4,7 @@ class Admin
   property :id,   Serial
   property :username, String
   
-  devise :database_authenticatable, :registerable, :timeoutable, :recoverable
+  devise :database_authenticatable, :registerable, :timeoutable, :recoverable, :lockable, :unlock_strategy => :time
   
   def self.create!(*args)
     create(*args)

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

@@ -4,7 +4,7 @@ class Admin
   property :id,   Serial
   property :username, String
   
-  devise :database_authenticatable, :registerable, :timeoutable, :recoverable
+  devise :database_authenticatable, :registerable, :timeoutable, :recoverable, :lockable, :unlock_strategy => :time
   
   def self.create!(*args)
     create(*args)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-devise
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 19
   prerelease: false
   segments: 
-  - 0
+  - 1
   - 1
   - 0
-  version: 0.1.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jared Morgan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 -05:00
+date: 2010-07-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,9 +115,23 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: warden
+  name: devise
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: warden
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -129,11 +143,11 @@ dependencies:
         - 7
         version: 0.10.7
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: bcrypt-ruby
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -145,7 +159,7 @@ dependencies:
         - 2
         version: 2.1.2
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 description: dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails
 email: jmorgan@morgancreative.net
 executables: []