dm-devise 1.3.1 → 1.4.0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    dm-devise (1.3.0)
-      devise (~> 1.3.0)
+    dm-devise (1.3.1)
+      devise (~> 1.3)
       dm-core (>= 1.0.2, < 1.2)
       dm-migrations (>= 1.0.2, < 1.2)
       dm-rails (>= 1.0.3, < 1.2)
@@ -14,39 +14,39 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.5)
-      actionpack (= 3.0.5)
-      mail (~> 2.2.15)
-    actionpack (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+    actionmailer (3.0.9)
+      actionpack (= 3.0.9)
+      mail (~> 2.2.19)
+    actionpack (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
+      rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      arel (~> 2.0.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-    activesupport (3.0.5)
-    addressable (2.2.4)
-    arel (2.0.9)
+    activeresource (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+    activesupport (3.0.9)
+    addressable (2.2.6)
+    arel (2.0.10)
     bcrypt-ruby (2.1.4)
     builder (2.1.2)
-    data_objects (0.10.3)
+    data_objects (0.10.6)
       addressable (~> 2.1)
-    devise (1.3.0)
+    devise (1.4.0)
       bcrypt-ruby (~> 2.1.2)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
@@ -76,67 +76,70 @@ GEM
       dm-core (~> 1.1.0)
     dm-validations (1.1.0)
       dm-core (~> 1.1.0)
-    do_sqlite3 (0.10.3)
-      data_objects (= 0.10.3)
+    do_sqlite3 (0.10.6)
+      data_objects (= 0.10.6)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.5.7)
+    faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
+      rack (< 2, >= 1.1.0)
     fastercsv (1.5.4)
     i18n (0.5.0)
     json (1.4.6)
-    mail (2.2.15)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
     mocha (0.9.12)
-    multi_json (0.0.5)
-    multipart-post (1.1.0)
-    nokogiri (1.4.4)
-    oa-core (0.2.0)
-      rack (~> 1.1)
-    oa-oauth (0.2.0)
-      multi_json (~> 0.0.2)
-      nokogiri (~> 1.4.2)
-      oa-core (= 0.2.0)
+    multi_json (1.0.3)
+    multi_xml (0.2.2)
+    multipart-post (1.1.2)
+    nokogiri (1.4.6)
+    oa-core (0.2.6)
+    oa-oauth (0.2.6)
+      faraday (~> 0.6.1)
+      multi_json (~> 1.0.0)
+      multi_xml (~> 0.2.2)
+      oa-core (= 0.2.6)
       oauth (~> 0.4.0)
-      oauth2 (~> 0.1.1)
-    oa-openid (0.2.0)
-      oa-core (= 0.2.0)
-      rack-openid (~> 1.2.0)
-      ruby-openid-apps-discovery
+      oauth2 (~> 0.4.1)
+    oa-openid (0.2.6)
+      oa-core (= 0.2.6)
+      rack-openid (~> 1.3.1)
+      ruby-openid-apps-discovery (~> 1.2.0)
     oauth (0.4.4)
-    oauth2 (0.1.1)
-      faraday (~> 0.5.0)
-      multi_json (~> 0.0.4)
-    orm_adapter (0.0.4)
+    oauth2 (0.4.1)
+      faraday (~> 0.6.1)
+      multi_json (>= 0.0.5)
+    orm_adapter (0.0.5)
     polyglot (0.3.1)
-    rack (1.2.2)
+    rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-openid (1.2.0)
+    rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.5)
-      actionmailer (= 3.0.5)
-      actionpack (= 3.0.5)
-      activerecord (= 3.0.5)
-      activeresource (= 3.0.5)
-      activesupport (= 3.0.5)
+    rails (3.0.9)
+      actionmailer (= 3.0.9)
+      actionpack (= 3.0.9)
+      activerecord (= 3.0.9)
+      activeresource (= 3.0.9)
+      activesupport (= 3.0.9)
       bundler (~> 1.0)
-      railties (= 3.0.5)
-    railties (3.0.5)
-      actionpack (= 3.0.5)
-      activesupport (= 3.0.5)
+      railties (= 3.0.9)
+    railties (3.0.9)
+      actionpack (= 3.0.9)
+      activesupport (= 3.0.9)
       rake (>= 0.8.7)
+      rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.8.7)
+    rake (0.9.2)
+    rdoc (3.6.1)
     require_all (1.2.0)
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
@@ -147,9 +150,9 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.25)
-    warden (1.0.3)
-      rack (>= 1.0.0)
+    tzinfo (0.3.28)
+    warden (1.0.4)
+      rack (>= 1.0)
     webrat (0.7.2)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)

data/README.rdoc

@@ -13,15 +13,15 @@ library you wish to use for validations:
   The advantage to this is ActiveModel's I18n support for error messages, and
   it uses the same validations lib as devise does by default.
 
-dm-devise is intended for use with Rails 3 and devise 1.1. It may work with
+dm-devise is intended for use with Rails 3 and devise >= 1.1. It may work with
 earlier versions, but it's not been tested (if you try, please let Jared Morgan
 (http://github.com/jm81) know how it goes.)
 
 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: 2011-04-21, commit 64cf8a45347137053b6c91bf85a3542c26e94771
-Last tested against devise release 1.3.3
+Last tested against devise master: 2011-06-23, commit dba8f91f99dce0e102ad2e6aa78b142a92833bc3
+Last tested against devise release 1.4.0
 
 == Installation
 
@@ -33,7 +33,7 @@ Add dm-devise and dm gems to your Gemfile. The following gems are required:
   gem 'dm-timestamps',     '~> 1.1.0'
   gem 'dm-rails',          '~> 1.1.0'
   gem 'dm-validations',    '~> 1.1.0' # Do not include if using data_mapper_active_model
-  gem 'dm-devise',         '~> 1.3.1'
+  gem 'dm-devise',         '~> 1.4.0'
 
 If you're using data_mapper_active_model do not include dm-validations in your
 Gemfile.
@@ -75,7 +75,7 @@ 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.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/dm-devise.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency('dm-serializer', '>= 1.0.2', '< 1.2')
   s.add_dependency('dm-timestamps', '>= 1.0.2', '< 1.2')
   s.add_dependency('dm-rails', '>= 1.0.3', '< 1.2')
-  s.add_dependency('devise', '~> 1.3.0')
+  s.add_dependency('devise', '~> 1.3')
   s.add_dependency('sugar-high', '~> 0.2.10')
 end

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

@@ -52,7 +52,7 @@ module Devise
         def update_attribute(name, value)
           update(name => value)
         end
-        
+
         def update_attributes(*args)
           update(*args)
         end
@@ -60,6 +60,10 @@ module Devise
         def invalid?
           !valid?
         end
+
+        def email_changed?
+          attribute_dirty?(:email)
+        end
       end
     end
   end

data/lib/dm-devise/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Devise
-    VERSION = '1.3.1'.freeze
+    VERSION = '1.4.0'.freeze
   end
 end

data/test/overrides/data_mapper_test.rb

@@ -64,4 +64,59 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
     user.save
     assert_equal email.downcase, user.email
   end
+
+  undef test_should_remove_whitespace_from_strip_whitespace_keys_when_saving
+
+  test 'should remove whitespace from strip whitespace keys when saving' do
+    # strip_whitespace_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.strip, user.email
+  end
+end
+
+class ValidatableTest < ActiveSupport::TestCase
+  # user.save! is failing in these tests, since validation are running anyway.
+  # See https://github.com/datamapper/dm-validations/pull/13.
+
+  undef :"test_should_require_uniqueness_of_email_if_email_has_changed,_allowing_blank"
+
+  test 'should require uniqueness of email if email has changed, allowing blank' do
+    existing_user = create_user
+
+    user = new_user(:email => '')
+    assert user.invalid?
+    assert_no_match(/taken/, user.errors[:email].join)
+
+    user.email = existing_user.email
+    assert user.invalid?
+    assert_match(/taken/, user.errors[:email].join)
+
+    pending do
+      user.save(:validate => false)
+      assert user.valid?
+    end
+  end
+
+  undef :"test_should_require_correct_email_format_if_email_has_changed,_allowing_blank"
+
+  test 'should require correct email format if email has changed, allowing blank' do
+    user = new_user(:email => '')
+    assert user.invalid?
+    assert_not_equal 'is invalid', user.errors[:email].join
+
+    %w(invalid_email_format 123 $$$ \(\) ).each do |email|
+      user.email = email
+      assert user.invalid?, 'should be invalid with email ' << email
+      assert_equal 'is invalid', user.errors[:email].join
+    end
+
+    pending do
+      user.save(:validate => false)
+      assert user.valid?
+    end
+  end
 end

data/test/overrides/dm_validations_test.rb

@@ -25,5 +25,13 @@ if DEVISE_ORM == :data_mapper
       assert_equal 'must be between 6 and 128 characters long', user.errors[:password].join
     end
 
+    undef test_should_complain_about_length_even_if_possword_is_not_required
+
+    test 'should complain about length even if possword is not required' do
+      user = new_user(:password => 'x'*129, :password_confirmation => 'x'*129)
+      user.stubs(:password_required?).returns(false)
+      assert user.invalid?
+      assert_equal 'must be between 6 and 128 characters long', user.errors[:password].join
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-devise
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  - 1
-  version: 1.3.1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Jared Morgan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 -05:00
+date: 2011-06-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,12 +141,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 9
         segments: 
         - 1
         - 3
-        - 0
-        version: 1.3.0
+        version: "1.3"
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency