lib/active_regulation/expiration.rb in active_regulation-3.0.0 vs lib/active_regulation/expiration.rb in active_regulation-4.0.0

- old
+ new

@@ -3,19 +3,19 @@ module ActiveRegulation module Expiration extend ActiveSupport::Concern included do - scope :expired, -> { where("expires_at IS NULL OR expires_at < ?".freeze, Time.now) } - scope :unexpired, -> { where("expires_at IS NOT NULL AND expires_at >= ?".freeze, Time.now) } + scope :expired, -> { where('expires_at IS NULL OR expires_at < ?', Time.now) } + scope :unexpired, -> { where('expires_at IS NOT NULL AND expires_at >= ?', Time.now) } end def expire! update(expires_at: nil) unless expires_at.nil? end - def extend!(amount=nil) + def extend!(amount = nil) update(expires_at: extension_date(amount)) end def unexpire! update(expires_at: extension_date) if expires_at.nil? @@ -27,20 +27,20 @@ def unexpired? expires_at.nil? ? false : (Time.now < expires_at) end - def expires_at_or_time(amount=nil) + def expires_at_or_time(amount = nil) expired? ? extension_date(amount) : expires_at end def to_expiration I18n.t("active_regulation.expiration.#{expired? ? :expired : :unexpired}") end private - def extension_date(time=nil) + def extension_date(time = nil) time = 30 if time.nil? time.is_a?(Integer) ? (DateTime.now + time) : time end