active_regulation 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12f514676ae36c6222f132a5ec056f016f7ec936
-  data.tar.gz: 6b8394db7172bfd2e56a0ef2b26b940b6784f92c
+  metadata.gz: 9aa82e0167349adfbb84e128be29ebad0150e584
+  data.tar.gz: 156553f7a81734974ebdc1e364f5280a3538b96c
 SHA512:
-  metadata.gz: abae79023d6627ccc2dee86abe7a30d29a57e5428caa98d3cc3bdde1eccd1961fdbd936bb25bf38355b082ecde287b79f27346d283ebe71aa50473c9d0cdbbcb
-  data.tar.gz: 527cdb67dce25592dfdcff43069edc8b0ba551e43b54c1315db9c5bf5432b58323162180d320ff7dc777b59d6bee4cc1ccc2d4b3abb5815da90a446556dbe888
+  metadata.gz: ba24e5cc07a65277486d020ad1a3c23857e59eaa2a8327a4c29df1e9968513525d01340ed410ca7bfb484d5e8838d0e51c4c2911e89b14581dca13edd1993ade
+  data.tar.gz: a7555820016dfd810d44b80a7ff98cb92a9d32bc357743b7cb88a563c7b054e72bc93767b511ce5cc40b43d70d30542fa761226fe1d14ad677d3bde1a5c8b0cb

data/lib/active_regulation/activation.rb

@@ -3,13 +3,10 @@ module ActiveRegulation
     extend ActiveSupport::Concern
 
     included do
-      attr_accessor :activation
+      attr_accessor :activation, :raw_activation
 
-      validates :activation, inclusion: { in: 0..1 },
-                             allow_blank: true,
-                             allow_nil: true
-
-      before_save :record_activation!
+      before_save :record_activation!,   unless: -> (obj) { obj.raw_activation.nil? }
+      after_initialize :set_activation!
 
       scope :active,   -> { where(inactivated_at: nil) }
       scope :inactive, -> { where.not(inactivated_at: nil) }
@@ -38,7 +35,20 @@ module ActiveRegulation
     private
 
     def record_activation!
-      self.inactivated_at = (activation.zero? ? Time.now : nil) unless activation.blank?
+      false_value = ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES.include?(activation)
+      true_value  = ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(activation)
+
+      if false_value || true_value
+        self.inactivated_at = (false_value ? Time.now : nil)
+      else
+        raise ArgumentError,
+          "Unknown boolean: #{activation.inspect}. Must be a valid boolean."
+      end
+    end
+
+    def set_activation!
+      self.raw_activation = activation
+      self.activation     = active? if activation.nil?
     end
 
   end

data/lib/active_regulation/containment.rb

@@ -3,13 +3,10 @@ module ActiveRegulation
     extend ActiveSupport::Concern
 
     included do
-      attr_accessor :containment
+      attr_accessor :containment, :raw_containment
 
-      validates :containment, inclusion: { in: 0..1 },
-                              allow_blank: true,
-                              allow_nil: true
-
-      before_save :record_containment!
+      before_save :record_containment!,   unless: -> (obj) { obj.raw_containment.nil? }
+      after_initialize :set_containment!
 
       scope :contained,   -> { where.not(contained_at: nil) }
       scope :uncontained, -> { where(contained_at: nil) }
@@ -38,7 +35,20 @@ module ActiveRegulation
     private
 
     def record_containment!
-      self.contained_at = (containment.zero? ? nil : Time.now) unless containment.blank?
+      false_value = ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES.include?(containment)
+      true_value  = ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(containment)
+
+      if false_value || true_value
+        self.contained_at = (false_value ? nil : Time.now)
+      else
+        raise ArgumentError,
+          "Unknown boolean: #{containment.inspect}. Must be a valid boolean."
+      end
+    end
+
+    def set_containment!
+      self.raw_containment = containment
+      self.containment     = contained? if containment.nil?
     end
 
   end

data/lib/active_regulation/expiration.rb

@@ -5,13 +5,10 @@ module ActiveRegulation
     extend ActiveSupport::Concern
 
     included do
-      attr_accessor :expiration
+      attr_accessor :expiration, :raw_expiration
 
-      validates :expiration, inclusion: { in: 0..1 },
-                             allow_blank: true,
-                             allow_nil: true
-
-      before_save :record_expiration!
+      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) }
@@ -48,7 +45,20 @@ module ActiveRegulation
     end
 
     def record_expiration!
-      self.expires_at = (expiration.zero? ? extension_date : nil) unless expiration.blank?
+      false_value = ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES.include?(expiration)
+      true_value  = ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(expiration)
+
+      if false_value || true_value
+        self.expires_at = (false_value ? extension_date : nil)
+      else
+        raise ArgumentError,
+          "Unknown boolean: #{expiration.inspect}. Must be a valid boolean."
+      end
+    end
+
+    def set_expiration!
+      self.raw_expiration = expiration
+      self.expiration     = expired? if expiration.nil?
     end
 
   end

data/lib/active_regulation/version.rb

@@ -1,3 +1,3 @@
 module ActiveRegulation
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end

data/lib/active_regulation/visibility.rb

@@ -3,13 +3,10 @@ module ActiveRegulation
     extend ActiveSupport::Concern
 
     included do
-      attr_accessor :visibility
+      attr_accessor :visibility, :raw_visibility
 
-      validates :visibility, inclusion: { in: 0..1 },
-                             allow_blank: true,
-                             allow_nil: true
-
-      before_save :record_visibility!
+      before_save :record_visibility!,   unless: -> (obj) { obj.raw_visibility.nil? }
+      after_initialize :set_visibility!
 
       scope :visible,   -> { where(invisible_at: nil) }
       scope :invisible, -> { where.not(invisible_at: nil) }
@@ -38,7 +35,20 @@ module ActiveRegulation
     private
 
     def record_visibility!
-      self.invisible_at = (visibility.zero? ? Time.now : nil) unless visibility.blank?
+      false_value = ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES.include?(visibility)
+      true_value  = ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(visibility)
+
+      if false_value || true_value
+        self.invisible_at = (false_value ? Time.now : nil)
+      else
+        raise ArgumentError,
+          "Unknown boolean: #{visibility.inspect}. Must be a valid boolean."
+      end
+    end
+
+    def set_visibility!
+      self.raw_visibility = visibility
+      self.visibility     = visible? if visibility.nil?
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_regulation
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord