dm-devise 1.4.0 → 1.5.0.beta

data/CHANGELOG.rdoc

@@ -0,0 +1,34 @@
+== 1.5.0.beta
+
+* enhancements
+  * determine validation library extensions to load based on which validation
+    library is loaded (dm-validations or Active Model)
+  * 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
+
+== 1.4.0
+
+* enhancements
+  * Add Compatibility#email_changed? for email validations
+
+== 1.3.1
+
+* enhancements
+  * expired validation error message
+
+== 1.3.0
+
+* enhancements
+  * Add before_validation hook
+  * Add DataMapper::Validation::ValidationErrors#to_xml
+
+== 1.2.0
+
+* enhancements
+  * Verify compatibility with DM 1.1.0
+  * Ensure apply_schema won't try to re add an existing property
+
+* bug fix
+  * Change DateTime#gmtime to use #new_offset instead of delegating to #to_time
+  * Correctly handle DataMapper required property option

data/Gemfile

@@ -10,7 +10,7 @@ group :test do
   gem 'mocha', :require => false
 end
 
-DM_VERSION = '~> 1.1.0.rc3'
+DM_VERSION = '~> 1.1.0'
 
 group :development do
   gem 'rails', '~> 3.0.4'
@@ -23,6 +23,6 @@ group :development do
   gem 'dm-rails', DM_VERSION
 end
 
-group :data_mapper do
+group :'dm-validations' do
   gem 'dm-validations', DM_VERSION
 end

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    dm-devise (1.3.1)
+    dm-devise (1.5.0.beta)
       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)
-      sugar-high (~> 0.2.10)
 
 GEM
   remote: http://rubygems.org/
@@ -46,7 +45,7 @@ GEM
     builder (2.1.2)
     data_objects (0.10.6)
       addressable (~> 2.1)
-    devise (1.4.0)
+    devise (1.4.2)
       bcrypt-ruby (~> 2.1.2)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
@@ -96,8 +95,8 @@ GEM
     mocha (0.9.12)
     multi_json (1.0.3)
     multi_xml (0.2.2)
-    multipart-post (1.1.2)
-    nokogiri (1.4.6)
+    multipart-post (1.1.3)
+    nokogiri (1.5.0)
     oa-core (0.2.6)
     oa-oauth (0.2.6)
       faraday (~> 0.6.1)
@@ -110,12 +109,12 @@ GEM
       oa-core (= 0.2.6)
       rack-openid (~> 1.3.1)
       ruby-openid-apps-discovery (~> 1.2.0)
-    oauth (0.4.4)
+    oauth (0.4.5)
     oauth2 (0.4.1)
       faraday (~> 0.6.1)
       multi_json (>= 0.0.5)
     orm_adapter (0.0.5)
-    polyglot (0.3.1)
+    polyglot (0.3.2)
     rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
@@ -139,19 +138,16 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (0.9.2)
-    rdoc (3.6.1)
-    require_all (1.2.0)
+    rdoc (3.8)
     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)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.28)
-    warden (1.0.4)
+    tzinfo (0.3.29)
+    warden (1.0.5)
       rack (>= 1.0)
     webrat (0.7.2)
       nokogiri (>= 1.2.0)
@@ -162,14 +158,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  dm-core (~> 1.1.0.rc3)
+  dm-core (~> 1.1.0)
   dm-devise!
-  dm-migrations (~> 1.1.0.rc3)
-  dm-rails (~> 1.1.0.rc3)
-  dm-serializer (~> 1.1.0.rc3)
-  dm-sqlite-adapter (~> 1.1.0.rc3)
-  dm-timestamps (~> 1.1.0.rc3)
-  dm-validations (~> 1.1.0.rc3)
+  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)
   mocha
   oa-oauth (~> 0.2.0)
   oa-openid (~> 0.2.0)

data/README.rdoc

@@ -1,17 +1,7 @@
 = dm-devise
 
 dm-devise lets you use devise (http://github.com/plataformatec/devise) with
-DataMapper. The gem gives you the options of 2 ORM setups depending on what
-library you wish to use for validations:
-
-:data_mapper::
-  Uses dm-validations. This involves a bit of monkey-patching, but you need to
-  use this if you want auto-validations in *any* of your models.
-:data_mapper_active_model::
-  Uses ActiveModel::Validations. Do not use if you require 'dm-validations'
-  anywhere in your app (or include it in your Gemfile). Things will break.
-  The advantage to this is ActiveModel's I18n support for error messages, and
-  it uses the same validations lib as devise does by default.
+DataMapper.
 
 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
@@ -20,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-06-23, commit dba8f91f99dce0e102ad2e6aa78b142a92833bc3
-Last tested against devise release 1.4.0
+Last tested against devise master: 2011-08-02, commit 919404df53a0ee9a8c5be50a3d74acf10ac2e38c
+Last tested against devise release 1.4.2
 
 == Installation
 
@@ -33,9 +23,9 @@ 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.4.0'
+  gem 'dm-devise',         '~> 1.5.0.beta'
 
-If you're using data_mapper_active_model do not include dm-validations in your
+If you're using Active Model validations, do not include dm-validations in your
 Gemfile.
 
 dm-devise works with versions of DataMapper gems >= 1.0.2 on the 1.0 branch
@@ -43,19 +33,54 @@ and >= 1.1.0.rc3 on the 1.1 branch.
 
 Run the generator:
 
-  rails generate devise:install
+  rails generate data_mapper:devise_install
 
 The generator will install an initializer which describes ALL Devise's
-configuration options and you MUST take a look at it. Make sure to specify
-either data_mapper (for using dm-validations) or data_mapper_active_model
-(ActiveModel::Validations) as the orm in the configuration file.
+configuration options and you MUST take a look at it. See Config section below
+for three config options that have particular importance to dm-devise.
 
-To add Devise to any of your models using the generator:
+Add Devise to any of your models using the generator:
 
   rails generate data_mapper:devise MODEL
 
 Read the README for devise at http://github.com/plataformatec/devise/blob/master/README.rdoc
 
+== Config Options
+
+See the generated initializer for all the config options, but dm-devise users
+should be particularly aware of these three:
+
+=== data_mapper_validation_lib
+
+dm-devise adds some compatibility methods for either dm-validations or
+Active Model validations. By default, it determines what to load based on
+which library is found (giving preference to dm-validations). You may
+explicitly set this to 'dm-validations' or 'active_model', or false to not
+load any of the validations compatibility code. Details of the options:
+
+dm-validations::
+  Uses dm-validations. This involves a bit of monkey-patching, but you need to
+  use this if you want auto-validations in *any* of your models.
+active_model::
+  Uses ActiveModel::Validations. Do not use if you require 'dm-validations'
+  anywhere in your app (or include it in your Gemfile). Things will break.
+  The advantage to this is Active Model's I18n support for error messages, and
+  it uses the same validations lib as devise does by default.
+
+=== apply_schema
+
+Tells if dm-devise should apply the devise database schema. You may want to
+set this to false if working with a legacy schema.
+
+=== data_mapper_validation_messages
+
+Messages to use as the default DataMapper validation error messages. The
+messages are updated from those included in dm-validations to be consistent
+with ActiveModel (i.e. with the Devise test expectations) and include
+additional messages that devise uses (:not_found, :already_confirmed,
+:not_locked, and :expired). If set to false, the messages are left as
+defined by the dm-validations gem.
+
 == TODO
 
 * Example app
@@ -64,16 +89,14 @@ Read the README for devise at http://github.com/plataformatec/devise/blob/master
 == 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
+ORM with both dm-validations and active_model validations (you can specify one
+with rake test VALIDATION_LIB=lib_name). 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.
@@ -100,4 +123,4 @@ http://github.com/jm81/dm-devise/issues
 
 == Copyright
 
-Copyright (c) 2010 Jared Morgan. See LICENSE for details.
+Copyright (c) 2010-2011 Jared Morgan. See LICENSE for details.

data/Rakefile

@@ -11,24 +11,25 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
-require File.join(File.dirname(__FILE__), 'lib', 'dm-devise', 'version')
+require 'rdoc/task'
+require 'dm-devise/version'
 
 desc 'Default: run tests for all DataMapper ORM setups.'
 task :default => :pre_commit
 
 desc 'Run Devise tests for all DataMapper ORM setups.'
 task :pre_commit do
-  Dir[File.join(File.dirname(__FILE__), 'test', 'orm', '*.rb')].each do |file|
-    orm = File.basename(file).split(".").first
+  Dir[File.join(File.dirname(__FILE__), 'lib', 'devise', 'orm', 'data_mapper', 'validations', '*.rb')].each do |file|
+    validation_lib = File.basename(file).split(".").first
     ENV['DEVISE_PATH'] ||= File.expand_path('../devise')
-    system "rake test DEVISE_ORM=#{orm} DEVISE_PATH=#{ENV['DEVISE_PATH']}"
+    system "rake test DEVISE_ORM=data_mapper VALIDATION_LIB=#{validation_lib} DEVISE_PATH=#{ENV['DEVISE_PATH']}"
   end
 end
 
 desc 'Run Devise tests using DataMapper. Specify path to devise with DEVISE_PATH'
 Rake::TestTask.new(:test) do |test|
   ENV['DEVISE_ORM'] ||= 'data_mapper'
+  ENV['VALIDATION_LIB'] ||= 'dm-validations'
   ENV['DEVISE_PATH'] ||= File.expand_path('../devise')
   unless File.exist?(ENV['DEVISE_PATH'])
     puts "Specify the path to devise (e.g. rake DEVISE_PATH=/path/to/devise). Not found at #{ENV['DEVISE_PATH']}"

data/dm-devise.gemspec

@@ -22,5 +22,4 @@ Gem::Specification.new do |s|
   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')
-  s.add_dependency('sugar-high', '~> 0.2.10')
 end

data/lib/devise/orm/data_mapper.rb

@@ -2,7 +2,9 @@ require 'dm-devise'
 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 'devise/orm/data_mapper/serializable'
+require 'devise/orm/data_mapper/validations/dm-validations'
+require 'devise/orm/data_mapper/validations/active_model'
 require 'orm_adapter/adapters/data_mapper'
 
 module Devise
@@ -11,7 +13,15 @@ module Devise
       module Hook
         def devise_modules_hook!
           extend Schema
+
+          if Devise.data_mapper_validation_lib == 'active_model'
+            include ActiveModel::Validations
+            include ActiveModelCompatibility
+            extend ActiveModelUniquenessCompatibility
+          end
+
           include Compatibility
+
           yield
           return unless Devise.apply_schema
           devise_modules.each { |m| send(m) if respond_to?(m, true) }

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

@@ -0,0 +1,36 @@
+module Devise
+  module Models
+    # This module redefines properties_to_serialize in models for more
+    # secure defaults. By default, it removes from the serializable model
+    # all attributes whose writer or reader is *not* public. You can remove this default
+    # by using :force_except and passing a new list of attributes you want
+    # to exempt. All attributes given to :exclude will simply add names to
+    # exempt to Devise internal list.
+    module Serializable
+      extend ActiveSupport::Concern
+
+      def properties_to_serialize(options=nil)
+        options ||= {}
+        if options.key?(:force_except) || options.key?(:force_exclude)
+          options[:exclude] = options.delete(:force_except) || options.delete(:force_exclude)
+          super(options)
+        else
+          except = Array(options[:exclude]) + Array(options[:except])
+          super(options.merge(:exclude => except + self.class.blacklist_keys))
+        end
+      end
+
+      # Get back to DataMapper's #to_xml.
+      def to_xml(*args)
+        super
+      end
+
+      module ClassMethods
+        # Returns keys that should be removed when serializing the record.
+        def blacklist_keys
+          @blacklist_keys ||= properties.select { |property| property.reader_visibility != :public || property.writer_visibility != :public }.map(&:name)
+        end
+      end
+    end
+  end
+end

data/lib/devise/orm/data_mapper/validations/active_model.rb

@@ -0,0 +1,35 @@
+module Devise
+  module Orm
+    module DataMapper
+      module ActiveModelCompatibility
+        # include ActiveModel::Validations does not make save check valid?.
+        # This may not be the best solution, but it seems to work. Note that
+        # Compatibility is included after this module; its #save method handles
+        # the :validate => false option.
+        def save(*args)
+          retval = valid? && super(*args)
+          assert_save_successful(:save, retval)
+          retval
+        end
+      end
+
+      module ActiveModelUniquenessCompatibility
+        def validates_uniqueness_of(*fields)
+          validates_with UniquenessValidator, _merge_attributes(fields)
+        end
+      end
+
+      class UniquenessValidator < ActiveModel::EachValidator
+        def validate_each(target, attribute, value)
+          resource = ::DataMapper.repository(target.repository.name) { target.model.first(attribute => value) }
+          if resource.nil? || (target.saved? && resource.key == target.key)
+            return true
+          else
+            target.errors.add(attribute, :taken)
+            return false
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+if Devise.data_mapper_validation_lib == 'dm-validations'
+  module DataMapper
+    module Validations
+
+      # Monkey-patch ValidationErrors to support generation of error message from
+      # a Symbol. This does not translate, consistent with normal DataMapper
+      # operation. Set DataMapper::Validate::ValidationErrors.default_error_messages
+      # if alternate messages are needed (after devise has been initialized).
+      class ValidationErrors
+        alias_method :original_add, :add
+
+        # If the message is a Symbol, allow +default_error_message+ to generate
+        # the message, including translation.
+        def add(field_name, message)
+          if message.kind_of?(Symbol)
+            message = self.class.default_error_message(message, field_name)
+          end
+          original_add(field_name, message) unless errors[field_name].include?(message)
+        end
+
+        # Some devise controller actions expect resource#errors to respond to
+        # #to_xml. Otherwise, we get a Missing template error
+        def to_xml(options = {})
+          @errors.to_hash.to_xml(options.merge(:root => 'errors'))
+        end
+      end
+    end
+  end
+
+  if Devise.data_mapper_validation_messages
+    DataMapper::Validations::ValidationErrors.default_error_messages = Devise.data_mapper_validation_messages
+  end
+end

data/lib/devise/orm/data_mapper_active_model.rb

@@ -1,55 +1,11 @@
-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'
+puts <<DEPRECATION
+WARN: orm/data_mapper/data_mapper_active_model is deprecated. dm-devise now
+checks for which validation library is available. To force dm-devise to use
+ActiveModel::Validations, add the following above the ORM require line in your
+devise initializer:
 
-module Devise
-  module Orm
-    module DataMapper
-      module Hook
-        def devise_modules_hook!
-          extend Schema
-          include ActiveModel::Validations
-          include ActiveModelCompatibility
-          include Compatibility
+   config.data_mapper_validation_lib = 'active_model'
+DEPRECATION
 
-          def self.validates_uniqueness_of(*fields)
-            validates_with UniquenessValidator, _merge_attributes(fields)
-          end
-          
-          yield
-          return unless Devise.apply_schema
-          devise_modules.each { |m| send(m) if respond_to?(m, true) }
-        end
-      end
-
-      class UniquenessValidator < ActiveModel::EachValidator
-        def validate_each(target, attribute, value)
-          resource = ::DataMapper.repository(target.repository.name) { target.model.first(attribute => value) }
-          if resource.nil? || (target.saved? && resource.key == target.key)
-            return true
-          else
-            target.errors.add(attribute, :taken)
-            return false
-          end
-        end
-      end
-
-      module ActiveModelCompatibility
-        # include ActiveModel::Validations does not make save check valid?.
-        # This may not be the best solution, but it seems to work. Note that
-        # Compatibility is included after this module; its #save method handles
-        # the :validate => false option.
-        def save(*args)
-          retval = valid? && super(*args)
-          assert_save_successful(:save, retval)
-          retval
-        end
-      end
-    end
-  end
-end
-
-DataMapper::Model.append_extensions(Devise::Models)
-DataMapper::Model.append_extensions(Devise::Orm::DataMapper::Hook)
+Devise.data_mapper_validation_lib = 'active_model'
+require 'devise/orm/data_mapper'

data/lib/dm-devise.rb

@@ -5,3 +5,65 @@ require 'dm-timestamps'
 require 'dm-rails'
 
 require 'dm-devise/version'
+
+module Devise
+  # Messages to use as the default DataMapper validation error messages. The
+  # messages are updated from those included in dm-validations to be consistent
+  # with ActiveModel (i.e. with the Devise test expectations) and include
+  # additional messages that devise uses (:not_found, :already_confirmed,
+  # :not_locked, and :expired). If set to false, the messages are left as
+  # defined by the dm-validations gem.
+  mattr_accessor :data_mapper_validation_messages
+  @@data_mapper_validation_messages = {
+    :absent => '%s must be absent',
+    :inclusion => '%s is not included in the list',
+    :exclusion => '%s is reserved',
+    :invalid => '%s is invalid',
+    :confirmation => "%s doesn't match confirmation",
+    :accepted => '%s must be accepted',
+    :nil => '%s must not be nil',
+    :empty => "%s can't be empty",
+    :blank => "%s can't be blank",
+    :length_between => '%s must be between %s and %s characters long',
+    :too_long => '%s is too long (maximum is %s characters)',
+    :too_short => '%s is too short (minimum is %s characters)',
+    :wrong_length => '%s "is the wrong length (should be %s characters)"',
+    :taken => '%s has already been taken',
+    :not_a_number => '%s is not a number',
+    :not_an_integer => '%s must be an integer',
+    :greater_than => '%s must be greater than %s',
+    :greater_than_or_equal_to => '%s must be greater than or equal to %s',
+    :equal_to => '%s must be equal to %s',
+    :not_equal_to => '%s must not be equal to %s',
+    :less_than => '%s must be less than %s',
+    :less_than_or_equal_to => '%s must be less than or equal to %s',
+    :value_between => '%s must be between %s and %s',
+    :odd => 'must be odd',
+    :even => 'must be even',
+    :primitive => '%s must be of type %s',
+    :not_found => '%s not found',
+    :already_confirmed => '%s was already confirmed, please try signing in',
+    :not_locked => '%s was not locked',
+    :expired => '%s has expired, please request a new one'
+  }
+
+  class << self
+    # Determine which validation library to use based on which validation
+    # library is loaded. May be set explicitly to one of:
+    #
+    # - 'dm-validations'
+    # - 'active_model'
+    # - Any other value (false) to not load any validation compatibility code.
+    mattr_writer :data_mapper_validation_lib
+    @@data_mapper_validation_lib = nil
+    def data_mapper_validation_lib
+      if !@@data_mapper_validation_lib.nil?
+        @@data_mapper_validation_lib.to_s
+      elsif defined? DataMapper::Validations
+        'dm-validations'
+      elsif defined? ActiveModel::Validations
+        'active_model'
+      end
+    end
+  end
+end

data/lib/dm-devise/version.rb

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

data/lib/generators/data_mapper/devise_generator.rb

@@ -1,13 +1,4 @@
 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
@@ -21,11 +12,6 @@ module DataMapper
       def inject_devise_content
         inject_into_file model_path, model_contents, :after => "include DataMapper::Resource\n" if model_exists?
       end
-
-      def replace_default_devise_orm
-        devise_init_file = File.join(Rails.root, 'config', 'initializers', 'devise.rb')
-        File.replace_content_from devise_init_file, :where => 'orm/active_record', :with => 'orm/data_mapper'
-      end
     end
   end
 end

data/lib/generators/data_mapper/devise_install_generator.rb

@@ -0,0 +1,43 @@
+module DataMapper
+  module Generators
+    class DeviseInstallGenerator < Rails::Generators::Base
+      def generate_devise_install
+        invoke 'devise:install'
+      end
+
+      def inject_data_mapper_content
+        devise_init_file = File.join(Rails.root, 'config', 'initializers', 'devise.rb')
+        validations = <<VALIDATIONS
+  # ==> Validations Library
+  # dm-devise adds some compatibility methods for either dm-validations or
+  # Active Model validations. By default, it determines what to load based on
+  # which library is found (giving preference to dm-validations). You may
+  # explicitly set this to 'dm-validations' or 'active_model', or false to not
+  # load any of the validations compatibility code.
+  # config.data_mapper_validation_lib = nil
+
+VALIDATIONS
+        inject_into_file devise_init_file, validations, :before => '  # ==> ORM configuration'
+
+        data_mapper_options = <<APPLY_SCHEMA
+
+  # ==> Apply Schema
+  # Tells if dm-devise should apply the devise database schema via property
+  # declarations. You may want to set this to false if working with a legacy
+  # schema.
+  # config.apply_schema = true
+
+  # ==> dm-validations Default Error Messages
+  # Messages to use as the default DataMapper validation error messages. The
+  # messages are updated from those included in dm-validations to be consistent
+  # with ActiveModel (i.e. with the Devise test expectations) and include
+  # additional messages that devise uses (:not_found, :already_confirmed,
+  # :not_locked, and :expired). If set to false, the messages are left as
+  # defined by the dm-validations gem. See dm-devise.rb for default.
+  # config.data_mapper_validation_messages = {}
+APPLY_SCHEMA
+      inject_into_file devise_init_file, data_mapper_options, :after => "orm/data_mapper'\n"
+      end
+    end
+  end
+end

data/test/orm/data_mapper.rb

@@ -9,20 +9,22 @@ class ActiveSupport::TestCase
   end
 end
 
-module DataMapper
-  module Validate
-    class ValidationErrors
+if VALIDATION_LIB == 'dm-validations'
+  module DataMapper
+    module Validations
+      class ValidationErrors
 
-      # ActiveModel prepends field names in +#full_messages+, and so the
-      # expected result of calling errors[field_name] will not include the
-      # field name in the message. However, DM expects the field name to be
-      # included in the original message. Assuming that the field name will
-      # begin the message, just strip it out (plus the following space) for
-      # testing purposes. This has no effect on #full_messages.
-      def [](property_name)
-        if property_errors = errors[property_name.to_sym]
-          property_errors.collect do |message|
-            message[(property_name.to_s.length + 1)..-1]
+        # ActiveModel prepends field names in +#full_messages+, and so the
+        # expected result of calling errors[field_name] will not include the
+        # field name in the message. However, DM expects the field name to be
+        # included in the original message. Assuming that the field name will
+        # begin the message, just strip it out (plus the following space) for
+        # testing purposes. This has no effect on #full_messages.
+        def [](property_name)
+          if property_errors = errors[property_name.to_sym]
+            property_errors.collect do |message|
+              message[(property_name.to_s.length + 1)..-1]
+            end
           end
         end
       end

data/test/overrides/data_mapper_test.rb

@@ -5,12 +5,10 @@ require 'test_helper'
 # particularly important and getting DM to pass the original devise tests would
 # be difficult.
 #
-# This file contains tests shared by both data_mapper and
-# data_mapper_active_model ORM setups.
-# Tests specific to the data_mapper orm which uses dm-validations are in dm_validations_test.rb
-# Tests specific to the data_mapper_active_model orm which uses ActiveModel
-# validations would be in active_model_test.rb, but there aren't any (I would
-# be rather surprised if there ever were any).
+# This file contains tests that are overriden regardless of validation library.
+# Tests specific to dm-validations are in dm_validations_test.rb
+# Tests specific to ActiveModel validations would be in active_model_test.rb,
+# but there aren't any (I would be rather surprised if there ever were any).
 #
 # For each test, an explanation is given as to why I chose to override the test,
 # and the original assertion is commented above the DM-specific assertion.
@@ -120,3 +118,35 @@ class ValidatableTest < ActiveSupport::TestCase
     end
   end
 end
+
+class SerializableTest < ActiveSupport::TestCase
+  # AR's #to_xml replaces underscore with dash. DM does not.
+  undef test_should_not_include_unsafe_keys_on_XML
+  undef test_should_not_include_unsafe_keys_on_XML_even_if_a_new_except_is_provided
+  undef test_should_include_unsafe_keys_on_XML_if_a_force_except_is_provided
+
+  test 'should not include unsafe keys on XML' do
+    assert_match /email/, @user.to_xml
+    assert_no_match /confirmation_token/, @user.to_xml
+  end
+
+  test 'should not include unsafe keys on XML even if a new except is provided' do
+    assert_no_match /email/, @user.to_xml(:except => :email)
+    assert_no_match /confirmation_token/, @user.to_xml(:except => :email)
+  end
+
+  test 'should include unsafe keys on XML if a force_except is provided' do
+    assert_no_match /email/, @user.to_xml(:force_except => :email)
+    assert_match /confirmation_token/, @user.to_xml(:force_except => :email)
+  end
+end
+
+class DeviseHelperTest < ActionController::IntegrationTest
+  # Ensure test finds the translation of the model name.
+  setup do
+    I18n.backend.store_translations :fr,
+    {
+      :data_mapper => { :models => { :user => "utilisateur" } }
+    }
+  end
+end

data/test/overrides/dm_validations_test.rb

@@ -1,8 +1,7 @@
 require 'test_helper'
 
 # See data_mapper_test.rb in this folder for what this file is doing.
-if DEVISE_ORM == :data_mapper
-
+if VALIDATION_LIB == 'dm-validations'
   class ValidatableTest < ActiveSupport::TestCase
     undef test_should_require_a_password_with_minimum_of_6_characters
 

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

@@ -6,20 +6,23 @@ class User
   property :id, Serial
   property :username, String
   property :facebook_token, String
+  property :confirmation_token, String, :writer => :private
   timestamps :at
 
   include SharedUser
   include Shim
 
-  before :valid?, :update_password_confirmation
+  if VALIDATION_LIB == 'dm-validations'
+    before :valid?, :update_password_confirmation
 
-  # 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.
-  def update_password_confirmation
-    if self.password && self.password_confirmation.nil?
-      self.password_confirmation = self.password
+    # 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.
+    def update_password_confirmation
+      if self.password && self.password_confirmation.nil?
+        self.password_confirmation = self.password
+      end
     end
-  end 
+  end
 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, DEVISE_ORM
+Bundler.require :default, VALIDATION_LIB
 
 begin
   require "#{DEVISE_ORM}/railtie"
@@ -21,7 +21,7 @@ module RailsApp
     config.root = APP_ROOT
     config.autoload_paths.reject!{ |p| p =~ /\/app\/(\w+)$/ && !%w(controllers helpers views).include?($1) }
     config.autoload_paths += [ File.expand_path("#{File.dirname(__FILE__)}/../app/#{DEVISE_ORM}") ]
-    
+
     # Configure generators values. Many other options are available, be sure to check the documentation.
     # config.generators do |g|
     #   g.orm             :active_record

data/test/test_helper.rb

@@ -1,8 +1,9 @@
-ENV["RAILS_ENV"] = "test"
-DEVISE_ORM = (ENV["DEVISE_ORM"] || :data_mapper).to_sym
+ENV['RAILS_ENV'] = 'test'
+DEVISE_ORM = (ENV['DEVISE_ORM'] || :data_mapper).to_sym
 DEVISE_PATH = ENV['DEVISE_PATH']
+VALIDATION_LIB = (ENV['VALIDATION_LIB'] || 'dm-validations')
 
-puts "\n==> Devise.orm = #{DEVISE_ORM.inspect}"
+puts "\n==> Devise.orm = #{DEVISE_ORM.inspect}, Devise.data_mapper_validation_lib = #{VALIDATION_LIB.inspect}"
 
 require 'dm-migrations'
 require "rails_app/config/environment"

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-devise
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
+  hash: 31098233
+  prerelease: 6
   segments: 
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  - beta
+  version: 1.5.0.beta
 platform: ruby
 authors: 
 - Jared Morgan
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 -05:00
+date: 2011-08-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -148,22 +149,6 @@ dependencies:
         version: "1.3"
   type: :runtime
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: sugar-high
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 2
-        - 10
-        version: 0.2.10
-  type: :runtime
-  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: []
@@ -175,6 +160,7 @@ extra_rdoc_files: []
 files: 
 - .document
 - .gitignore
+- CHANGELOG.rdoc
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -184,24 +170,24 @@ files:
 - 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/serializable.rb
+- lib/devise/orm/data_mapper/validations/active_model.rb
+- lib/devise/orm/data_mapper/validations/dm-validations.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
+- lib/generators/data_mapper/devise_install_generator.rb
 - test/data_mapper/compatibility_test.rb
 - test/data_mapper/schema_test.rb
 - test/generators/data_mapper_generator_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
@@ -226,12 +212,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: 

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

@@ -1,68 +0,0 @@
-module DataMapper
-  module Validate
-
-    # Monkey-patch ValidationErrors to support generation of error message from
-    # a Symbol. This does not translate, consistent with normal DataMapper
-    # operation. Set DataMapper::Validate::ValidationErrors.default_error_messages
-    # if alternate messages are needed (after devise has been initialized).
-    class ValidationErrors
-      alias_method :original_add, :add
-
-      # If the message is a Symbol, allow +default_error_message+ to generate
-      # the message, including translation.
-      def add(field_name, message)
-        if message.kind_of?(Symbol)
-          message = self.class.default_error_message(message, field_name)
-        end
-        original_add(field_name, message) unless errors[field_name].include?(message)
-      end
-    end
-  end
-end
-
-# Default error messages consistent with ActiveModel messages and devise
-# expectations.
-DataMapper::Validate::ValidationErrors.default_error_messages = {
-  :absent => '%s must be absent',
-  :inclusion => '%s is not included in the list',
-  :exclusion => '%s is reserved',
-  :invalid => '%s is invalid',
-  :confirmation => "%s doesn't match confirmation",
-  :accepted => '%s must be accepted',
-  :nil => '%s must not be nil',
-  :empty => "%s can't be empty",
-  :blank => "%s can't be blank",
-  :length_between => '%s must be between %s and %s characters long',
-  :too_long => '%s is too long (maximum is %s characters)',
-  :too_short => '%s is too short (minimum is %s characters)',
-  :wrong_length => '%s "is the wrong length (should be %s characters)"',
-  :taken => '%s has already been taken',
-  :not_a_number => '%s is not a number',
-  :not_an_integer => '%s must be an integer',
-  :greater_than => '%s must be greater than %s',
-  :greater_than_or_equal_to => '%s must be greater than or equal to %s',
-  :equal_to => '%s must be equal to %s',
-  :not_equal_to => '%s must not be equal to %s',
-  :less_than => '%s must be less than %s',
-  :less_than_or_equal_to => '%s must be less than or equal to %s',
-  :value_between => '%s must be between %s and %s',
-  :odd => 'must be odd',
-  :even => 'must be even',
-  :primitive => '%s must be of type %s',
-  :not_found => '%s not found',
-  :already_confirmed => '%s was already confirmed, please try signing in',
-  :not_locked => '%s was not locked',
-  :expired => '%s has expired, please request a new one'
-}
-
-module DataMapper
-  module Validations
-    class ValidationErrors
-      # Some devise controller actions expect resource#errors to respond to
-      # #to_xml. Otherwise, we get a Missing template error
-      def to_xml(options = {})
-        @errors.to_hash.to_xml(options.merge(:root => 'errors'))
-      end
-    end
-  end
-end

data/test/orm/data_mapper_active_model.rb

@@ -1,10 +0,0 @@
-require 'rails/test_help'
-
-DataMapper.auto_migrate!
-
-class ActiveSupport::TestCase
-  setup do
-    User.all.destroy!
-    Admin.all.destroy!
-  end
-end

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

@@ -1,14 +0,0 @@
-require 'shared_admin'
-require File.join(File.dirname(__FILE__), '../data_mapper/shim.rb')
-
-class Admin
-  include DataMapper::Resource
-
-  property :id,   Serial
-  property :username, String
-
-  include SharedAdmin
-  include Shim
-
-  property :remember_token, String
-end

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

@@ -1,14 +0,0 @@
-require 'shared_user'
-require File.join(File.dirname(__FILE__), '../data_mapper/shim.rb')
-
-class User
-  include DataMapper::Resource
-
-  property :id, Serial
-  property :username, String
-  property :facebook_token, String
-  timestamps :at
-
-  include SharedUser
-  include Shim
-end