class Merb::Authentication
  module Mixins
    module SaltedUser
      module DMClassMethods
        def self.extended(base)
          base.class_eval do

            property :crypted_password, String, :length => 60

            if Merb::Authentication::Mixins::SaltedUser > base
              property :salt, String
            end

            validates_present        :password, :if => proc{|m| m.password_required?}
            validates_is_confirmed   :password, :if => proc{|m| m.password_required?}

            before :save,   :encrypt_password
          end # base.class_eval

        end # self.extended

        def authenticate(login, password)
          @u = first(Merb::Authentication::Strategies::Basic::Base.login_param => login)
          @u && @u.authenticated?(password) ? @u : nil
        end
      end # DMClassMethods
    end # SaltedUser
  end # Mixins
end # Merb::Authentication

class Merb::Authentication
  module Mixins
    module SaltedUser
      module DMClassMethods
        def self.extended(base)
          base.class_eval do

            property :crypted_password, String, :length => 60

            if Merb::Authentication::Mixins::SaltedUser > base
              property :salt, String
            end

            validates_presence_of       :password, :if => proc{|m| m.password_required?}
            validates_confirmation_of   :password, :if => proc{|m| m.password_required?}

            before :save,   :encrypt_password
          end # base.class_eval

        end # self.extended

        def authenticate(login, password)
          @u = first(Merb::Authentication::Strategies::Basic::Base.login_param => login)
          @u && @u.authenticated?(password) ? @u : nil
        end
      end # DMClassMethods
    end # SaltedUser
  end # Mixins
end # Merb::Authentication

Update to DM 1.0.0 compat.
Update to DM 1.0.0 compat.
