devise_password_expirable 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  metadata.gz: 9944d2b6c7e8512cca6d6501d31c29f023453f22928f8aa8b8b03902b4b7fb8f177d5a4b866edb7520c13f9298a43ed285745462bb518cb45bcc9863006dca2c
-  data.tar.gz: f5d70c53144e98922ab83a52515d37f435fc25a1ef39fedef01772be6345302b57821e57604c71f4f6f6fbdd3862a6b3db421255f49339067c15c85b36346751
+  metadata.gz: 2243f56dcf1b29259ac7b49d2c8a5bc220f5e88834d9bd8e86e461868a6d72882594f2db4e96814e7446b9cf01335b4654183dfc59f276576a5c794dbf660f1e
+  data.tar.gz: 82b9fd866a813b251d7f74329fd86743f4f3c7d442aaf51e7eebb85b73fb9a220402ea0aea6f857f7d58c5e34f9c822375ecd9e771ee6fad746428a04ad3a890
 SHA1: 
-  metadata.gz: 470d49468aadb9d9870aca2d3884a953ea00a89e
-  data.tar.gz: 56596cbc457b4f930d800dbfe1e6d6445cc5a5bc
+  metadata.gz: bccf0aed784f474be00d376648b432a4d874bab8
+  data.tar.gz: 03cd74b9e271eca84c10701f4eef3543f0a5b81c

data/lib/devise_password_expirable/models/database_authenticatable_patch.rb

@@ -10,9 +10,19 @@ module Devise
         result = if valid_password?(current_password) && new_password.present? && new_password_confirmation.present?
           update_attributes(params)
         else
-          self.errors.add(:current_password, current_password.blank? ? :blank : :invalid)
-          self.errors.add(:password, new_password.blank? ? :blank : :invalid)
-          self.errors.add(:password_confirmation, new_password_confirmation.blank? ? :blank : :invalid)
+          if current_password.blank?
+            self.errors.add(:current_password, :blank)
+          elsif !valid_password?(current_password)
+            self.errors.add(:current_password, :invalid)
+          end
+
+          if new_password.blank?
+            self.errors.add(:password, :blank)
+          end
+          if new_password_confirmation.blank?
+            self.errors.add(:password_confirmation, :blank)
+          end
+          
           self.attributes = params
           false
         end

data/lib/devise_password_expirable/version.rb

@@ -1,3 +1,3 @@
 module DevisePasswordExpirable
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise_password_expirable
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jenni Kissinger