web47core 0.7.3 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a0d81bc097ac74a05e76b6b3ba20f246b89ef28df5d2de1770477d1cd4f008a
-  data.tar.gz: fc7d0b4f63aafae7900e71b0e39b9e6b498b61eab81c093af5ecc78dbdd3b4a5
+  metadata.gz: 85a1b6e625ef9c79d09fca54ade10cc6b7198582ef753e0ca0cb153af3d01d48
+  data.tar.gz: f5e8926a67eb5667222cdb6eb420a532b8f589ac697c4d9ed89f8b2f9e955f2e
 SHA512:
-  metadata.gz: e5cc45c8b415e32f21fa1fc4508e91705de8be29d73e561d5b6848e9dc06b286aae1fa9f88013ac86cfa913ac24f1dabad36a4257ab1256281a7ce71137f79c2
-  data.tar.gz: 2d7083baad1719b412c710d2e1bd1a74e9c37c7f83112ef0969a9508fdbf06431d8148060251f049480a0570d689a91b611c48338e090774e538f9e8bdbdd58d
+  metadata.gz: c6426b56a727ac5ba567a99e586737f98e02d1959da73736869ad872c1e9059dab0826691ff71546e3e35830d7307404981ffb0fdb96900854d1bbd6f2e167ea
+  data.tar.gz: ab293fdf38d406356d332eba27ea0be7a61d2b3e6799589caf8477dea227bad039a12d94bc121ff08a5a50c800552e815242bed9b6b944881ee70520214fa6b0

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

@@ -21,7 +21,13 @@ module CoreSystemConfiguration
       # Fields
       #
       field :environment, type: String, default: 'test'
-      field :fips_mode, type: String, default: false
+      field :fips_mode, type: Boolean, default: false
+      field :fav_icon_path, { type: String, default: '/favicon.ico' }
+      field :stack_logo_path, { type: String, default: 'ui-company-logo.png' }
+      field :primary_stylesheet, { type: String, default: 'app47' }
+      field :short_cache, { type: Integer, default: 1 }
+      field :medium_cache, { type: Integer, default: 5 }
+      field :long_cache, { type: Integer, default: 15 }
       # SMTP configuration
       field :default_email, type: String, default: 'support@app47.com'
       field :support_email, type: String, default: 'support@app47.com'
@@ -75,11 +81,7 @@ module CoreSystemConfiguration
 
   module ClassMethods
     def configuration
-      @configuration ||= SystemConfiguration.find_or_create_by!(environment: Rails.env)
-    end
-
-    def reset
-      @configuration = nil
+      SystemConfiguration.find_or_create_by!(environment: Rails.env)
     end
 
     def smtp_configuration
@@ -125,6 +127,21 @@ module CoreSystemConfiguration
                zendesk_token]
   end
 
+  #
+  # Cache times in minutes
+  #
+  def short_cache_time
+    short_cache.minutes
+  end
+
+  def medium_cache_time
+    medium_cache.minutes
+  end
+
+  def long_cache_time
+    long_cache.minutes
+  end
+
   #
   # Determine if SMTP is configured
   #
@@ -249,13 +266,4 @@ module CoreSystemConfiguration
   def slack_configured?
     slack_api_url.present?
   end
-
-  # private
-
-  #
-  # Clear the cache when the object is saved
-  #
-  def clear_cache
-    SystemConfiguration.reset
-  end
 end

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

@@ -22,9 +22,9 @@ module StandardModel
       #
       # Relationships
       #
-      belongs_to :last_modified_by, class_name: Web47core::Config.audit_model_class_name, optional: true
-      belongs_to :created_by, class_name: Web47core::Config.audit_model_class_name, optional: true
-      has_many Web47core::Config.audit_model_log_symbol, dependent: :nullify
+      belongs_to :last_modified_by, polymorphic: true, dependent: :nullify, optional: true
+      belongs_to :created_by, polymorphic: true, dependent: :nullify, optional: true
+      has_many Web47core::Config.audit_model_log_symbol, dependent: :nullify, inverse_of: :model
       #
       # Callbacks
       #
@@ -98,9 +98,10 @@ module StandardModel
     # Record the creation with this user
     #
     def create_and_log(user, attributes)
-      attributes[:last_modified_by_id] = user.id
-      attributes[:created_by_id] = user.id
       model = create(attributes)
+      model.last_modified_by = user
+      model.created_by = user
+      model.save
       log_change(user, model, attributes) if model.valid?
       model
     end
@@ -109,9 +110,10 @@ module StandardModel
     # Record the creation with this user
     #
     def create_and_log!(user, attributes)
-      attributes[:last_modified_by_id] = user.id
-      attributes[:created_by_id] = user.id
       model = create!(attributes)
+      model.last_modified_by = user
+      model.created_by = user
+      model.save!
       log_change(user, model, attributes)
       model
     end
@@ -209,7 +211,7 @@ module StandardModel
     return self if attributes.blank?
 
     action = audit_action
-    attributes[:last_modified_by_id] = user.id
+    self.last_modified_by = user
     result = update(attributes)
     log_change(user, attributes, action) if valid?
     result
@@ -224,7 +226,7 @@ module StandardModel
     return self if attributes.blank?
 
     action = audit_action
-    attributes[:last_modified_by_id] = user.id
+    self.last_modified_by = user
     result = update!(attributes)
     log_change(user, attributes, action)
     result

data/lib/web47core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.1
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-11 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport