active_regulation 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aa82e0167349adfbb84e128be29ebad0150e584
-  data.tar.gz: 156553f7a81734974ebdc1e364f5280a3538b96c
+  metadata.gz: 3fc2bb1f1f44100294643edca82dec9b0f6eb48f
+  data.tar.gz: 6e070d9bdb6c68e6bda282473b326682d74b0f88
 SHA512:
-  metadata.gz: ba24e5cc07a65277486d020ad1a3c23857e59eaa2a8327a4c29df1e9968513525d01340ed410ca7bfb484d5e8838d0e51c4c2911e89b14581dca13edd1993ade
-  data.tar.gz: a7555820016dfd810d44b80a7ff98cb92a9d32bc357743b7cb88a563c7b054e72bc93767b511ce5cc40b43d70d30542fa761226fe1d14ad677d3bde1a5c8b0cb
+  metadata.gz: 7e41be266892964af1cb98249892d7bacf44f0fd2bf957d94e7b3043ebba5c2770c21402ac46ca0b6da60fe3eaa0135552d51a6ed01382b2d6968cdd39cd78eb
+  data.tar.gz: 011b6671c3bac684868c5f128c69ae8a45caaf1029fb68ce563187055e6fee879ea609ba966ba0a6bcd3a1f3070c2d3cf4987950597c0cbfa0487f27e5002080

data/lib/active_regulation/activation.rb

@@ -1,11 +1,12 @@
 module ActiveRegulation
   module Activation
     extend ActiveSupport::Concern
+    include ActiveRegulation::Base
 
     included do
       attr_accessor :activation, :raw_activation
 
-      before_save :record_activation!,   unless: -> (obj) { obj.raw_activation.nil? }
+      before_save :record_activation!, unless: -> (obj) { obj.raw_activation.nil? }
       after_initialize :set_activation!
 
       scope :active,   -> { where(inactivated_at: nil) }
@@ -35,8 +36,8 @@ module ActiveRegulation
     private
 
     def record_activation!
-      false_value = ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES.include?(activation)
-      true_value  = ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(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)

data/lib/active_regulation/base.rb

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

data/lib/active_regulation/containment.rb

@@ -1,11 +1,12 @@
 module ActiveRegulation
   module Containment
     extend ActiveSupport::Concern
+    include ActiveRegulation::Base
 
     included do
       attr_accessor :containment, :raw_containment
 
-      before_save :record_containment!,   unless: -> (obj) { obj.raw_containment.nil? }
+      before_save :record_containment!, unless: -> (obj) { obj.raw_containment.nil? }
       after_initialize :set_containment!
 
       scope :contained,   -> { where.not(contained_at: nil) }
@@ -35,8 +36,8 @@ module ActiveRegulation
     private
 
     def record_containment!
-      false_value = ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES.include?(containment)
-      true_value  = ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(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)

data/lib/active_regulation/expiration.rb

@@ -3,11 +3,12 @@ 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) }
@@ -45,8 +46,8 @@ module ActiveRegulation
     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)

data/lib/active_regulation/version.rb

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

data/lib/active_regulation/visibility.rb

@@ -1,11 +1,12 @@
 module ActiveRegulation
   module Visibility
     extend ActiveSupport::Concern
+    include ActiveRegulation::Base
 
     included do
       attr_accessor :visibility, :raw_visibility
 
-      before_save :record_visibility!,   unless: -> (obj) { obj.raw_visibility.nil? }
+      before_save :record_visibility!, unless: -> (obj) { obj.raw_visibility.nil? }
       after_initialize :set_visibility!
 
       scope :visible,   -> { where(invisible_at: nil) }
@@ -35,8 +36,8 @@ module ActiveRegulation
     private
 
     def record_visibility!
-      false_value = ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES.include?(visibility)
-      true_value  = ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(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)

data/lib/active_regulation.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_regulation
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -144,6 +144,7 @@ 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