From 3226ab16c1381c5b33cf21a114c4871d8be8d06f Mon Sep 17 00:00:00 2001 From: Justin Bull Date: Mon, 2 May 2016 14:22:09 -0400 Subject: [PATCH] Extract list of both strategies into class constant --- lib/devise/models/lockable.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/devise/models/lockable.rb b/lib/devise/models/lockable.rb index 971ab9ba..fe05b255 100644 --- a/lib/devise/models/lockable.rb +++ b/lib/devise/models/lockable.rb @@ -155,6 +155,9 @@ module Devise end module ClassMethods + # List of strategies that are enabled/supported if :both is used. + BOTH_STRATEGIES = [:time, :email] + # Attempt to find a user by its unlock keys. If a record is found, send new # unlock instructions to it. If not user is found, returns a new user # with an email not found error. @@ -182,8 +185,7 @@ module Devise # Is the unlock enabled for the given unlock strategy? def unlock_strategy_enabled?(strategy) self.unlock_strategy == strategy || - # only :time and :email are subsets of the :both strategy - (self.unlock_strategy == :both && [:time, :email].include?(strategy)) + (self.unlock_strategy == :both && BOTH_STRATEGIES.include?(strategy)) end # Is the lock enabled for the given lock strategy?