dm-devise 2.1.0 → 2.2.0

data/Gemfile

@@ -15,7 +15,7 @@ end
 DM_VERSION = '~> 1.2.0'
 
 group :development do
-  gem 'rails', '~> 3.2.0'
+  gem 'rails', '~> 3.2.6'
   gem 'dm-sqlite-adapter', DM_VERSION
 
   gem 'dm-core', DM_VERSION

data/README.rdoc

@@ -1,9 +1,3 @@
-*IMPORTANT:* The apply_schema option is removed in dm-devise 2.1. If you are upgrading, please read: https://github.com/jm81/dm-devise/wiki/How-to:-upgrade-to-devise-2.0-schema-style
-
-*IMPORTANT:* Devise 2.1 is out. If you are upgrading, please read: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.1
-
-*IMPORTANT:* Devise 2.0 is out. If you are upgrading, please read: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0
-
 = dm-devise
 
 dm-devise lets you use devise (http://github.com/plataformatec/devise) with
@@ -14,8 +8,8 @@ dm-devise is intended for use with Rails >= 3.2 and devise >= 2.1.
 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 master: 2012-05-17, commit f6259531c36795be2766ffefd50de1f8803fc5cd
-Last tested against devise release 2.1.0
+Last tested against devise master: 2013-01-11, commit 872ef2b97fdb2efc072559db56daf15943f32eec
+Last tested against devise release 2.2.1
 
 == Installation
 

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

@@ -53,18 +53,26 @@ module Devise
           update(*args)
         end
 
+        def assign_attributes(params, *options)
+          self.attributes = params
+        end
+
         def invalid?
           !valid?
         end
 
         def email_changed?
-          attribute_dirty?(:email)
+          attribute_dirty?(:email) && self.email.present?
+        end
+
+        def encrypted_password_changed?
+          attribute_dirty?(:email) && self.encrypted_password.present?
         end
 
         def email_was
           original_attributes[:email]
         end
-        
+
         # Redefine properties_to_serialize in models for more secure defaults.
         # By default, it removes from the serializable model all attributes that
         # are *not* accessible. You can remove this default by using :force_exclude

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

@@ -11,9 +11,9 @@ if Devise.data_mapper_validation_lib == 'dm-validations'
 
         # If the message is a Symbol, allow +default_error_message+ to generate
         # the message, including translation.
-        def add(field_name, message = nil)
+        def add(field_name, message = nil, active_record_options = {})
           if message.kind_of?(Symbol)
-            message = self.class.default_error_message(message, field_name)
+            message = self.class.default_error_message(message, field_name, active_record_options.values)
           end
           original_add(field_name, message) unless errors[field_name].include?(message)
         end

data/lib/dm-devise/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Devise
-    VERSION = '2.1.0'.freeze
+    VERSION = '2.2.0'.freeze
   end
 end

data/lib/dm-devise.rb

@@ -20,6 +20,7 @@ module Devise
     :exclusion => '%s is reserved',
     :invalid => '%s is invalid',
     :confirmation => "%s doesn't match confirmation",
+    :confirmation_period_expired => '%s needs to be confirmed within %s, please request a new one',
     :accepted => '%s must be accepted',
     :nil => '%s must not be nil',
     :empty => "%s can't be empty",

data/test/overrides/data_mapper_test.rb

@@ -63,6 +63,19 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
     assert_equal email.downcase, user.email
   end
 
+  undef test_should_downcase_case_insensitive_keys_that_refer_to_virtual_attributes_when_saving
+
+  test 'should downcase case insensitive keys that refer to virtual attributes when saving' do
+    email        = 'Foo@Bar1.com'
+    confirmation = 'Foo@Bar1.com'
+    attributes   = valid_attributes(:email => email, :email_confirmation => confirmation)
+    user = UserWithVirtualAttributes.new(attributes)
+
+    assert_equal confirmation, user.email_confirmation
+    user.save
+    assert_equal confirmation.downcase, user.email_confirmation
+  end
+
   undef test_should_remove_whitespace_from_strip_whitespace_keys_when_saving
 
   test 'should remove whitespace from strip whitespace keys when saving' do

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

@@ -28,6 +28,9 @@ class Admin
   ## Lockable
   property :locked_at, DateTime
 
+  ## Attribute for testing route blocks
+  property :active, Boolean, :default => false
+
   include SharedAdmin
   include Shim
 end

data/test/test_models.rb

@@ -0,0 +1,31 @@
+class Configurable < User
+  devise :database_authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
+         :stretches => 15, :pepper => 'abcdef', :allow_unconfirmed_access_for => 5.days,
+         :remember_for => 7.days, :timeout_in => 15.minutes, :unlock_in => 10.days
+end
+
+class WithValidation < Admin
+  devise :database_authenticatable, :validatable, :password_length => 2..6
+end
+
+class UserWithValidation < User
+  validates_presence_of :username
+end
+
+class UserWithVirtualAttributes < User
+  validates_presence_of :email
+  validates_confirmation_of :email, :if => :new?
+  attr_accessible :email, :email_confirmation
+  attr_accessor :email_confirmation
+  devise :database_authenticatable, :validatable, :case_insensitive_keys => [ :email, :email_confirmation ]
+end
+
+class Several < Admin
+  devise :validatable
+  devise :lockable
+end
+
+class Inheritable < Admin
+end
+
+DataMapper.finalize

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-devise
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &84857470 !ruby/object:Gem::Requirement
+  requirement: &87065470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *84857470
+  version_requirements: *87065470
 - !ruby/object:Gem::Dependency
   name: dm-migrations
-  requirement: &84857070 !ruby/object:Gem::Requirement
+  requirement: &87064870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *84857070
+  version_requirements: *87064870
 - !ruby/object:Gem::Dependency
   name: dm-serializer
-  requirement: &84856700 !ruby/object:Gem::Requirement
+  requirement: &87063760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -52,10 +52,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *84856700
+  version_requirements: *87063760
 - !ruby/object:Gem::Dependency
   name: dm-timestamps
-  requirement: &84856330 !ruby/object:Gem::Requirement
+  requirement: &87057410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *84856330
+  version_requirements: *87057410
 - !ruby/object:Gem::Dependency
   name: dm-rails
-  requirement: &84855950 !ruby/object:Gem::Requirement
+  requirement: &87056790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -80,10 +80,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *84855950
+  version_requirements: *87056790
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &84855550 !ruby/object:Gem::Requirement
+  requirement: &87056340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -91,7 +91,7 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *84855550
+  version_requirements: *87056340
 description: dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise)
   for authentication support for Rails
 email: jmorgan@morgancreative.net
@@ -128,6 +128,7 @@ files:
 - test/rails_app/config/application.rb
 - test/rails_app/config/environment.rb
 - test/test_helper.rb
+- test/test_models.rb
 homepage: https://github.com/jm81/dm-devise
 licenses: []
 post_install_message: 
@@ -153,3 +154,4 @@ signing_key:
 specification_version: 3
 summary: DataMapper support for devise
 test_files: []
+has_rdoc: