web47core 1.0.7 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e47d367b65524e64ca9fdfe7a20cd32913601f00e65cde6dd64b123731de01c
-  data.tar.gz: 82673c3c6a38c473e6207d14cbd5c6a7f7795e4aca35ae334884e08a9a2e2690
+  metadata.gz: 64f54ec070076d76e56d136ae5591375af7fef5de343ace173a968d960944b72
+  data.tar.gz: 0ad4b7661dabd9358bc09cbfbe2f61b83fec4f59eac5d98257363e42796a3b38
 SHA512:
-  metadata.gz: 60930a3608223f8ddf7f93f51206c8f2a8ab7779b59a022dc32489edf02f838e91b7ec1f620b005bd784c2ae609c9d53d8028f1c2332f03f3ff587601920cbe0
-  data.tar.gz: 238254a8922918c08ea3074fb70af71b0c9e8f01ac9567b689a2d6d696655e220feff73e6c605e53102aa5422c4827040742d6a366b5338cdbc6e399262add81
+  metadata.gz: 812533c9e7612635e8646d144582388489cc34e91dd1682adcbc39ec698cec27f8788553d7a60eb18de139b6be5d7746b3525514152910ee382cd7942c35e9c8
+  data.tar.gz: b732ba4c2b1fd46e3e769aefb57ca346e8527049885ecf22988963df5b10c1c6379a4da1f01d0a2a70fa6ab38354d32f3ac10af2411e85572215e89d855dd6e3

data/app/helpers/core_form_helper.rb

@@ -21,12 +21,12 @@ module CoreFormHelper
     # tag_options = {class: []} # text_field_options(model, field, options)
     # tag_options[:class] += ['materialize-textarea']
     content_tag(:div, class: (%w[input-field col] + classes).join(' ')) do
-      concat(text_area(model, field, value, options))
+      concat(text_area_tag(model, field, value, options))
       concat(form_label_tag(model, field, value, options))
     end
   end
 
-  def text_area(model, field, value, options = {})
+  def text_area_tag(model, field, value, options = {})
     tag_options = text_field_options(model, field, options)
     tag_options[:class] += ['materialize-textarea']
     content_tag(:textarea, tag_options) do

data/lib/app/controllers/concerns/core_delayed_jobs_controller.rb

@@ -10,7 +10,7 @@ module CoreDelayedJobsController
   #
   def index
     authorize! :read, Delayed::Backend::Mongoid::Job
-    @delayed_jobs = Delayed::Backend::Mongoid::Job.asc(%i[priority run_at]).limit(100)
+    @delayed_jobs = Delayed::Backend::Mongoid::Job.asc(%i[locked_by priority run_at]).limit(100)
   end
 
   def show

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

@@ -185,7 +185,7 @@ module Cron
     # Returns the AutoScalingGroup associated with the account
     #
     def auto_scaling_group
-      filter = { auto_scaling_group_names: [sys_config.auto_scaling_group_name] }
+      filter = { auto_scaling_group_names: [sys_config.aws_auto_scaling_group_name] }
       @auto_scaling_group ||= client.describe_auto_scaling_groups(filter).auto_scaling_groups.first
     end
 

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

@@ -31,12 +31,19 @@ module Cron
     # Test if this should be archived
     #
     def archive?(item)
-      item.updated_at < allowed_time_for_item(item)
+      item.send(comparison_field) < allowed_time_for_item(item)
     rescue StandardError => error
       App47Logger.log_warn "Unable to archive item #{item.inspect}", error
       false
     end
 
+    #
+    # Return which field to use for comparison when trimming objects
+    #
+    def comparison_field
+      :updated_at
+    end
+
     #
     # Try to get a TTL from System configuration, otherwise return the default
     #

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

@@ -23,7 +23,7 @@ module EncryptedPassword
   # Retrieve the password
   #
   def password
-    cipher.decrypt_and_verify(encrypted_password)
+    encrypted_password.present? ? cipher.decrypt_and_verify(encrypted_password) : ''
   rescue StandardError => error
     App47Logger.log_warn("Unable to retrieve password for #{inspect}", error)
     nil
@@ -32,8 +32,8 @@ module EncryptedPassword
   #
   # Set the password
   #
-  def password=(password)
-    set encrypted_password: cipher.encrypt_and_sign(password)
+  def password=(pass)
+    set encrypted_password: cipher.encrypt_and_sign(pass)
   rescue StandardError => error
     App47Logger.log_error("Unable to store password for #{inspect}", error)
     nil

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

@@ -312,6 +312,7 @@ module StandardModel
   #
   def log_deletion(user, model)
     Web47core::Config.audit_model_log_class.create!(Web47core::Config.audit_model => user,
+                                                    deleted_oid: model.id,
                                                     model: model,
                                                     action: AuditLog::DELETE_ACTION,
                                                     changed_values: App47Logger.clean_params(attributes).to_json)

data/lib/app/models/user_model_audit_log.rb

@@ -8,6 +8,7 @@ class UserModelAuditLog < UserAuditLog
   # Fields
   #
   field :changed_values, type: String
+  field :deleted_oid, type: BSON::ObjectId
   #
   # Relationships
   #

data/lib/web47core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.13
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport