devise-multi_email 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2b9c44fd5e0d7e67068e283c110c3d5bcf2578d
-  data.tar.gz: 6c6101cc82b5f18131fb3a44383953424ad4c433
+  metadata.gz: 89e5c38434485cb61230eb832707e8d24e8fc721
+  data.tar.gz: 819986e649a53569de8586df8eb8590853253bc0
 SHA512:
-  metadata.gz: 77aae6065dcb2ce816df78945ea39addbb4c3550f80252ad5048ea81fbd38f7360ec92678574a554a54591c4c1fac9eee23433935145a1fe2ee2e4e37d563e08
-  data.tar.gz: ef10791a3e1818069f8138373eb11fb277e63f4fbdaa5c40ed451f9c9bf1a6ea4b756762a94024499aa6389f742fa54ba23084cb31256421819a4f80b463bf0d
+  metadata.gz: add18da49f5a18e6c341ea8c70e69936b54976c2ba322cb2cb1f52e7e0a42cf69136d8b32b45c826f936e8948502282ac20c1d2541b9b8e83cd8d609b62232f2
+  data.tar.gz: df1d574d2300edca58a55ce82a4cae740c97e58a50f4cb8c103c889d1539c052c1a62ffafb1d2a3abb1f4b75dd36640ed3b19843b0437f519085ad1e8ef73968

data/lib/devise/multi_email/models/validatable.rb

@@ -21,26 +21,55 @@ module Devise
     end
 
     module MultiEmailValidatable
-      extend ActiveSupport::Concern
+      def self.required_fields(klass)
+        []
+      end
 
-      included do
-        devise :validatable
-        validates Devise::Models::MultiEmailAuthenticatable::EMAILS_ASSOCIATION, presence: true
+      # All validations used by this module.
+      VALIDATIONS = [:validates_presence_of, :validates_uniqueness_of, :validates_format_of,
+                     :validates_confirmation_of, :validates_length_of].freeze
 
-        after_validation :propagate_email_errors
-        email_class.send :include, EmailValidatable
+      def self.included(base)
+        base.extend ClassMethods
+        assert_validations_api!(base)
+
+        base.class_eval do
+          validates_presence_of     :email, if: :email_required?
+
+          validates_presence_of     :password, if: :password_required?
+          validates_confirmation_of :password, if: :password_required?
+          validates_length_of       :password, within: password_length, allow_blank: true
+
+          after_validation :propagate_email_errors
+          email_class.send :include, EmailValidatable
+        end
+
+        base.devise_modules << :validatable
       end
 
-      def self.required_fields(klass)
-        []
+      def self.assert_validations_api!(base) #:nodoc:
+        unavailable_validations = VALIDATIONS.select { |v| !base.respond_to?(v) }
+
+        unless unavailable_validations.empty?
+          raise "Could not use :validatable module since #{base} does not respond " <<
+                    "to the following methods: #{unavailable_validations.to_sentence}."
+        end
       end
 
-      private
+      protected
 
-      def email_changed?
-        false
+      # Same as Devise::Models::Validatable#password_required?
+      def password_required?
+        !persisted? || !password.nil? || !password_confirmation.nil?
+      end
+
+      # Same as Devise::Models::Validatable#email_required?
+      def email_required?
+        true
       end
 
+      private
+
       def propagate_email_errors
         email_error_key = self.class::EMAILS_ASSOCIATION
         if respond_to?("#{self.class::EMAILS_ASSOCIATION}_attributes=")
@@ -53,6 +82,10 @@ module Devise
           errors.add(:email, error)
         end
       end
+
+      module ClassMethods
+        Devise::Models.config(self, :password_length)
+      end
     end
   end
 end

data/lib/devise/multi_email/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module MultiEmail
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-multi_email
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - ALLEN WANG QIANG