lib/active_regulation/expiration.rb in active_regulation-2.2.3 vs lib/active_regulation/expiration.rb in active_regulation-2.2.4
- old
+ new
@@ -1,15 +1,16 @@
require 'date'
module ActiveRegulation
module Expiration
extend ActiveSupport::Concern
+ include ActiveRegulation::Base
included do
attr_accessor :expiration, :raw_expiration
- before_save :record_expiration!, unless: -> (obj) { obj.raw_expiration.nil? }
+ before_save :record_expiration!, unless: -> (obj) { obj.raw_expiration.nil? }
after_initialize :set_expiration!
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
@@ -43,11 +44,11 @@
def extension_date(days=30)
DateTime.now + days
end
def record_expiration!
- false_value = ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES.include?(expiration)
- true_value = ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(expiration)
+ false_value = FALSE_VALUES.include?(expiration)
+ true_value = TRUE_VALUES.include?(expiration)
if false_value || true_value
self.expires_at = (false_value ? extension_date : nil)
else
raise ArgumentError,
\ No newline at end of file