devise_password_expirable 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  metadata.gz: 7d3e8881bb3870a91d24a9e894a92a481e6f56668767cb88abff42cad3b54fb8ad7492e6ccdfaba57c549fb92b4e5193061f7c87711c980671827e1418894ad6
-  data.tar.gz: ad827f12d3326a170d30d8d490ef6e275e4ea78639a49eff46768d798ddd316512ac732c0a647a7b93f6d53c0edf90824caca410ce4c05c3392773177f870547
+  metadata.gz: 9944d2b6c7e8512cca6d6501d31c29f023453f22928f8aa8b8b03902b4b7fb8f177d5a4b866edb7520c13f9298a43ed285745462bb518cb45bcc9863006dca2c
+  data.tar.gz: f5d70c53144e98922ab83a52515d37f435fc25a1ef39fedef01772be6345302b57821e57604c71f4f6f6fbdd3862a6b3db421255f49339067c15c85b36346751
 SHA1: 
-  metadata.gz: 2ee21e261221c945e9ded5b983d91b8f5ac1a561
-  data.tar.gz: 136e09527fdf7be7916902f9eff56078765f4671
+  metadata.gz: 470d49468aadb9d9870aca2d3884a953ea00a89e
+  data.tar.gz: 56596cbc457b4f930d800dbfe1e6d6445cc5a5bc

data/app/controllers/devise/password_expired_controller.rb

@@ -12,6 +12,7 @@ class Devise::PasswordExpiredController < ApplicationController
   end
 
   def update
+    resource.extend(Devise::Models::DatabaseAuthenticatablePatch)
     if resource.update_with_password(params[resource_name])
       warden.session(scope)[:password_expired] = false
       set_flash_message :notice, :updated

data/lib/devise_password_expirable.rb

@@ -29,3 +29,4 @@ Devise.add_module :password_expirable, :controller => :password_expirable, :mode
 require 'devise_password_expirable/routes'
 require 'devise_password_expirable/rails'
 require 'devise_password_expirable/orm/active_record'
+require 'devise_password_expirable/models/database_authenticatable_patch'

data/lib/devise_password_expirable/models/database_authenticatable_patch.rb

@@ -0,0 +1,25 @@
+module Devise
+  module Models
+    module DatabaseAuthenticatablePatch
+      def update_with_password(params={})
+        current_password = params.delete(:current_password)
+
+        new_password = params[:password]
+        new_password_confirmation = params[:password_confirmation]
+
+        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)
+          self.attributes = params
+          false
+        end
+
+        clean_up_passwords
+        result
+      end
+    end
+  end
+end

data/lib/devise_password_expirable/models/password_expirable.rb

@@ -48,7 +48,7 @@ module Devise # :nodoc:
 
         private
 
-        # is password changed then update password_cahanged_at
+        # is password changed then update password_changed_at
         def update_password_changed
           self.last_password_reset = Time.now if (self.new_record? or self.encrypted_password_changed?) and not self.last_password_reset_changed?
         end

data/lib/devise_password_expirable/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise_password_expirable
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jenni Kissinger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-10-28 00:00:00 Z
+date: 2014-11-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -64,6 +64,7 @@ files:
 - lib/devise_password_expirable.rb
 - lib/devise_password_expirable/controllers/helpers.rb
 - lib/devise_password_expirable/hooks/password_expirable.rb
+- lib/devise_password_expirable/models/database_authenticatable_patch.rb
 - lib/devise_password_expirable/models/password_expirable.rb
 - lib/devise_password_expirable/orm/active_record.rb
 - lib/devise_password_expirable/rails.rb