dm-devise 1.5.0.beta → 1.5.0

data/CHANGELOG.rdoc

@@ -1,4 +1,4 @@
-== 1.5.0.beta
+== 1.5.0
 
 * enhancements
   * determine validation library extensions to load based on which validation
@@ -6,6 +6,7 @@
   * Add data_mapper_validation_messages config option so that default messages
     can be overriden.
   * Add data_mapper:devise_install generator with dm-devise related options
+  * Verify compatibility with DM 1.2.0.rc1 and Rails 1.3.0
 
 == 1.4.0
 

data/Gemfile

@@ -10,10 +10,10 @@ group :test do
   gem 'mocha', :require => false
 end
 
-DM_VERSION = '~> 1.1.0'
+DM_VERSION = '~> 1.2.0.rc1'
 
 group :development do
-  gem 'rails', '~> 3.0.4'
+  gem 'rails', '~> 3.1.0'
   gem 'dm-sqlite-adapter', DM_VERSION
 
   gem 'dm-core', DM_VERSION

data/Gemfile.lock

@@ -1,98 +1,105 @@
 PATH
   remote: .
   specs:
-    dm-devise (1.5.0.beta)
+    dm-devise (1.5.0)
       devise (~> 1.3)
-      dm-core (>= 1.0.2, < 1.2)
-      dm-migrations (>= 1.0.2, < 1.2)
-      dm-rails (>= 1.0.3, < 1.2)
-      dm-serializer (>= 1.0.2, < 1.2)
-      dm-timestamps (>= 1.0.2, < 1.2)
+      dm-core (>= 1.0.2, < 1.3)
+      dm-migrations (>= 1.0.2, < 1.3)
+      dm-rails (>= 1.0.3, < 1.3)
+      dm-serializer (>= 1.0.2, < 1.3)
+      dm-timestamps (>= 1.0.2, < 1.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    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.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.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.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
+      mail (~> 2.3.0)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
     addressable (2.2.6)
-    arel (2.0.10)
-    bcrypt-ruby (2.1.4)
-    builder (2.1.2)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.0)
+    builder (3.0.0)
     data_objects (0.10.6)
       addressable (~> 2.1)
-    devise (1.4.2)
-      bcrypt-ruby (~> 2.1.2)
+    devise (1.4.5)
+      bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
-    dm-active_model (1.1.0)
-      activemodel (~> 3.0.4)
-      dm-core (~> 1.1.0)
-    dm-core (1.1.0)
-      addressable (~> 2.2.4)
-    dm-do-adapter (1.1.0)
-      data_objects (~> 0.10.2)
-      dm-core (~> 1.1.0)
-    dm-migrations (1.1.0)
-      dm-core (~> 1.1.0)
-    dm-rails (1.1.0)
-      actionpack (~> 3.0.4)
-      dm-active_model (~> 1.1.0)
-      dm-core (~> 1.1.0)
-      railties (~> 3.0.4)
-    dm-serializer (1.1.0)
-      dm-core (~> 1.1.0)
+    dm-active_model (1.2.0.rc1)
+      activemodel (~> 3.1.0)
+      dm-core (~> 1.2.0.rc1)
+    dm-core (1.2.0.rc1)
+      addressable (~> 2.2.6)
+    dm-do-adapter (1.2.0.rc1)
+      data_objects (~> 0.10.6)
+      dm-core (~> 1.2.0.rc1)
+    dm-migrations (1.2.0.rc1)
+      dm-core (~> 1.2.0.rc1)
+    dm-rails (1.2.0.rc1)
+      actionpack (~> 3.1.0)
+      dm-active_model (~> 1.2.0.rc1)
+      dm-core (~> 1.2.0.rc1)
+      railties (~> 3.1.0)
+    dm-serializer (1.2.0.rc1)
+      dm-core (~> 1.2.0.rc1)
       fastercsv (~> 1.5.4)
