active_regulation 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fc2bb1f1f44100294643edca82dec9b0f6eb48f
-  data.tar.gz: 6e070d9bdb6c68e6bda282473b326682d74b0f88
+  metadata.gz: f3ca84f273ae42c7a002d385e2d49735ef7466a9
+  data.tar.gz: 41728d8e805a20925354cf5e23b32d5b9b99070a
 SHA512:
-  metadata.gz: 7e41be266892964af1cb98249892d7bacf44f0fd2bf957d94e7b3043ebba5c2770c21402ac46ca0b6da60fe3eaa0135552d51a6ed01382b2d6968cdd39cd78eb
-  data.tar.gz: 011b6671c3bac684868c5f128c69ae8a45caaf1029fb68ce563187055e6fee879ea609ba966ba0a6bcd3a1f3070c2d3cf4987950597c0cbfa0487f27e5002080
+  metadata.gz: abda366e0fc97cf382d195eced91de5aa8dc0bf0ddd9e81eb79311b62f0865300da6a984a2cc3d464634fa08f549c540675051c449365ae4e7190f6bf1b96cc8
+  data.tar.gz: d43dcf2b5d9b229bec79ea3eeda3ea743dd4660b76785a9c09be054f962c9d16ea5aacdd572b98b21b1b2a40e64c20311944615b1b280fa41485675e69fd7eb0

data/lib/active_regulation/activation.rb

@@ -6,7 +6,7 @@ module ActiveRegulation
     included do
       attr_accessor :activation, :raw_activation
 
-      before_save :record_activation!, unless: -> (obj) { obj.raw_activation.nil? }
+      before_save :record_activation!
       after_initialize :set_activation!
 
       scope :active,   -> { where(inactivated_at: nil) }
@@ -36,14 +36,16 @@ module ActiveRegulation
     private
 
     def record_activation!
-      false_value = FALSE_VALUES.include?(activation)
-      true_value  = 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."
+      unless raw_activation.nil?
+        false_value = FALSE_VALUES.include?(activation)
+        true_value  = 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
     end
 

data/lib/active_regulation/containment.rb

@@ -6,7 +6,7 @@ module ActiveRegulation
     included do
       attr_accessor :containment, :raw_containment
 
-      before_save :record_containment!, unless: -> (obj) { obj.raw_containment.nil? }
+      before_save :record_containment!
       after_initialize :set_containment!
 
       scope :contained,   -> { where.not(contained_at: nil) }
@@ -36,14 +36,16 @@ module ActiveRegulation
     private
 
     def record_containment!
-      false_value = FALSE_VALUES.include?(containment)
-      true_value  = 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."
+      unless raw_containment.nil?
+        false_value = FALSE_VALUES.include?(containment)
+        true_value  = 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
     end
 

data/lib/active_regulation/expiration.rb

@@ -8,7 +8,7 @@ module ActiveRegulation
     included do
       attr_accessor :expiration, :raw_expiration
 
-      before_save :record_expiration!, unless: -> (obj) { obj.raw_expiration.nil? }
+      before_save :record_expiration!
       after_initialize :set_expiration!
 
       scope :expired,   -> { where("expires_at IS NULL OR expires_at < ?", Time.now) }
@@ -46,14 +46,16 @@ module ActiveRegulation
     end
 
     def record_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,
-          "Unknown boolean: #{expiration.inspect}. Must be a valid boolean."
+      unless raw_expiration.nil?
+        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,
+            "Unknown boolean: #{expiration.inspect}. Must be a valid boolean."
+        end
       end
     end
 

data/lib/active_regulation/version.rb

@@ -1,3 +1,3 @@
 module ActiveRegulation
-  VERSION = "2.2.4"
+  VERSION = "2.2.5"
 end

data/lib/active_regulation/visibility.rb

@@ -6,7 +6,7 @@ module ActiveRegulation
     included do
       attr_accessor :visibility, :raw_visibility
 
-      before_save :record_visibility!, unless: -> (obj) { obj.raw_visibility.nil? }
+      before_save :record_visibility!
       after_initialize :set_visibility!
 
       scope :visible,   -> { where(invisible_at: nil) }
@@ -36,14 +36,16 @@ module ActiveRegulation
     private
 
     def record_visibility!
-      false_value = FALSE_VALUES.include?(visibility)
-      true_value  = 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."
+      unless raw_visibility.nil?
+        false_value = FALSE_VALUES.include?(visibility)
+        true_value  = 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
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_regulation
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Juan Gomez