mm-devise 1.1.10 → 1.2

data/lib/devise/orm/mongo_mapper/mm-validations.rb

@@ -1,91 +0,0 @@
-require 'validatable'
-
-module Validatable
-  # Monkey-patch Validatable::Errors to support generation of error message from
-  # a Symbol. 
-  class Errors                 
-    @@default_error_messages = {}
-
-    # Holds a hash with all the default error messages that can be replaced by your own copy or localizations.
-    def self.default_error_messages=(default_error_messages)
-      @@default_error_messages = default_error_messages
-    end
-
-    def self.default_error_message(key, field, *values)
-      field = field.to_s.humanize
-      @@default_error_messages[key] % [field, *values].flatten
-    end
-      
-    # original add before monkey-patch
-    # def add(attribute, message) #:nodoc:
-    #   errors[attribute.to_sym] = [] if errors[attribute.to_sym].nil?
-    #   errors[attribute.to_sym] << message
-    # end
-
-    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                    
-      fld_name = field_name.to_sym
-      errors[fld_name] = [] if errors[fld_name].nil?
-      original_add(fld_name, message) unless errors[fld_name].include?(message)
-    end        
-  end
-end
-
-module Validatable 
-  class ValidatesPresenceOf < ValidationBase #:nodoc:
-    def message(instance)
-      super || "can't be blank"
-    end
-  end
-end
-
-module Validatable
-  class ValidatesLengthOf < ValidationBase #:nodoc:    
-    def message(instance)
-      min = !within.nil? ? within.first : minimum
-      max = !within.nil? ? within.last : maximum
-      super || "must be between #{min} and #{max} characters long"
-    end
-  end
-end
-
-
-# Default error messages consistent with ActiveModel messages and devise
-# expectations.
-Validatable::Errors.default_error_messages = {
-  :absent => 'must be absent',
-  :inclusion => 'is not included in the list',
-  :exclusion => 'is reserved',
-  :invalid => 'is invalid',
-  :confirmation => " doesn't match confirmation",
-  :accepted => 'must be accepted',
-  :nil => 'must not be nil',
-  :empty => "can't be empty",
-  :blank => "can't be blank",
-  :length_between => 'must be between %s and %s characters long',
-  :too_long => 'is too long (maximum is %s characters)',
-  :too_short => 'is too short (minimum is %s characters)',
-  :wrong_length => 'is the wrong length (should be %s characters)',
-  :taken => 'has already been taken',
-  :not_a_number => 'is not a number',
-  :not_an_integer => 'must be an integer',
-  :greater_than => 'must be greater than %s',
-  :greater_than_or_equal_to => 'must be greater than or equal to ',
-  :equal_to => 'must be equal to %s',
-  :not_equal_to => 'must not be equal to %s',
-  :less_than => 'must be less than %s',
-  :less_than_or_equal_to => 'must be less than or equal to %s',
-  :value_between => 'must be between %s and %s',
-  :odd => 'must be odd',
-  :even => 'must be even',
-  :primitive => 'must be of type %s',
-  :not_found => 'not found',
-  :already_confirmed => 'was already confirmed',
-  :not_locked => 'was not locked'  
-}

data/lib/devise/orm/mongo_mapper/schema.rb

@@ -1,86 +0,0 @@
-module MongoMapper
-  class ValidationUtil
-    class << self
-      attr_accessor :counter
-  
-      def inc_counter
-        @counter ||= 0 
-        @counter += 1
-      end
-    end
-  end
-end
-
-module Devise
-  module Orm
-    module MongoMapper
-      module Schema  
-        include Devise::Schema
-
-        SCHEMA_OPTIONS = {
-          :null  => :required,
-          :limit => :length
-        }
-
-        # Tell how to apply schema methods. This automatically maps :limit to
-        # :length and :null to :required.
-        def apply_devise_schema(name, type, options={})
-          SCHEMA_OPTIONS.each do |old_key, new_key|
-            next unless options.key?(old_key)
-            if :null == old_key
-              # :required is opposite of :null
-              options[new_key] = !options.delete(old_key)
-            else
-              options[new_key] = options.delete(old_key)
-            end
-          end
-          
-          options.delete(:default) if options[:default].nil?
-          required_option = options.delete(:required)          
-          length_option = options.delete(:length)          
-
-          type = Time if type == DateTime         
-
-          key name, type, options
-          
-          counter = ::MongoMapper::ValidationUtil.inc_counter
-        
-          handle_email(name, counter) if name == :email          
-          handle_length(name, counter, length_option) if length_option
-          handle_required(name, counter) if required_option                               
-        end  
-        
-        protected
-
-        def make_key prefix, name, counter
-          "#{prefix}_#{name}_#{counter}"
-        end
-
-        def handle_required name, counter          
-          key = make_key :presence, name, counter 
-          validates_presence_of name.to_sym, :key => key
-        end
-
-        def handle_email name, counter            
-          key = make_key :unique, name, counter
-          validates_uniqueness_of name.to_sym, :key => key
-        end
-
-        def handle_length name, counter, length_option
-          key = make_key :length, name, counter
-          options = case length_option
-          when Fixnum
-            {:maximum => length_option}
-          when Hash
-            length_option
-          else
-            raise ArgumentError, "length validation option must be either a Fixnum or Hash"                                
-          end            
-          options[:key] = key            
-          
-          validates_length_of name.to_sym, options
-        end        
-      end
-    end
-  end
-end

data/lib/devise/orm/mongo_mapper_active_model.rb

@@ -1,68 +0,0 @@
-require 'mongo_mapper'
-require 'devise/orm/mongo_mapper/compatibility'
-require 'devise/orm/mongo_mapper/schema'
-require 'devise/orm/mongo_mapper/date_time'
-
-module Devise
-  module Orm
-    module MongoMapper
-      module Hook
-        def devise_modules_hook!
-          extend Schema
-          include ActiveModel::Validations
-          include ActiveModelCompatibility
-          include Compatibility
-          class << self; attr_reader :descendants; end;
-
-          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
-
-      # http://github.com/jkaramon/mongomapper/blob/rails3/lib/mongo_mapper/plugins/validations.rb
-      # ==============================================================
-      #   validates_each in mongo_mapper should work just fine!
-      # ==============================================================
-
-      # 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
-
-MongoMapper::Document.append_extensions(Devise::Models)
-MongoMapper::Document.append_extensions(Devise::Orm::MongoMapper::Hook)
-
-
-# module MongoMapper
-#   module Document
-#     extend ::Devise::Models
-#     extend ::Devise::Orm::MongoMapper::Hook
-#   end
-# end

data/test/orm/mongo_mapper_active_model.rb

@@ -1,8 +0,0 @@
-require 'rails/test_help'
-
-class ActiveSupport::TestCase
-  setup do
-    User.destroy_all
-    Admin.destroy_all
-  end
-end

data/test/overrides/mm_validations_test.rb

@@ -1,46 +0,0 @@
-require 'test_helper'
-
-# See data_mapper_test.rb in this folder for what this file is doing.
-if DEVISE_ORM == :mongo_mapper
-
-  class ValidatableTest < ActiveSupport::TestCase
-    undef test_should_require_a_password_with_minimum_of_6_characters
-
-    # DataMapper uses a :value_between error message when given a minimum and
-    # maximum; ActiveModel shows either the :too_long or :too_short message.
-    test 'should require a password with minimum of 6 characters' do
-      user = new_user(:password => '12345', :password_confirmation => '12345')
-      assert user.invalid?
-      # assert_equal 'is too short (minimum is 6 characters)', user.errors[:password].join
-      assert_equal 'must be between 6 and 20 characters long', user.errors[:password].join
-    end
-
-    undef test_should_require_a_password_with_maximum_of_20_characters_long
-
-    # Same issue as previous test
-    test 'should require a password with maximum of 20 characters long' do
-      user = new_user(:password => 'x'*21, :password_confirmation => 'x'*21)
-      assert user.invalid?
-      # assert_equal 'is too long (maximum is 20 characters)', user.errors[:password].join
-      assert_equal 'must be between 6 and 20 characters long', user.errors[:password].join
-    end
-
-  end
-
-  class AuthenticationOthersTest < ActionController::IntegrationTest
-
-    undef test_registration_in_xml_format_works_when_recognizing_path
-
-    # 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.
-    test 'registration in xml format works when recognizing path' do
-      assert_nothing_raised do
-        # post user_registration_path(:format => 'xml', :user => {:email => "test@example.com", :password => "invalid"} )
-        post user_registration_path(:format => 'xml', :user => {:email => "test@example.com", :password => "invalid", :password_confirmation => "invalid"} )
-      end
-    end
-  end
-  
-end

data/test/overrides/mongo_mapper_test.rb

@@ -1,48 +0,0 @@
-require 'test_helper'
-
-# This file contains test cases that override devise tests, in the cases that
-# the difference is values from DM versus those expected by devise is not
-# 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).
-#
-# 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.
-
-class TrackableHooksTest < ActionController::IntegrationTest
-
-  undef test_current_and_last_sign_in_timestamps_are_updated_on_each_sign_in
-
-  # DataMapper uses a DateTime type where ActiveRecord uses Time. The test is
-  # that the tested properties are being set, so just check for kind_of?(DateTime)
-  # instead of kind_of?(Time)
-  test "current and last sign in timestamps are updated on each sign in" do
-    user = create_user
-    assert_nil user.current_sign_in_at
-    assert_nil user.last_sign_in_at
-
-    sign_in_as_user
-    user.reload
-
-    assert_kind_of Time, user.current_sign_in_at
-    assert_kind_of Time, user.last_sign_in_at
-
-    assert_equal user.current_sign_in_at, user.last_sign_in_at
-    assert user.current_sign_in_at >= user.created_at
-
-    visit destroy_user_session_path
-    new_time = 2.seconds.from_now
-    Time.stubs(:now).returns(new_time)
-
-    sign_in_as_user
-    user.reload
-    assert user.current_sign_in_at > user.last_sign_in_at
-  end
-end
-

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

@@ -1,13 +0,0 @@
-require 'shared_admin'
-require File.join(File.dirname(__FILE__), '../mongo_mapper/shim.rb')
-
-class Admin
-  include MongoMapper::Document
-
-  key :username, String
-  timestamps!
-
-  include SharedAdmin
-  include Shim 
-  
-end

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

@@ -1,13 +0,0 @@
-require 'shared_user'
-require File.join(File.dirname(__FILE__), '../mongo_mapper/shim.rb')
-
-class User
-  include MongoMapper::Document
-
-  key :username, String
-  key :facebook_token, String
-  timestamps!  
-
-  include SharedUser
-  include Shim     
-end