web47core 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66de41059addc2feb9a356910262228c3023e61b3860080f55e1b7a66b0f3b8c
-  data.tar.gz: 40768029411501eb25cf379bc9d42fb3a1ab0124103e09a29df09cf3816afbb8
+  metadata.gz: fd6df6a00053ff9fd998b767d581c1468ce7fff3f230526333b73839e59670cf
+  data.tar.gz: 1b3d1bd842c3ba6bb6878073cd4ddc71c4e966f144df67a13587f97fcbe4c191
 SHA512:
-  metadata.gz: 211c0e7e8ea7bd957ce8d4212d6ea72d10362f3d298d718c6d68d897a3dc2da76a0dddf4265f23dcf6881ab8b079a457666d6786f0044fb32565e5082212b78a
-  data.tar.gz: 7699c4fde4221b0beca0819239477cbd6e086c2f0f5a92e40fe98079cc96ba419bd0d94bede45d10b14483de2b8e51dbc89209567f5974070ddd786e9e05acfd
+  metadata.gz: 5e8fe75827bda687fbfd29fb2109f22e2f0b7195c8655aceee8739c99abed900adf2c1c2b1b723ab2566bd7e89a26a35ca1fc8695afa2a84e8112cb0d2790389
+  data.tar.gz: be892f7392931062cb1be21187f84163f7f0534b4af9905b01c60e714ec85849dd6df3947e1da2faa4bd5cca0f3e8b51688b2b9789c9f2c4bc9954c1faffd6af

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 :default_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
-  #   Rails.cache.delete "SystemConfiguration::#{Rails.env}"
-  # 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.2'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 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