active_regulation 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3ca84f273ae42c7a002d385e2d49735ef7466a9
-  data.tar.gz: 41728d8e805a20925354cf5e23b32d5b9b99070a
+  metadata.gz: 33792242a23654c0acd0e9eaafc2097f4480955c
+  data.tar.gz: 2fdaa474fef2d46740bb7ed129775f3e8bf664d4
 SHA512:
-  metadata.gz: abda366e0fc97cf382d195eced91de5aa8dc0bf0ddd9e81eb79311b62f0865300da6a984a2cc3d464634fa08f549c540675051c449365ae4e7190f6bf1b96cc8
-  data.tar.gz: d43dcf2b5d9b229bec79ea3eeda3ea743dd4660b76785a9c09be054f962c9d16ea5aacdd572b98b21b1b2a40e64c20311944615b1b280fa41485675e69fd7eb0
+  metadata.gz: 9888c1dd1393df50466a2e73784298d69ddafe461b7ebfa9cbea5e1d9abcb993652c8c8b206394b6b24259a8f3c226194ea471558a128f32fe95b2959dde8377
+  data.tar.gz: ab9c5874e9eb7acb3b85f1dd079eb3e78e1f74d8470c8d63e29cf8203fc093cbb2447e7ffd8f68d88ed7660757b218ef269b16ffc46f45dcf65bd0cc0f62ebcd

data/README.md

@@ -49,16 +49,11 @@ class User < ActiveRecord::Base
 
   include ActiveRegulation::Containment
 
-  # A virtual attribute is generated for
-  # easy use with forms and models
-
 end
 ```
 
 ## Usage
 ```ruby
-user = User.create!(activation: 1)
-
 user.active?       #=> true
 user.inactive?     #=> false
 

data/lib/active_regulation/activation.rb

@@ -1,14 +1,8 @@
 module ActiveRegulation
   module Activation
     extend ActiveSupport::Concern
-    include ActiveRegulation::Base
 
     included do
-      attr_accessor :activation, :raw_activation
-
-      before_save :record_activation!
-      after_initialize :set_activation!
-
       scope :active,   -> { where(inactivated_at: nil) }
       scope :inactive, -> { where.not(inactivated_at: nil) }
     end
@@ -29,29 +23,12 @@ module ActiveRegulation
       !active?
     end
 
-    def to_activation
-      I18n.t("active_regulation.activation.#{active? ? :active : :inactive}")
-    end
-
-    private
-
-    def record_activation!
-      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
+    def inactivated_at_or_time
+      active? ? Time.now : inactivated_at
     end
 
-    def set_activation!
-      self.raw_activation = activation
-      self.activation     = active? if activation.nil?
+    def to_activation
+      I18n.t("active_regulation.activation.#{active? ? :active : :inactive}")
     end
 
   end

data/lib/active_regulation/containment.rb

@@ -1,14 +1,8 @@
 module ActiveRegulation
   module Containment
     extend ActiveSupport::Concern
-    include ActiveRegulation::Base
 
     included do
-      attr_accessor :containment, :raw_containment
-
-      before_save :record_containment!
-      after_initialize :set_containment!
-
       scope :contained,   -> { where.not(contained_at: nil) }
       scope :uncontained, -> { where(contained_at: nil) }
     end
@@ -29,29 +23,12 @@ module ActiveRegulation
       contained_at.nil?
     end
 
-    def to_containment
-      I18n.t("active_regulation.containment.#{uncontained? ? :uncontained : :contained}")
-    end
-
-    private
-
-    def record_containment!
-      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
+    def contained_at_or_time
+      uncontained? ? Time.now : contained_at
     end
 
-    def set_containment!
-      self.raw_containment = containment
-      self.containment     = contained? if containment.nil?
+    def to_containment
+      I18n.t("active_regulation.containment.#{uncontained? ? :uncontained : :contained}")
     end
 
   end

data/lib/active_regulation/expiration.rb

@@ -3,14 +3,8 @@ require 'date'
 module ActiveRegulation
   module Expiration
     extend ActiveSupport::Concern
-    include ActiveRegulation::Base
 
     included do
-      attr_accessor :expiration, :raw_expiration
-
-      before_save :record_expiration!
-      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
@@ -20,7 +14,7 @@ module ActiveRegulation
     end
 
     def extend!(amount=nil)
-      update(expires_at: (amount.nil? ? extension_date : amount))
+      update(expires_at: extension_date(amount))
     end
 
     def unexpire!
@@ -35,33 +29,20 @@ module ActiveRegulation
       expires_at.nil? ? false : (Time.now < expires_at)
     end
 
+    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(days=30)
-      DateTime.now + days
-    end
-
-    def record_expiration!
-      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
+    def extension_date(time=nil)
+      time = 30 if time.nil?
 
-    def set_expiration!
-      self.raw_expiration = expiration
-      self.expiration     = expired? if expiration.nil?
+      time.is_a?(Integer) ? (DateTime.now + time) : time
     end
 
   end

data/lib/active_regulation/version.rb

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

data/lib/active_regulation/visibility.rb

@@ -1,14 +1,8 @@
 module ActiveRegulation
   module Visibility
     extend ActiveSupport::Concern
-    include ActiveRegulation::Base
 
     included do
-      attr_accessor :visibility, :raw_visibility
-
-      before_save :record_visibility!
-      after_initialize :set_visibility!
-
       scope :visible,   -> { where(invisible_at: nil) }
       scope :invisible, -> { where.not(invisible_at: nil) }
     end
@@ -29,29 +23,12 @@ module ActiveRegulation
       invisible_at.nil?
     end
 
-    def to_visibility
-      I18n.t("active_regulation.visibility.#{visible? ? :visible : :invisible}")
-    end
-
-    private
-
-    def record_visibility!
-      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
+    def invisible_at_or_time
+      visible? ? Time.now : invisible_at
     end
 
-    def set_visibility!
-      self.raw_visibility = visibility
-      self.visibility     = visible? if visibility.nil?
+    def to_visibility
+      I18n.t("active_regulation.visibility.#{visible? ? :visible : :invisible}")
     end
 
   end

data/lib/active_regulation.rb

@@ -1,5 +1,4 @@
 require "active_regulation/version"
-require "active_regulation/base"
 require "active_regulation/activation"
 require "active_regulation/containment"
 require "active_regulation/expiration"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_regulation
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Juan Gomez
@@ -144,7 +144,6 @@ files:
 - config/locales/en.yml
 - lib/active_regulation.rb
 - lib/active_regulation/activation.rb
-- lib/active_regulation/base.rb
 - lib/active_regulation/containment.rb
 - lib/active_regulation/expiration.rb
 - lib/active_regulation/version.rb

data/lib/active_regulation/base.rb

@@ -1,8 +0,0 @@
-module ActiveRegulation
-  module Base
-
-    FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE']
-    TRUE_VALUES  = [true, 1, '1', 't', 'T', 'true', 'TRUE']
-
-  end
-end