web47core 3.2.3.30 → 3.2.3.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f2f736da8b94ec286fb7f058993c995c47eca9f0b31e32bf9ce836aa77f70c3
-  data.tar.gz: 94a764cdd7e74c7a28d91855b69b646572405d035954f36ef13c0967cf6c3f13
+  metadata.gz: 802701ca7fd3618efc7bcf10c8c9f9299a9d75cead03284879539b931fd0d2ee
+  data.tar.gz: 1c2df41fec8fa2391ad64399dc481bb3789b9657893be8d7ba29189aa20c4719
 SHA512:
-  metadata.gz: 658278516a6ad09337c857bd2ad2e4fbf1ee32881890d06034d003778dad2cd46ab24934ea8237962f7a1c9d917800a9922f7f338a228b640e520a0c4fcd33fc
-  data.tar.gz: a485be8d18a431e76ff5887ec0e8c739a597cd1fb67c431c7668383e51788c56f05a3b1823477800dea7cc250ded36fe5614c55b88f2b1fe895d1d5950dd6d20
+  metadata.gz: 51977b350f0894bcff77230015b88303f0e0a035ab39dde554728369dd027b308cbe959cd4863219daa26306460ef2965229c9619514babad59634973f05a7b2
+  data.tar.gz: ad4e22759a3bc3c7fce76670af44c7e715c46c4b5d527e7b45daa16b29a91cfc5d9798d76b66e40424710059cc8844c740f29b2b039a396238f9eba816dfb22f

data/app/helpers/core_data_grid_helper.rb

@@ -1,5 +1,5 @@
 module CoreDataGridHelper
-  def data_grid_tag(model, fields: [], except: [])
+  def data_grid_tag(model, fields: [], except: [], &block)
     fields = model.class.allowed_param_names(except) + model.class::STANDARD_FIELDS if fields.blank?
 
     content_tag(:div, class: 'datagrid') do
@@ -10,8 +10,8 @@ module CoreDataGridHelper
 
         concat(data_grid_item(field, data_grid_field_value(model, field)))
       end
+      concat(capture(&block)) if block_given?
     end
-
   end
 
   def data_grid_item(title, content)

data/app/helpers/core_helper.rb

@@ -49,7 +49,7 @@ module CoreHelper
     %w[password token secret access_key api_key].each do |mask|
       should_mask |= field.include?(mask)
     end
-    value = SystemConfiguration.send(field)
+    value = sys_config.send(field)
     should_mask ? mask_value(value, default: 'Not Set') : value
   end
 
@@ -92,4 +92,8 @@ module CoreHelper
   def edit_model_path(model)
     model_action_path(model, :edit)
   end
+
+  def sys_config
+    @sys_config ||= SystemConfiguration.configuration
+  end
 end

data/app/helpers/svg_icon_helper.rb

@@ -6,7 +6,7 @@ module SvgIconHelper
     return if name.blank?
 
     key = ['svg_icon', name, size.to_s, type.to_s, classes.to_s, color, stroke_width.to_s].join(':')
-    Rails.cache.fetch(key, expires_in: SystemConfiguration.long_cache) do
+    Rails.cache.fetch(key, expires_in: 15.minutes) do
       fetch_svg_icon(name, size: size, type: type, classes: classes, color: color, stroke_width: stroke_width)
     end
   end
@@ -16,7 +16,7 @@ module SvgIconHelper
 
     classes = classes.compact.flatten.join(' ')
     key = "icon_partial_path:#{name}:#{type}"
-    (partial, stroke) = Rails.cache.fetch(key, expires_in: SystemConfiguration.long_cache) do
+    (partial, stroke) = Rails.cache.fetch(key, expires_in: 15.minutes) do
       preferred_path = I18n.exists?("nav.icons.#{name}") ? 'icons/' + I18n.t("nav.icons.#{name}") : "icons/#{type}/#{name}"
       outline_path = "icons/outline/#{name}"
       filled_path = "icons/filled/#{name}"

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

@@ -1,6 +1,6 @@
 - title 'Edit'
 - content_for :breadcrumbs do
-  =breadcrumb_step(system_configurations_path,  SystemConfiguration.environment.titleize)
+  =breadcrumb_step(system_configurations_path,  sys_config.environment.titleize)
 %form{action: system_configurations_path, method: :post}
   %input{type: :hidden, value: form_authenticity_token, name: :authenticity_token}
   %input{type: :hidden, name: '_method', value: :put}
@@ -8,7 +8,7 @@
     .card-body
       .container
         .row
-          = html5_text_field(@system_configuration, :switchboard_base_url, classes: %w[col-sm-12 col-lg-4] )
-          = html5_text_field(@system_configuration, :switchboard_stack_id, classes: %w[col-sm-12 col-lg-4])
-          = html5_password(@system_configuration, :switchboard_stack_api_token, classes: %w[col-sm-12 col-lg-4])
+          = html5_text_field(@system_config, :switchboard_base_url, classes: %w[col-sm-12 col-lg-4] )
+          = html5_text_field(@system_config, :switchboard_stack_id, classes: %w[col-sm-12 col-lg-4])
+          = html5_password(@system_config, :switchboard_stack_api_token, classes: %w[col-sm-12 col-lg-4])
     .card-footer= render 'common/form_actions', form_cancel_path: system_configurations_path

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

@@ -1,10 +1,10 @@
-- title SystemConfiguration.environment.titleize
+- title sys_config.environment.titleize
 .card
   .card-header.d-flex.justify-content-between
     .card-title System Configuration
     = card_nav_items(SystemConfiguration) do |nav|
       =nav.edit_link(edit_system_configurations_path)
-      - if SystemConfiguration.switchboard_configured?
+      - if sys_config.switchboard_configured?
         =nav.synchronize_link(sync_system_configurations_path)
 
   .card-body

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

@@ -22,6 +22,12 @@ module CoreController
     session.delete(:referrer)
   end
 
+  #
+  # Load the current system configuration
+  #
+  def system_config
+    @system_config = SystemConfiguration.configuration
+  end
   private
 
   def index_path

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

@@ -10,12 +10,12 @@ module CoreSystemConfigurationsController
   # Edit the system configuration
   #
   def edit
-    system_configuration
+    system_config
   end
 
   # @abstract Cause the system configuration to be synced with the switchboard server
   def sync
-    raise 'System Configuration not configured to sync' unless SystemConfiguration.switchboard_configured?
+    raise 'System Configuration not configured to sync' unless system_config.switchboard_configured?
 
     Cron::SwitchboardSyncConfiguration.perform_later
     flash[:info] = 'System Configuration Refreshing in the Background'
@@ -29,8 +29,8 @@ module CoreSystemConfigurationsController
   # Update and log the system configuration changes
   #
   def update
-    system_configuration.update! system_configuration_params
-    if SystemConfiguration.switchboard_configured?
+    system_config.update! system_configuration_params
+    if system_config.switchboard_configured?
       flash[:info] = 'System Configuration Updated, sync job running in the background'
       Cron::SwitchboardSyncConfiguration.perform_later
     else
@@ -39,7 +39,7 @@ module CoreSystemConfigurationsController
     redirect_to index_path
   rescue StandardError => error
     log_controller_error error
-    system_configuration
+    system_config
     render :edit
   end
 
@@ -51,11 +51,4 @@ module CoreSystemConfigurationsController
   def system_configuration_params
     params[:system_configuration].permit(%i[switchboard_base_url switchboard_stack_id switchboard_stack_api_token])
   end
-
-  #
-  # Load the current system configuration
-  #
-  def system_configuration
-    @system_configuration = SystemConfiguration.configuration
-  end
 end

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

@@ -29,7 +29,7 @@ module RestfulController
   # Create a hash of the string contents
   #
   def hash(str)
-    if SystemConfiguration.fips_mode?
+    if system_config.fips_mode?
       Digest::SHA2.hexdigest(str)
     else
       Digest::MD5.hexdigest(str)

data/lib/app/jobs/application_job.rb

@@ -81,6 +81,10 @@ class ApplicationJob < ActiveJob::Base
     report_duration(days, hours, minutes, seconds)
   end
 
+  def sys_config
+    @sys_config ||= SystemConfiguration.configuration
+  end
+
   private
 
   #

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

@@ -36,7 +36,7 @@ module Cron
                   event: event,
                   error_message: error.message,
                   stack_trace: error.backtrace }
-      SlackNotification.say message, to: SystemConfiguration.slack_support_channel, template: :job_failure
+      SlackNotification.say message, to: system_config.slack_support_channel, template: :job_failure
     end
   end
 end

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

@@ -13,7 +13,7 @@ module Cron
     #
     def self.valid_environment?
       Delayed::Worker.plugins.include?(Delayed::Plugins::TimeKeeper) &&
-        SystemConfiguration.delayed_job_restart_orphaned? &&
+        system_config.delayed_job_restart_orphaned? &&
         Delayed::Backend::Mongoid::Job.count.positive?
     rescue StandardError
       false

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

@@ -22,15 +22,14 @@ module Cron
     #
     def execute
       RestClient.get(switchboard_url,
-                     ACCESS_TOKEN: SystemConfiguration.switchboard_stack_api_token,
+                     ACCESS_TOKEN: sys_config.switchboard_stack_api_token,
                      content_type: 'application/json') do |response, _request, _result, &block|
         case response.code
         when 200
           json = JSON.parse(response.body)
-          config = SystemConfiguration.configuration
-          json['results'].each { |key, value| update_config(config, key, value) }
-          config.switchboard_last_sync_at = Time.now.utc
-          config.save!
+          json['results'].each { |key, value| update_config(sys_config, key, value) }
+          sys_config.switchboard_last_sync_at = Time.now.utc
+          sys_config.save!
         else
           App47Logger.log_error "Unable to fetch switchboard config, #{response.inspect}"
           response.return!(&block)
@@ -59,9 +58,9 @@ module Cron
     # Generate the switchboard URL
     #
     def switchboard_url
-      [SystemConfiguration.switchboard_base_url,
+      [sys_config.switchboard_base_url,
        'stacks',
-       SystemConfiguration.switchboard_stack_id,
+       sys_config.switchboard_stack_id,
        'items.json'].join('/')
     end
   end

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

@@ -48,7 +48,7 @@ module Cron
     # Try to get a TTL from System configuration, otherwise return the default
     #
     def allowed_time_for_item(item)
-      SystemConfiguration.send("#{item.class.to_s.underscore}_ttl").days.ago
+      sys_config.send("#{item.class.to_s.underscore}_ttl").days.ago
     rescue StandardError
       allowed_time
     end

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

@@ -28,7 +28,7 @@ module CdnUrl
               send method.to_s.sub(/^cdn_/, '').to_sym, *args
             end
 
-      cdn_url = SystemConfiguration.cdn_url
+      cdn_url = sys_config.cdn_url
       if [cdn_url.present?, url.present?].all?
         model_name = "#{self.class.to_s.underscore}s"
         if url.include? "/#{model_name}/"

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

@@ -56,10 +56,10 @@ module EmailAble
   # Reset the bounced email
   #
   def reset_bounce_status(current_member = nil)
-    return unless SystemConfiguration.mail_gun_configured? && email_bounced?
+    return unless sys_config.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)
+    reset_url = "https://api.mailgun.net/v3/#{sys_config.smtp_domain}/bounces/#{CGI.escape(email)}"
+    RestClient.delete(reset_url, user: 'api', password: sys_config.mailgun_api_key)
   rescue RestClient::Exception => error
     log_error "Unable to reset email bounce status: #{inspect}", error
   ensure
@@ -75,7 +75,7 @@ module EmailAble
   #
   def gravatar_url(size = '32', default = 'mm')
     self.email ||= 'noone@abc.com'
-    if SystemConfiguration.fips_mode?
+    if sys_config.fips_mode?
       "https://www.gravatar.com/avatar/#{Digest::SHA2.hexdigest(email)}?s=#{size}&d=#{default}"
     else
       "https://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email)}?s=#{size}&d=#{default}"

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

@@ -365,4 +365,8 @@ module StandardModel
     true
   end
   alias update_able? edit_able?
+
+  def sys_config
+    @sys_config ||= SystemConfiguration.configuration
+  end
 end

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

@@ -52,7 +52,7 @@ module SwitchboardAble
   # Delete the object from switchboard
   #
   def switchboard_delete
-    return unless SystemConfiguration.switchboard_configured? && switchboard_id.present?
+    return unless sys_config.switchboard_configured? && switchboard_id.present?
 
     RestClient.delete(switchboard_url, ACCESS_TOKEN: sw_api_token) do |response, _request, _result|
       case response.code
@@ -68,7 +68,7 @@ module SwitchboardAble
   # Update the object in switchboard
   #
   def switchboard_update
-    return unless SystemConfiguration.switchboard_configured? && switchboard_id.present?
+    return unless sys_config.switchboard_configured? && switchboard_id.present?
 
     RestClient.put(switchboard_url,
                    switchboard_payload.to_json,
@@ -90,7 +90,7 @@ module SwitchboardAble
   # Insert the object into switchboard
   #
   def switchboard_insert
-    return unless SystemConfiguration.switchboard_configured?
+    return unless sys_config.switchboard_configured?
 
     RestClient.post(switchboard_url,
                     switchboard_payload.to_json,
@@ -111,9 +111,9 @@ module SwitchboardAble
   # The URL for this switchboard item
   #
   def switchboard_url
-    components = [SystemConfiguration.switchboard_base_url,
+    components = [sys_config.switchboard_base_url,
                   'stacks',
-                  SystemConfiguration.switchboard_stack_id,
+                  sys_config.switchboard_stack_id,
                   switchboard_name]
     components << switchboard_id if switchboard_id.present?
     components.join('/') + '.json'
@@ -123,6 +123,6 @@ module SwitchboardAble
   # Return the api token
   #
   def sw_api_token
-    @sw_api_token ||= SystemConfiguration.switchboard_stack_api_token
+    @sw_api_token ||= sys_config.switchboard_stack_api_token
   end
 end

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

@@ -33,7 +33,7 @@ module TimeZoneAble
   def local_date(date, format = :medium, default = 'N/A')
     case date
     when Time
-      tz = TZInfo::Timezone.get(time_zone.presence || SystemConfiguration.default_time_zone)
+      tz = TZInfo::Timezone.get(time_zone.presence || sys_config.default_time_zone)
       date.present? ? I18n.l(date.in_time_zone(tz).to_date, format: format) : default
     when Date
       I18n.l(date, format: format)
@@ -48,7 +48,7 @@ module TimeZoneAble
   # Return the given time in the localized time for this object
   #
   def local_time(time, format = :medium, default = 'N/A')
-    tz = TZInfo::Timezone.get(time_zone.presence || SystemConfiguration.default_time_zone)
+    tz = TZInfo::Timezone.get(time_zone.presence || sys_config.default_time_zone)
     time.present? ? I18n.l(time.in_time_zone(tz), format: format) : default
   rescue StandardError
     default
@@ -65,6 +65,6 @@ module TimeZoneAble
   end
 
   def default_time_zone
-    self.time_zone ||= SystemConfiguration.default_time_zone
+    self.time_zone ||= sys_config.default_time_zone
   end
 end

data/lib/app/models/delayed/jobs/metric.rb

@@ -47,14 +47,14 @@ module Delayed
       # Pull the method from system configuration to evalutate max allowed time
       #
       def max_allowed_method
-        @max_allowed_method ||= SystemConfiguration.delayed_job_max_allowed_method
+        @max_allowed_method ||= sys_config.delayed_job_max_allowed_method
       end
 
       #
       # Pull the factor for max allowed when evaluating allowed time
       #
       def max_allowed_factor
-        @max_allowed_factor ||= SystemConfiguration.delayed_job_max_allowed_factor
+        @max_allowed_factor ||= sys_config.delayed_job_max_allowed_factor
       end
     end
   end

data/lib/app/models/email_notification.rb

@@ -111,7 +111,7 @@ class EmailNotification < Notification
       mail.delivery_method :smtp, smtp_configuration
     end
 
-    mail.header['X-Mailgun-Native-Send'] = 'yes' if SystemConfiguration.mail_gun_configured?
+    mail.header['X-Mailgun-Native-Send'] = 'yes' if sys_config.mail_gun_configured?
     # Deliver it
     mail.deliver
   rescue StandardError => error
@@ -140,7 +140,7 @@ class EmailNotification < Notification
   # sender address
   #
   def sender_address
-    address = SystemConfiguration.support_email
+    address = sys_config.support_email
     if account.present?
       account_smtp = account.fetch_smtp_configuration
       address = account_smtp.username if account_smtp.use?
@@ -154,7 +154,7 @@ class EmailNotification < Notification
   def from_address
     return from if from.present?
 
-    address = SystemConfiguration.default_email
+    address = sys_config.default_email
     if account.present?
       account_smtp = account.fetch_smtp_configuration
       address = account_smtp.email_address if account_smtp.use?
@@ -214,7 +214,7 @@ class EmailNotification < Notification
   end
 
   def add_notification_tracker(html_message)
-    tracker_url = "#{SystemConfiguration.base_url}/notifications/#{id}/img"
+    tracker_url = "#{sys_config.base_url}/notifications/#{id}/img"
     return html_message if html_message.include?(tracker_url)
 
     image_tag = "<img style='height:0;width:0;border:none;display:none;' src='#{tracker_url}' alt=''/></body>"
@@ -222,7 +222,7 @@ class EmailNotification < Notification
   end
 
   def subject_from_haml_text(haml_text, locals)
-    locals[:base_url] = SystemConfiguration.base_url
+    locals[:base_url] = sys_config.base_url
     haml_engine = Haml::Engine.new(haml_text)
     self.subject = haml_engine.render(Object.new, stringify_all(locals))
   end

data/lib/app/models/notification.rb

@@ -151,7 +151,7 @@ class Notification
   handle_asynchronously :deliver_message, priority: 100
 
   def from_template(template_name, locals = {})
-    locals[:base_url] = SystemConfiguration.base_url
+    locals[:base_url] = sys_config.base_url
     self.message = message_from_template(template_name, locals)
   end
 
@@ -194,7 +194,7 @@ class Notification
   end
 
   def message_from_haml_text(haml_text, locals)
-    locals[:base_url] = SystemConfiguration.base_url
+    locals[:base_url] = sys_config.base_url
 
     template = Haml::Template.new { haml_text }
     self.message = template.render(Object.new, locals)
@@ -212,7 +212,7 @@ class Notification
   # Render the given liquid text
   #
   def render_liquid_text(liquid_text, locals = {})
-    locals[:base_url] = SystemConfiguration.base_url
+    locals[:base_url] = sys_config.base_url
     Liquid::Template.parse(liquid_text).render(stringify_all(locals))
   end
 
@@ -263,19 +263,19 @@ class Notification
   def notify_failure(error)
     if account.nil? || !account.fetch_smtp_configuration.use?
       error_email = EmailNotification.new
-      params = { company_name: SystemConfiguration.company_name,
+      params = { company_name: sys_config.company_name,
                  error_message: error.message,
-                 notification_url: "#{SystemConfiguration.base_url}/stack/notifications/#{id}" }
+                 notification_url: "#{sys_config.base_url}/stack/notifications/#{id}" }
       error_email.from_template(AccountEmailTemplate::EMAIL_NOTIFICATION_FAILED, params)
-      error_email.to = SystemConfiguration.support_email
+      error_email.to = sys_config.support_email
       error_email.save!
       error_email.deliver
     else
       account.smtp_admins.each do |admin|
         error_email = EmailNotification.new
-        params = { company_name: SystemConfiguration.company_name,
+        params = { company_name: sys_config.company_name,
                    error_message: error.message,
-                   notification_url: "#{SystemConfiguration.base_url}/notifications/#{id}" }
+                   notification_url: "#{sys_config.base_url}/notifications/#{id}" }
         error_email.from_template(AccountEmailTemplate::EMAIL_NOTIFICATION_FAILED, params)
         error_email.to = admin.email
         error_email.save!

data/lib/app/models/slack_notification.rb

@@ -32,14 +32,14 @@ class SlackNotification < Notification
   field :from, type: String
 
   def deliver_message
-    if SystemConfiguration.slack_configured?
+    if sys_config.slack_configured?
       start_processing
       payload = { text: message }
-      payload[:channel] = to.presence || SystemConfiguration.slack_support_channel
+      payload[:channel] = to.presence || sys_config.slack_support_channel
       # Use the environment as the default, otherwise set it as the from
       payload[:username] = from.presence || Rails.env
       # Setup the delivery method for this message only.
-      RestClient.post(SystemConfiguration.slack_api_url, payload.to_json)
+      RestClient.post(sys_config.slack_api_url, payload.to_json)
       finish_processing
     else
       finish_processing 'Slack is not configured'

data/lib/app/models/sms_notification.rb

@@ -29,20 +29,19 @@ class SmsNotification < Notification
   validates :to, presence: true, format: { with: /\A\+[1-9]{1}[0-9]{3,14}\z/ }
 
   def deliver_message!
-    return unless SystemConfiguration.twilio_configured?
+    return unless sys_config.twilio_configured?
 
-    config = SystemConfiguration.configuration
-    account_sid = config.twilio_account_id
-    auth_token = config.twilio_auth_token
+    account_sid = sys_config.twilio_account_id
+    auth_token = sys_config.twilio_auth_token
     client = Twilio::REST::Client.new account_sid, auth_token
     twilio_message = if client.respond_to?(:account)
                        client.account.messages.create(body: message,
                                                       to: to,
-                                                      from: config.twilio_phone_number)
+                                                      from: sys_config.twilio_phone_number)
                      else
                        client.messages.create(body: message,
                                               to: to,
-                                              from: config.twilio_phone_number)
+                                              from: sys_config.twilio_phone_number)
                      end
     # We are saved in the calling class, no reason to save again
     set sid: twilio_message.sid

data/lib/web47core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.2.3.30
+  version: 3.2.3.32
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-18 00:00:00.000000000 Z
+date: 2026-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel