web47core 0.6.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4fa89fdcd38c923f6fde1827baa6d3237f43120e9e82c25f9c13cc7817e580a
-  data.tar.gz: d25bd53993294c31e1a6f89ce6cffe76c38bd0058411c97c2f4027418a37be43
+  metadata.gz: 6a0d81bc097ac74a05e76b6b3ba20f246b89ef28df5d2de1770477d1cd4f008a
+  data.tar.gz: fc7d0b4f63aafae7900e71b0e39b9e6b498b61eab81c093af5ecc78dbdd3b4a5
 SHA512:
-  metadata.gz: 1b9b6f4ed7fef7b154e7622f664c2c93bfbd6e26524523befd9b764d3d1f72525b06243b91e8c3fac057230dfff5f659017db4893b123665353e994c3cee2dad
-  data.tar.gz: ca8ecfac41f5bd5df4d766d48ad6823550d7fbbb62413c3820011edb151e59d5557edd18f4e967507a539fcd2731bd8198e5b352f3f6c546d95d376d034316e9
+  metadata.gz: e5cc45c8b415e32f21fa1fc4508e91705de8be29d73e561d5b6848e9dc06b286aae1fa9f88013ac86cfa913ac24f1dabad36a4257ab1256281a7ce71137f79c2
+  data.tar.gz: 2d7083baad1719b412c710d2e1bd1a74e9c37c7f83112ef0969a9508fdbf06431d8148060251f049480a0570d689a91b611c48338e090774e538f9e8bdbdd58d

data/README.md

@@ -232,3 +232,7 @@ end
 #### ~/bin Directory
 
 Remove the delayed_job, delayed_job.sh and cron_server.sh files
+
+#### Notification Templates
+
+Move any notification templates from `~/app/assets/templates` to `~/lib/templates`

data/app/controllers/status_controller.rb

@@ -4,36 +4,62 @@
 # Return the status of the server
 #
 class StatusController < ActionController::Base
+  protect_from_forgery with: :exception
   #
   # Main (and only) page
   #
   def index
-    components = { mongo: mongo_status, redis: redis_status, job_count: job_count_status, cron_job: cron_job_status }
+    components = { mongo: mongo_status,
+                   redis: redis_status,
+                   jobs: delayed_jobs_status,
+                   cron_job_servers: cron_job_servers_status,
+                   workers: workers_status }
 
     respond_to do |format|
-      format.html { render :index, locals: { components: components }, layout: false }
+      format.html { render :index, locals: { components: ui_decorators(components) }, layout: false }
       format.json { render json: components.to_json }
-      format.text do
-        overall = components.collect { |_key, item| item[:success] }.all?
-        render plain: components.flatten, status: overall ? 200 : 500
-      end
+      format.text { render plain: components.flatten, status: text_status(components) }
     end
   end
 
   private
 
+  #
+  # Return the status of the key components, mongo, redis
+  #
+  def text_status(components)
+    components[:mongo][:success] && components[:redis][:success] ? 200 : 500
+  rescue StandardError
+    500
+  end
+
+  #
+  # Add UI decorators for HTML formatting
+  #
+  def ui_decorators(components)
+    components.each do |key, values|
+      if values[:success]
+        components[key][:icon_name] = 'check_circle'
+        components[key][:icon_color] = 'green-text'
+      else
+        components[key][:icon_name] = 'error'
+        components[key][:icon_color] = 'red-text'
+      end
+    end
+  end
+
   #
   # Report an error for the check
   #
-  def report_error(error)
-    { success: false, icon_name: 'error', icon_color: 'red-text', message: error.message }
+  def report_error(error, metrics = {})
+    metrics.merge(success: false, message: error.message)
   end
 
   #
   # Report a success for the check
   #
-  def report_success(message)
-    { success: true, icon_name: 'check_circle', icon_color: 'green-text', message: message }
+  def report_success(message, metrics = {})
+    metrics.merge(success: true, message: message)
   end
 
   #
@@ -42,9 +68,9 @@ class StatusController < ActionController::Base
   def mongo_status
     raise 'Mongo not available' if SystemConfiguration.count.zero?
 
-    report_success "#{SystemConfiguration.count} Configs"
+    report_success "#{SystemConfiguration.count} Configs", count: SystemConfiguration.count
   rescue StandardError => error
-    report_error(error)
+    report_error error, count: 0
   end
 
   #
@@ -55,32 +81,53 @@ class StatusController < ActionController::Base
     Rails.cache.write 'redis-status-check', value
     raise 'Redis not available' unless value.eql?(Rails.cache.fetch('redis-status-check'))
 
-    report_success 'Redis Available'
+    report_success 'Redis Available', count: 1
   rescue StandardError => error
-    report_error(error)
+    report_error(error, count: 0)
   end
 
   #
   # Job Count
   #
-  def job_count_status
-    report_success "#{Delayed::Backend::Mongoid::Job.count} Jobs"
+  def delayed_jobs_status
+    count = Delayed::Backend::Mongoid::Job.count
+    report_success "#{count} Jobs", count: count
   rescue StandardError => error
     report_error(error)
   end
 
   #
-  # Cron job status
+  # Cron job primary status
   #
-  def cron_job_status
-    server = Cron::Server.primary_server
+  def cron_job_servers_status
+    server = cron_job_server
     raise 'No primary server' if server.blank?
 
     server_info = "#{server.host_name}(#{server.pid}), last check in #{server.last_check_in_at}"
     raise "Primary Server is DEAD: #{server_info}" if server.dead?
 
-    report_success "Primary Server is alive: #{server_info}"
+    report_success "Primary Server is alive: #{server_info}",
+                   primary_count: 1,
+                   total_count: Cron::Server.count
   rescue StandardError => error
-    report_error(error)
+    report_error(error, primary_count: 0, total_count: Cron::Server.count)
+  end
+
+  #
+  # Desired and current worker status for servers
+  #
+  def workers_status
+    server = cron_job_server
+    raise 'No primary server' if server.blank? || server.dead?
+
+    report_success "Workers #{server.desired_server_count}/ #{server.current_server_count}",
+                   desired_count: server.desired_server_count,
+                   current_count: server.current_server_count
+  rescue StandardError => error
+    report_error(error, desired_count: 0, current_count: 0)
+  end
+
+  def cron_job_server
+    @cron_job_server ||= Cron::Server.primary_server
   end
 end

data/app/helpers/core_helper.rb

@@ -60,15 +60,16 @@ module CoreHelper
   # 3. Length 5-10 only show the first and last character
   # 4. Otherwise show the first and last three characters
   def mask_value(value, default: '************')
-    return default if value.blank?
+    return default if value.blank? || !value.respond_to?(:to_s)
 
-    case value.length
+    string_value = value.to_s
+    case string_value.length
     when 1..4
-      "#{value.first}***********"
+      "#{string_value.first}***********"
     when 5..10
-      "#{value.first}**********#{value.last}"
+      "#{string_value.first}**********#{string_value.last}"
     else
-      "#{value[0..2]}**********#{value[-3..-1]}"
+      "#{string_value[0..2]}**********#{string_value[-3..-1]}"
     end
   end
 
@@ -91,8 +92,4 @@ module CoreHelper
   def edit_model_path(model)
     model_action_path(model, :edit)
   end
-
-  def current_user
-    User.new
-  end
 end

data/app/views/stack/delayed_jobs/index.html.haml

@@ -0,0 +1 @@
+=render '/delayed_jobs/index'

data/app/views/stack/delayed_jobs/show.html.haml

@@ -0,0 +1 @@
+=render '/delayed_jobs/show'

data/app/views/stack/system_configurations/edit.html.haml

@@ -1,5 +1 @@
-- title t('.title', name: SystemConfiguration.environment.titleize)
-.container
-  %form{action: stack_system_configuration_path, method: :post}
-    = render '/system_configurations/form', system_configuration: @system_configuration
-    = render '/common/form_actions', form_cancel_path: admin_system_configuration_path
+= render '/system_configurations/edit'

data/app/views/stack/system_configurations/show.html.haml

@@ -1,3 +1 @@
-- title t('.title', name: SystemConfiguration.environment.titleize)
-= edit_class_link_tag(SystemConfiguration, edit_stack_system_configuration_path)
-= render '/system_configurations/table'
+= render '/system_configurations/show'

data/app/views/status/index.html.haml

@@ -7,7 +7,7 @@
     %meta{ name: 'apple-mobile-web-app-status-bar-style', content: 'black'}
     = stylesheet_link_tag 'https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css'
     = stylesheet_link_tag 'https://fonts.googleapis.com/icon?family=Material+Icons'
-    %title "#{Rails.env} Status"
+    %title="#{Rails.env} Status"
   %body{ style: 'background-color: #006064;'}
     %header
     %main

data/lib/app/jobs/application_job.rb

@@ -4,7 +4,26 @@
 # Base application job that all jobs extend from
 #
 class ApplicationJob < ActiveJob::Base
+  include ActionView::Helpers::NumberHelper
+  include ActionView::Helpers::TextHelper
   include App47Logger
+  attr_accessor :payload, :started_at
+
+  #
+  # Standard approach to running jobs
+  #
+  def perform(payload = {})
+    Rails.cache.reconnect
+    @started_at = Time.now.utc
+    @payload = payload
+    parse_payload
+    execute
+  rescue StandardError => error
+    log_error "Failed to execute job: #{self.inspect}", error
+    raise error
+  ensure
+    GC.start
+  end
 
   #
   # If this job should run in this current environment, defaults to true
@@ -20,4 +39,97 @@ class ApplicationJob < ActiveJob::Base
     my_environments = valid_environments
     (my_environments.empty? || my_environments.include?(Rails.env))
   end
+
+  #
+  # Internal: Parse the payload
+  #
+  # payload - The payload from the class attribute
+  #
+  # Examples
+  #
+  #   parse_payload
+  #
+  # Assigns the class attributes from the payload
+  #
+  def parse_payload
+    attributes = payload.is_a?(Hash) ? payload : JSON.parse(payload)
+    # Set the values contained in the payload
+    attributes.each_pair do |key, value|
+      method = "#{key}=".to_sym
+      send(method, value) if respond_to?(method)
+    end
+  end
+
+  #
+  # Public: Determine the duration of the process, only reporting on the values that are
+  #         greater than zero.
+  #
+  # Examples
+  #
+  #   duration
+  #   # => '1 day 1 hour 32 minutes 10 seconds'
+  #   # => '1 hour 32 minutes 10 seconds'
+  #   # => '32 minutes 10 seconds'
+  #   # => '10 seconds'
+  #
+  # Returns the duration up until this point in time.
+  #
+  def duration
+    start_time = started_at.is_a?(String) ? Time.parse(started_at) : started_at
+    minutes, seconds = split_duration(Time.zone.now - start_time)
+    hours, minutes = split_duration minutes
+    days, hours = split_duration hours, 24
+    report_duration(days, hours, minutes, seconds)
+  end
+
+  private
+
+  #
+  # Internal: Take the current value and split using the split value, return the dividend and modulus
+  #
+  # value - The value to split
+  # split - The split value to use
+  #
+  # Examples
+  #
+  #   split_duration( 120 )
+  #   # => [2, 0]
+  #   split_duration( 125 )
+  #   # => [2, 5]
+  #   split_duration( 125 )
+  #   # => [2, 5]
+  #   split_duration( 48, 24 )
+  #   # => [2, 0]
+  #
+  # Returns an arround with the first value as the dividend and the second as the modulus
+  #
+  def split_duration(value, split = 60)
+    [(value / split).to_i, (value % split).to_i]
+  end
+
+  #
+  # Internal: Put together the descriptive text of the duration.
+  #
+  # days - The number of days
+  # hours - The number of hours
+  # minutes - The number of minutes
+  # seconds - The number of seconds
+  #
+  # Examples
+  #
+  #   report_duration(0, 0, 10, 1)
+  #   # => "10 minutes 1 second"
+  #   report_duration(1, 0, 10, 1)
+  #   # => "1 day 0 hours 10 minutes 1 second"
+  #
+  # Returns the duplicated String.
+  #
+  def report_duration(days, hours, minutes, seconds)
+    dur = []
+    dur << pluralize(days, 'day') if days.positive?
+    dur << pluralize(hours, 'hour') if hours.positive? || days.positive?
+    dur << pluralize(minutes, 'minute') if minutes.positive? || hours.positive? || days.positive?
+    dur << pluralize(seconds, 'second')
+    dur.join(' ')
+  end
 end

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

@@ -18,8 +18,7 @@ module Cron
     #
     # Cycle through all configuration keys
     #
-    def perform
-      Rails.cache.reconnect
+    def execute
       RestClient.get(switchboard_url,
                      ACCESS_TOKEN: SystemConfiguration.switchboard_stack_api_token,
                      content_type: 'application/json') do |response, _request, _result, &block|

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

@@ -18,7 +18,7 @@ module Cron
     #
     # Cycle through the collection and perform an upsert on it
     #
-    def perform
+    def execute
       Web47core::Config.switchboard_able_models.each { |model| model.each(&:switchboard_upsert) }
     end
   end

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

@@ -9,8 +9,7 @@ module Cron
     #
     # Fetch each item and delete it if hasn't been updated in 30 days
     #
-    def perform
-      # Rails.cache.reconnect
+    def execute
       count = 0
       total = collection.count
       while count <= total

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

@@ -20,5 +20,25 @@ module Cron
     def collection
       Notification.all
     end
+
+    #
+    # Test if this should be archived
+    #
+    def archive?(item)
+      time = if item.is_a?(EmailNotification) && template?(item)
+               5.years.ago.utc
+             else
+               allowed_time
+             end
+      item.updated_at < time
+    end
+
+    #
+    # Determine if the notification has a template associated with it
+    #
+    def template?(item)
+      item.notification_template.present? ||
+        item[:notification_template_id].present? && Template.where(_id: item[:notification_template_id]).present?
+    end
   end
 end

data/lib/app/models/audit_log.rb

@@ -20,7 +20,7 @@ class AuditLog
   #
   # Validations
   #
-  validates :action, inclusion: { in: ALL_ACTIONS }
+  # validates :action, inclusion: { in: ALL_ACTIONS }
 
   def self.sort_order
     [:created_at, -1]

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

@@ -39,4 +39,18 @@ module CoreAccount
   def fetch_smtp_configuration
     smtp_configuration || build_smtp_configuration
   end
+
+  #
+  # return the email notifications templates, these are custom notifications sent by an admin.
+  #
+  def email_notification_templates
+    templates.where(_type: 'EmailNotificationTemplate')
+  end
+
+  #
+  # return the email templates, these are email templates for actions in the system
+  #
+  def email_templates
+    templates.where(_type: 'EmailTemplate')
+  end
 end

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

@@ -16,6 +16,7 @@ module CoreSystemConfiguration
   #
   def self.included(base)
     base.class_eval do
+      attr_accessor :configuration
       #
       # Fields
       #
@@ -73,27 +74,12 @@ module CoreSystemConfiguration
   end
 
   module ClassMethods
-    #
-    # Fetch the system configuration based on environment name. First try the rails cache
-    # if not there, then go to the database.
-    #
-    # Also, if an argument error is thrown, then just fetch from the database.
-    #
     def configuration
-      cache_key = "SystemConfiguration::#{Rails.env}"
-
-      begin
-        config = Rails.cache.fetch(cache_key, expires_in: 90.seconds) do
-          SystemConfiguration.find_by(environment: Rails.env)
-        end
-      rescue StandardError
-        # This seems to happen in testing relative to Country, when it does, remove
-        # ourselves from the cache and return the DB entry.
-        Rails.cache.delete cache_key
-        config = SystemConfiguration.find_or_create_by!(environment: Rails.env)
-      end
+      @configuration ||= SystemConfiguration.find_or_create_by!(environment: Rails.env)
+    end
 
-      config.nil? ? SystemConfiguration.create(environment: Rails.env) : config
+    def reset
+      @configuration = nil
     end
 
     def smtp_configuration
@@ -110,19 +96,21 @@ module CoreSystemConfiguration
     #
     # NOTE: Currently ignored Codacy issue: When using 'method_missing', fall back on 'super'
     #
-    # rubocop:disable Style/MethodMissingSuper
     def method_missing(method, *args, &_block)
-      configuration.send method, *args
+      if configuration.respond_to?(method)
+        configuration.send(method, *args)
+      else
+        super
+      end
     end
 
-    def respond_to?(method_name, _include_private = false)
-      SystemConfiguration.fields.include?(method_name)
+    def respond_to?(method_name, include_private = false)
+      configuration.respond_to?(method_name, include_private) || super
     end
 
-    def respond_to_missing?(method_name, _include_private = false)
-      SystemConfiguration.fields.include?(method_name)
+    def respond_to_missing?(method_name, include_private = false)
+      configuration.respond_to?(method_name, include_private) || super
     end
-    # rubocop:enable Style/MethodMissingSuper
   end
 
   #
@@ -147,7 +135,7 @@ module CoreSystemConfiguration
   #
   # Determine if mailgun is configured
   #
-  def mailgun_configured?
+  def mail_gun_configured?
     smtp_configured? && mailgun_api_key.present?
   end
 
@@ -203,7 +191,7 @@ module CoreSystemConfiguration
     config = SystemConfiguration.configuration
     path = if config.zendesk_configured? && user.present?
              time_now = Time.now.to_i
-             jti = "#{time_now}/#{rand(36**64).to_s(36)}"
+             jti = "#{time_now}/#{rand(36 ** 64).to_s(36)}"
              payload = { jwt: JWT.encode({ iat: time_now, # Seconds since epoch, determine when this token is stale
                                            jti: jti, # Unique token identifier, helps prevent replay attacks
                                            name: user.name,
@@ -262,12 +250,12 @@ module CoreSystemConfiguration
     slack_api_url.present?
   end
 
-  private
+  # private
 
   #
   # Clear the cache when the object is saved
   #
   def clear_cache
-    Rails.cache.delete "SystemConfiguration::#{Rails.env}"
+    SystemConfiguration.reset
   end
 end

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

@@ -62,7 +62,7 @@ module EmailAble
   # Reset the bounced email
   #
   def reset_bounce_status
-    return unless SystemConfiguration.mailgun_configured? && email_bounced?
+    return unless SystemConfiguration.mail_gun_configured? && email_bounced?
 
     reset_url = "https://api.mailgun.net/v3/#{SystemConfiguration.smtp_domain}/bounces/#{CGI.escape(email)}"
     RestClient.delete(reset_url, user: 'api', password: SystemConfiguration.mailgun_api_key)

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

@@ -39,6 +39,16 @@ module SearchAble
     end
   end
 
+  #
+  # Place holder to call to allow for work to be done before we gather up search text fields
+  #
+  def before_search_text; end
+
+  #
+  # Place holder to call to allow for work to be done after we gather up search text fields
+  #
+  def after_search_text; end
+
   #
   # Internal: Update the search and sort text
   #
@@ -47,8 +57,10 @@ module SearchAble
   def update_search_and_sort_text
     return if destroyed?
 
+    before_search_text
     update_text(search_fields, :search_text)
     update_text(sort_fields, :sort_text)
+    after_search_text
   end
 
   #
@@ -69,6 +81,8 @@ module SearchAble
         value.to_s.rjust(4, '0')
       when Array
         value.empty? ? nil : value.join(' ').downcase
+      when Hash
+        value.inspect
       else
         value.to_s
       end

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

@@ -15,16 +15,16 @@ module StandardModel
       #
       # Fields
       #
-      field :last_modified_by_email
-      field :last_modified_by_name
-      field :created_by_email
-      field :created_by_name
+      field :last_modified_by_email, type: String
+      field :last_modified_by_name, type: String
+      field :created_by_email, type: String
+      field :created_by_name, type: String
       #
       # Relationships
       #
-      belongs_to :last_modified_by, class_name: 'User', optional: true
-      belongs_to :created_by, class_name: 'User', optional: true
-      has_many Web47core::Config.user_audit_model_log_symbol, dependent: :nullify
+      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
       #
       # Callbacks
       #
@@ -42,9 +42,9 @@ module StandardModel
     # Used by calling 'model.without_callback(*.args, &block) do'
     def without_callback(*args, &_block)
       skip_callback(*args)
-      result = yield
+      yield
+    ensure
       set_callback(*args)
-      result
     end
 
     #
@@ -60,10 +60,7 @@ module StandardModel
     def allowed_param_names(filter_names = [])
       # Always filter out the mongoid reserved items
       filter_names += %w[created_at updated_at _type _id]
-      associations = all_associations
-      # filter out the relationship names so we don't have dups
-      associations.each { |association| filter_names << association.keys.first }
-      (field_names + associations).delete_if { |name| filter_names.include?(name) }
+      field_names(filter_names)
     rescue StandardError
       attribute_names.delete_if { |name| filter_names.include?(name) }
     end
@@ -72,38 +69,19 @@ module StandardModel
     # allow the model to filter out a name if they want to, meaning the model
     # can return a subset of attribute names
     #
-    def field_names
-      attribute_names
-    end
-
-    #
-    # gather up the collections we care about and return them. For now, the
-    # many to many associations are the ones that need some extra help.
-    #
-    def all_associations
-      many_to_many_associations
-    end
-
-    #
-    # Return a collection of many to many assocations. We basically
-    # need to turn the current value returned by attribute names
-    #
-    # relationship_ids
-    #
-    # to
-    #
-    # { relationship_ids => [] }
-    #
-    # Telling the permit command to accept the value as an array of items.
-    #
-    def many_to_many_associations
-      associations = []
-      reflect_on_all_associations.each do |association|
-        next unless association.macro == :has_and_belongs_to_many
-
-        associations << { association.key => [] }
-      end
-      associations
+    def field_names(filter_names)
+      fields.collect do |field|
+        next if filter_names.include?(field[0])
+
+        case field[1].options[:type].to_s
+        when 'Hash'
+          { field[0] => {} }
+        when 'Array'
+          { field[0] => [] }
+        else
+          field[0]
+        end
+      end.compact
     end
 
     #
@@ -142,10 +120,10 @@ module StandardModel
     # Log the audit record
     #
     def log_change(user, model, changes)
-      Web47core::Config.user_audit_model_log_class.create!(Web47core::Config.user_audit_model => user,
-                                                           model: model,
-                                                           action: model.audit_action,
-                                                           changed_values: App47Logger.clean_params(changes).to_json)
+      Web47core::Config.audit_model_log_class.create!(Web47core::Config.audit_model => user,
+                                                      model: model,
+                                                      action: model.audit_action,
+                                                      changed_values: App47Logger.clean_params(changes).to_json)
     end
   end
 
@@ -196,10 +174,10 @@ module StandardModel
   # record a change for the object instance
   #
   def log_change(user, changes, action)
-    Web47core::Config.user_audit_model_log_class.create!(Web47core::Config.user_audit_model => user,
-                                                         model: self,
-                                                         action: action,
-                                                         changed_values: App47Logger.clean_params(changes).to_json)
+    Web47core::Config.audit_model_log_class.create!(Web47core::Config.audit_model => user,
+                                                    model: self,
+                                                    action: action,
+                                                    changed_values: App47Logger.clean_params(changes).to_json)
   end
 
   def audit_action
@@ -300,10 +278,10 @@ module StandardModel
   # Log the deletion, capturing the current values of the record before it is removed from the system
   #
   def log_deletion(user, model)
-    Web47core::Config.user_audit_model_log_class.create!(Web47core::Config.user_audit_model => user,
-                                                         model: model,
-                                                         action: AuditLog::DELETE_ACTION,
-                                                         changed_values: App47Logger.clean_params(attributes).to_json)
+    Web47core::Config.audit_model_log_class.create!(Web47core::Config.audit_model => user,
+                                                    model: model,
+                                                    action: AuditLog::DELETE_ACTION,
+                                                    changed_values: App47Logger.clean_params(attributes).to_json)
   end
 
   def capture_user_info

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

@@ -9,8 +9,7 @@ module SwitchboardAble
   def self.included(base)
     base.class_eval do
       field :switchboard_id, type: String
-      after_create :switchboard_upsert
-      # after_update :switchboard_upsert
+      after_save :switchboard_upsert
       before_destroy :switchboard_delete
     end
   end
@@ -55,13 +54,12 @@ module SwitchboardAble
   def switchboard_delete
     return unless SystemConfiguration.switchboard_configured? && switchboard_id.present?
 
-    RestClient.delete(switchboard_url, ACCESS_TOKEN: sw_api_token) do |response, _request, _result, &block|
+    RestClient.delete(switchboard_url, ACCESS_TOKEN: sw_api_token) do |response, _request, _result|
       case response.code
       when 200
         App47Logger.log_debug "Switchboard deleted #{inspect}"
       else
         App47Logger.log_error "Unable to delete the switchboard object #{inspect}, #{response.inspect}"
-        response.return!(&block)
       end
     end
   end

data/lib/app/models/email_notification.rb

@@ -110,6 +110,7 @@ class EmailNotification < Notification
       mail.delivery_method :smtp, smtp_configuration
     end
 
+    mail.header['X-Mailgun-Native-Send'] = 'yes' if SystemConfiguration.mail_gun_configured?
     # Deliver it
     mail.deliver
   rescue StandardError => error
@@ -138,8 +139,8 @@ class EmailNotification < Notification
   # sender address
   #
   def sender_address
-    address = SystemConfiguration.smtp_user_name
-    unless account.nil?
+    address = SystemConfiguration.support_email
+    if account.present?
       account_smtp = account.fetch_smtp_configuration
       address = account_smtp.username if account_smtp.use?
     end
@@ -230,23 +231,17 @@ class EmailNotification < Notification
   end
 
   def subject_from_template(template_name, locals)
-    subject = account_subject_template(template_name) ||
-              default_subject_template(template_name) ||
-              template_from_file(template_name, prefix: 'subject')
-    return subject_from_liquid_text(subject, locals) if subject.present?
-
-    subject = template_from_file(template_name, format: 'haml', prefix: 'subject')
-    subject_from_haml_text(subject, locals) if subject.present?
+    subject = account_subject_template(template_name) || Template.from_file(template_name, prefix: 'subject')
+    if subject.present?
+      subject_from_liquid_text(subject, locals)
+    else
+      subject = Template.from_file(template_name, format: 'haml', prefix: 'subject')
+      subject.present? ? subject_from_haml_text(subject, locals) : nil
+    end
   end
 
   def account_subject_template(template_name)
-    account.templates.emails.find_by(name: template_name.to_s).subject
-  rescue StandardError
-    nil
-  end
-
-  def default_subject_template(template_name)
-    EmailTemplate.where(account: nil, name: template_name.to_s).template
+    account.email_templates.find_by(name: template_name.to_s).subject
   rescue StandardError
     nil
   end

data/lib/app/models/email_template.rb

@@ -7,7 +7,37 @@ class EmailTemplate < Template
   #
   field :subject, type: String
   #
+  # Callbacks
+  #
+  before_save :htmlize_template
+  #
   # Validations
   #
   validates :subject, presence: true
+
+  #
+  # Make sure the template is wrapped in html
+  def htmlize_template
+    if template.present? && !template.strip.start_with?("<")
+      self.template = "<body><pre>#{template}</pre></body>"
+    end
+  end
+
+  def valid_liquid_template
+    super && Liquid::Template.parse(self.subject).nil?
+  rescue Exception => error
+    self.errors.add(:subject, "Invalid liquid text in subject: #{error.message}")
+    false
+  end
+
+  #
+  # Copy the default from disk
+  #
+  def self.copy_default(name)
+    template = EmailTemplate.new
+    template.name = name
+    template.template = from_file name
+    template.subject = from_file name, prefix: 'subject'
+    template
+  end
 end

data/lib/app/models/notification.rb

@@ -158,7 +158,7 @@ class Notification
   # If the account does exists or the template in the account does exist, we catch the error and return nil
   #
   def account_message_template(template_name)
-    account.templates.find_by(name: template_name.to_s, _type: "Account#{delivery_channel.humanize}Template").template
+    account.templates.find_by(name: template_name.to_s, _type: "#{delivery_channel.humanize}Template").template
   rescue StandardError
     nil
   end
@@ -172,20 +172,6 @@ class Notification
     nil
   end
 
-  #
-  # Retrieve the template out of the project
-  #
-  def template_from_file(template_name, format: 'liquid', prefix: nil)
-    file_name = [template_name, prefix, format].compact.join('.')
-    if File.exist?(Rails.root.join('lib', 'templates', delivery_channel, file_name))
-      File.open(Rails.root.join('lib', 'templates', delivery_channel, file_name))
-    else
-      File.read(File.join(__dir__, '../../lib', 'templates', delivery_channel, file_name))
-    end.read
-  rescue StandardError
-    nil
-  end
-
   #
   # Default delivery channel is email, override for sms, SMTP or other channels
   #
@@ -194,17 +180,20 @@ class Notification
   end
 
   def message_from_template(template_name, locals)
-    template = account_message_template(template_name) || template_from_file(template_name)
-    return message_from_liquid_text(template, locals) if template.present?
-
-    template = template_from_file(template_name, format: 'haml')
-    message_from_haml_text(template, locals) if template.present?
+    template = account_message_template(template_name) ||
+      Template.from_file(template_name, delivery_channel: delivery_channel)
+    if template.present?
+      message_from_liquid_text(template, locals)
+    else
+      template = Template.from_file(template_name, format: 'haml', delivery_channel: delivery_channel)
+      template.present? ? message_from_haml_text(template, locals) : nil
+    end
   end
 
   def message_from_haml_text(haml_text, locals)
     locals[:base_url] = SystemConfiguration.base_url
     engine = Haml::Engine.new(haml_text)
-    self.message = engine.render(Object.new, stringify_all(locals))
+    self.message = engine.render(Object.new, locals)
   end
 
   def message_from_haml_file(file_name, locals)

data/lib/app/models/template.rb

@@ -18,4 +18,31 @@ class Template
   validates :name, uniqueness: { scope: :account_id }
   validates :name, presence: true
   validates :template, presence: true
+  validate :valid_liquid_template
+
+  private
+
+  #
+  # Ensure that the template is correct from a liquid statement
+  #
+  def valid_liquid_template
+    Liquid::Template.parse(self.template).nil?
+  rescue Exception => error
+    self.errors.add(:template, "Invalid liquid text in template: #{error.message}")
+    false
+  end
+
+  #
+  # Retrieve the template out of the project
+  #
+  def self.from_file(template_name, format: 'liquid', prefix: nil, delivery_channel: 'email')
+    file_name = [template_name, prefix, format].compact.join('.')
+    if File.exist?(Rails.root.join('lib/templates', delivery_channel, file_name))
+      File.open(Rails.root.join('lib/templates', delivery_channel, file_name))
+    else
+      File.read(File.join(__dir__, '../../lib/templates', delivery_channel, file_name))
+    end.read
+  rescue StandardError
+    nil
+  end
 end

data/lib/web47core/config.rb

@@ -6,30 +6,34 @@ module Web47core
   #
   class Config
     include Singleton
-    attr_accessor :email_able_models, :switchboard_able_models, :user_audit_model
+    attr_accessor :email_able_models, :switchboard_able_models, :audit_model
 
     def initialize
       @email_able_models = []
       @switchboard_able_models = []
-      @user_audit_model = :user
+      @audit_model = :user
     end
 
     def self.reset
       instance.email_able_models = []
       instance.switchboard_able_models = []
-      instance.user_audit_model = :user
+      instance.audit_model = :user
     end
 
-    def self.user_audit_model_log_class
-      user_audit_model_log_class_name.constantize
+    def self.audit_model_log_class
+      audit_model_log_class_name.constantize
     end
 
-    def self.user_audit_model_log_class_name
-      user_audit_model_log_symbol.camelize
+    def self.audit_model_log_class_name
+      audit_model_log_symbol.camelize
     end
 
-    def self.user_audit_model_log_symbol
-      "#{instance.user_audit_model}_model_audit_log"
+    def self.audit_model_log_symbol
+      "#{instance.audit_model}_model_audit_log"
+    end
+
+    def self.audit_model_class_name
+      instance.audit_model.to_s.camelize
     end
 
     #

data/lib/web47core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -583,6 +583,8 @@ files:
 - app/views/delayed_jobs/show.html.haml
 - app/views/stack/cron/edit.html.haml
 - app/views/stack/cron/index.html.haml
+- app/views/stack/delayed_jobs/index.html.haml
+- app/views/stack/delayed_jobs/show.html.haml
 - app/views/stack/system_configurations/edit.html.haml
 - app/views/stack/system_configurations/show.html.haml
 - app/views/status/index.html.haml