-      json (~> 1.4.6)
-    dm-sqlite-adapter (1.1.0)
-      dm-do-adapter (~> 1.1.0)
-      do_sqlite3 (~> 0.10.2)
-    dm-timestamps (1.1.0)
-      dm-core (~> 1.1.0)
-    dm-validations (1.1.0)
-      dm-core (~> 1.1.0)
+      json (~> 1.5.4)
+      json_pure (~> 1.5.4)
+      multi_json (~> 1.0.3)
+    dm-sqlite-adapter (1.2.0.rc1)
+      dm-do-adapter (~> 1.2.0.rc1)
+      do_sqlite3 (~> 0.10.6)
+    dm-timestamps (1.2.0.rc1)
+      dm-core (~> 1.2.0.rc1)
+    dm-validations (1.2.0.rc1)
+      dm-core (~> 1.2.0.rc1)
     do_sqlite3 (0.10.6)
       data_objects (= 0.10.6)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+    erubis (2.7.0)
     faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
     fastercsv (1.5.4)
-    i18n (0.5.0)
-    json (1.4.6)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.5.4)
+    json_pure (1.5.4)
+      spruz (~> 0.2.8)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    metaclass (0.0.1)
     mime-types (1.16)
-    mocha (0.9.12)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
     multi_json (1.0.3)
     multi_xml (0.2.2)
     multipart-post (1.1.3)
@@ -115,34 +122,45 @@ GEM
       multi_json (>= 0.0.5)
     orm_adapter (0.0.5)
     polyglot (0.3.2)
-    rack (1.2.3)
-    rack-mount (0.6.14)
+    rack (1.3.2)
+    rack-cache (1.0.3)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
       bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
+      railties (= 3.1.0)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (~> 0.14.6)
     rake (0.9.2)
-    rdoc (3.8)
+    rdoc (3.9.4)
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
+    sprockets (2.0.0)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
+    spruz (0.2.13)
     thor (0.14.6)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
@@ -158,16 +176,16 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  dm-core (~> 1.1.0)
+  dm-core (~> 1.2.0.rc1)
   dm-devise!
-  dm-migrations (~> 1.1.0)
-  dm-rails (~> 1.1.0)
-  dm-serializer (~> 1.1.0)
-  dm-sqlite-adapter (~> 1.1.0)
-  dm-timestamps (~> 1.1.0)
-  dm-validations (~> 1.1.0)
+  dm-migrations (~> 1.2.0.rc1)
+  dm-rails (~> 1.2.0.rc1)
+  dm-serializer (~> 1.2.0.rc1)
+  dm-sqlite-adapter (~> 1.2.0.rc1)
+  dm-timestamps (~> 1.2.0.rc1)
+  dm-validations (~> 1.2.0.rc1)
   mocha
   oa-oauth (~> 0.2.0)
   oa-openid (~> 0.2.0)
-  rails (~> 3.0.4)
+  rails (~> 3.1.0)
   webrat (= 0.7.2)

data/README.rdoc

@@ -10,8 +10,8 @@ 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 master: 2011-08-02, commit 919404df53a0ee9a8c5be50a3d74acf10ac2e38c
-Last tested against devise release 1.4.2
+Last tested against devise master: 2011-09-09, commit ea7f15917f70b82d1ddc9559db968894f2c82cad
+Last tested against devise release 1.4.5
 
 == Installation
 
@@ -23,7 +23,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.5.0.beta'
+  gem 'dm-devise',         '~> 1.5.0'
 
 If you're using Active Model validations, do not include dm-validations in your
 Gemfile.

data/dm-devise.gemspec

@@ -16,10 +16,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('dm-core', '>= 1.0.2', '< 1.2')
-  s.add_dependency('dm-migrations', '>= 1.0.2', '< 1.2')
-  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('dm-core', '>= 1.0.2', '< 1.3')
+  s.add_dependency('dm-migrations', '>= 1.0.2', '< 1.3')
+  s.add_dependency('dm-serializer', '>= 1.0.2', '< 1.3')
+  s.add_dependency('dm-timestamps', '>= 1.0.2', '< 1.3')
+  s.add_dependency('dm-rails', '>= 1.0.3', '< 1.3')
   s.add_dependency('devise', '~> 1.3')
 end

data/lib/dm-devise/version.rb

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

data/test/overrides/data_mapper_test.rb

@@ -141,6 +141,17 @@ class SerializableTest < ActiveSupport::TestCase
   end
 end
 
+class AuthenticationOthersTest < ActionController::IntegrationTest
+  undef test_sign_in_stub_in_xml_format
+
+  # In this test, password is nil. AR's serializer adds an attribute specifying
+  # it is nil, while dm-serializer removes the property altogether.
+  test 'sign in stub in xml format' do
+    get new_user_session_path(:format => 'xml')
+    assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>\n  <email></email>\n</user>\n", response.body
+  end
+end
+
 class DeviseHelperTest < ActionController::IntegrationTest
   # Ensure test finds the translation of the model name.
   setup do

data/test/overrides/dm_validations_test.rb

@@ -33,4 +33,21 @@ if VALIDATION_LIB == 'dm-validations'
       assert_equal 'must be between 6 and 128 characters long', user.errors[:password].join
     end
   end
+
+  class ActiveRecordTest < ActiveSupport::TestCase
+    undef test_validations_options_are_not_applied_too_late
+
+    test 'validations options are not applied too late' do
+      validators = WithValidation.validators.contexts[:default].select{|validator| validator.field_name == :password}
+      length = validators.find { |v| v.class.name == 'DataMapper::Validations::LengthValidator' }
+      assert_equal (2..6), length.options[:within]
+    end
+
+    undef test_validations_are_applied_just_once
+
+    test 'validations are applied just once' do
+      validators = Several.validators.contexts[:default].select{|validator| validator.field_name == :password}
+      assert_equal 1, validators.select{ |v| v.kind_of?(DataMapper::Validations::LengthValidator) }.length
+    end
+  end
 end

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

@@ -9,6 +9,13 @@ class User
   property :confirmation_token, String, :writer => :private
   timestamps :at
 
+  class << self
+    # attr_accessible is used by SharedUser. Instead of trying to make a
+    # a compatibility method, ignore it and set writer option to private on
+    # confirmation_token property.
+    def attr_accessible(*args); nil; end
+  end
+
   include SharedUser
   include Shim
 
@@ -26,3 +33,10 @@ class User
     end
   end
 end
+
+# Define UserWithValidation here (instead of waiting for definition in
+# devise/test/models_test.rb) to ensure it is finalized. Otherwise,
+# DatabaseAuthenticatableTest 'should run validations even when current password is invalid or blank' fails.
+class UserWithValidation < User
+  validates_presence_of :username
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-devise
 version: !ruby/object:Gem::Version 
-  hash: 31098233
-  prerelease: 6
+  hash: 3
+  prerelease: 
   segments: 
   - 1
   - 5
   - 0
-  - beta
-  version: 1.5.0.beta
+  version: 1.5.0
 platform: ruby
 authors: 
 - Jared Morgan
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 -05:00
+date: 2011-09-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,11 +34,11 @@ dependencies:
         version: 1.0.2
     - - <
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 1
-        - 2
-        version: "1.2"
+        - 3
+        version: "1.3"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -58,11 +57,11 @@ dependencies:
         version: 1.0.2
     - - <
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 1
-        - 2
-        version: "1.2"
+        - 3
+        version: "1.3"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -81,11 +80,11 @@ dependencies:
         version: 1.0.2
     - - <
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 1
-        - 2
-        version: "1.2"
+        - 3
+        version: "1.3"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -104,11 +103,11 @@ dependencies:
         version: 1.0.2
     - - <
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 1
-        - 2
-        version: "1.2"
+        - 3
+        version: "1.3"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -127,11 +126,11 @@ dependencies:
         version: 1.0.3
     - - <
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 1
-        - 2
-        version: "1.2"
+        - 3
+        version: "1.3"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -212,14 +211,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: