web47core 0.8.5 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 905ca3d7fded036e8b80b3815fce050c3eb75ecc3666e9f3033abbed129bea4f
-  data.tar.gz: 670beb30aa2dbe5751bdeb42b3b65fe09d120392dd726dcc691d2cbad9f53126
+  metadata.gz: b16d9b0b72656026fc126f56d58ca8b1a8e99843feeec96e6892ac139bb4870e
+  data.tar.gz: 624d9b7f27b76d83a1962bb9bed017c766c61323ba507626ed8c56baaf2a9166
 SHA512:
-  metadata.gz: eaeb13b4b2117327fb0fd5cddb7a0bb89642356caf10f085b936c9820a1e9d89d118a1e0f3cad52667a1f463db26c7f2d8f536979c15dd151d533da70530b82e
-  data.tar.gz: 5f6cc5fe0baea5cc355f25c29ddc161623f42718e9581b9dd6ef45a4d63aaf318d15faa08be6cdecc114e5565811fbe057fd85e3910b78e360af3e1d25e0fdc0
+  metadata.gz: d835b86f996ed2b6d3871f9a3a57e1226f2603592990ec42104a769350ab896c9dec7de884cd3ccca6f7cd1bda8164d64447da910c690c6a75d711c925a4319c
+  data.tar.gz: 05da6cc82d68d43c244933dcd10db0ce6be3bb5f915b57325b35cff8d6c89e8f5121e1debb0f626b7312efd3d9ac107872eb3a512e1e03be7226c0971b8d72d9

data/lib/app/jobs/cron/job_tab.rb

@@ -5,7 +5,7 @@ module Cron
   # Value object for a cron tab entry
   #
   class JobTab < Tab
-    FRAMEWORK_CLASSES = %w[Job TrimCollection Command Server Tab JobTab].freeze unless defined? FRAMEWORK_CLASSES
+    FRAMEWORK_CLASSES = %w[job trim_collection command server tab job_tab].freeze unless defined? FRAMEWORK_CLASSES
     #
     # Validations
     #
@@ -36,7 +36,7 @@ module Cron
       end
 
       def job_names
-        @job_names ||= Cron.constants.collect do |job|
+        @job_names ||= all_jobs.collect do |job|
           job_name = job.to_s
           next if FRAMEWORK_CLASSES.include?(job_name) || job_name.end_with?('Test') || job_name.start_with?('Base')
 
@@ -46,6 +46,14 @@ module Cron
 
       private
 
+      def all_jobs
+        (list_jobs("#{__dir__}/*.rb") + list_jobs(Rails.root.join('app/jobs/cron/*.rb'))).compact.uniq
+      end
+
+      def list_jobs(directory)
+        Dir[directory].collect { |file| file.split('/cron/').last.split('.rb').first }
+      end
+
       def configure_cron_tab(tab, type)
         case type
         when :always

data/lib/app/jobs/cron/tab.rb

@@ -11,6 +11,8 @@ module Cron
     # Constants
     #
     WILDCARD = '*' unless defined? WILDCARD
+    COMMA_DELIM = ',' unless defined? COMMA_DELIM
+    SLASH_DEMO = '/' unless defined? SLASH_DEMO
     TIME_UNITS = %i[min hour wday mday month].freeze unless defined? TIME_UNITS
     #
     # Fields
@@ -45,7 +47,7 @@ module Cron
     # For completion of class, but must be implemented by child class
     #
     def run
-      set last_run_at: Time.now.utc
+      set({ last_run_at: Time.now.utc })
     end
 
     private
@@ -69,11 +71,11 @@ module Cron
               when Integer
                 range.include?(value)
               else
-                if value.include?('/')
-                  (numerator, divisor) = value.split('/')
+                if value.include?(SLASH_DEMO)
+                  (numerator, divisor) = value.split(SLASH_DEMO)
                   range.include?(divisor.to_i) && numerator.eql?(WILDCARD)
-                elsif value.include?(',')
-                  options = value.split(',')
+                elsif value.include?(COMMA_DELIM)
+                  options = value.split(COMMA_DELIM)
                   options.collect { |o| range.include?(o.to_i) }.all?
                 else
                   range.include?(value.to_i)
@@ -96,11 +98,11 @@ module Cron
       when Integer
         time.send(unit).eql?(target)
       else
-        if target.include?('/')
-          divisor = target.split('/').last.to_i
+        if target.include?(SLASH_DEMO)
+          divisor = target.split(SLASH_DEMO).last.to_i
           (time.send(unit) % divisor).zero?
-        elsif target.include?(',')
-          options = target.split(',')
+        elsif target.include?(COMMA_DELIM)
+          options = target.split(COMMA_DELIM)
           options.collect { |o| time.send(unit.eql?(o.to_i)) }.any?
         else
           time.send(unit).eql?(target.to_i)

data/lib/app/jobs/cron/trim_audit_logs.rb

@@ -12,18 +12,6 @@ module Cron
       AuditLog.all
     end
 
-    #
-    # Check which audit logs we wanted deleted
-    #
-    # Should be older than 90 days and either not a user model audit log or the model associated with
-    # the UserModelAuditLog has been deleted
-    #
-    def archive?(item)
-      super && (!item.is_a?(UserModelAuditLog) || item.model.blank?)
-    rescue StandardError
-      super
-    end
-
     #
     # Allowed time the amount of time allowed to exists before deleting
     #

data/lib/app/models/concerns/core_system_configuration.rb

@@ -68,6 +68,8 @@ module CoreSystemConfiguration
       field :switchboard_stack_id, type: String
       field :switchboard_stack_api_token, type: String
       field :switchboard_last_sync_at, type: Time
+      # Audit Logs TTL
+      field :user_model_audit_log_ttl, type: Integer, default: 365
       #
       # Validations
       #

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '0.8.5'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.0
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport