Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for future suspensions. #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for future suspensions. #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions lib/devise_suspendable/model.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,22 @@ def self.included(base)
end

def suspended?
self.suspended_at?
self.suspended_at? && suspended_at < Time.zone.now
end

def suspend!(reason = nil)
def suspension_pending?
self.suspended_at? && suspended_at > Time.zone.now
end

def suspend!(reason = nil, suspend_at = nil)
return if suspended?
self.suspended_at = Time.zone.now
self.suspended_at = suspend_at || Time.zone.now
self.suspension_reason = reason
self.save(:validate => false)
end

def unsuspend!
return if !suspended?
return unless suspended? || suspension_pending?
self.suspended_at = nil
self.suspension_reason = nil
self.save(:validate => false) if self.changed?
Expand All @@ -42,7 +46,7 @@ def unsuspend!
def active_for_authentication?
super && !suspended?
end

# Overwrites invalid_message from Devise::Models::Authenticatable to define
# the correct reason for blocking the sign in.
def inactive_message
Expand Down