web47core 0.8.1 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85a1b6e625ef9c79d09fca54ade10cc6b7198582ef753e0ca0cb153af3d01d48
-  data.tar.gz: f5e8926a67eb5667222cdb6eb420a532b8f589ac697c4d9ed89f8b2f9e955f2e
+  metadata.gz: 331b65fbd9561ea834ab58be8f8a541ed8a25879649d7fda6f52a4f2fa7213b1
+  data.tar.gz: cffa42c73158759ef60ed79a1f93f8dab010ed670b56c4c687c2a218cfd903d5
 SHA512:
-  metadata.gz: c6426b56a727ac5ba567a99e586737f98e02d1959da73736869ad872c1e9059dab0826691ff71546e3e35830d7307404981ffb0fdb96900854d1bbd6f2e167ea
-  data.tar.gz: ab293fdf38d406356d332eba27ea0be7a61d2b3e6799589caf8477dea227bad039a12d94bc121ff08a5a50c800552e815242bed9b6b944881ee70520214fa6b0
+  metadata.gz: 1a45eed2e90bc93d1330df86e0d5e0ecbb83fe1868f697ec5b55835fbe72fa373498167e0784068d4f415d2d3e8465022cfe5372d7989d563146fa43181083c2
+  data.tar.gz: 3b8b1d55228cbe1344db41315addca98a47b0cf32e15fe9cb34b6efd3ecd3cb4bf8d6344fb04de677cc2286e771bfee305fc511499bded3713d15734c100af0f

data/app/controllers/status_controller.rb

@@ -17,8 +17,8 @@ class StatusController < ActionController::Base
 
     respond_to do |format|
       format.html { render :index, locals: { components: ui_decorators(components) }, layout: false }
-      format.json { render json: components.to_json }
-      format.text { render plain: components.flatten, status: text_status(components) }
+      format.json { render json: components.to_json, status: db_status(components)  }
+      format.text { render plain: components.flatten, status: db_status(components) }
     end
   end
 
@@ -27,7 +27,7 @@ class StatusController < ActionController::Base
   #
   # Return the status of the key components, mongo, redis
   #
-  def text_status(components)
+  def db_status(components)
     components[:mongo][:success] && components[:redis][:success] ? 200 : 500
   rescue StandardError
     500

data/app/helpers/core_form_helper.rb

@@ -10,6 +10,30 @@ module CoreFormHelper
     form.render_form(&block)
   end
 
+  #
+  # Text area
+  #
+  def form_text_area(model, field, options = {})
+    classes = options[:classes] || %w[s12]
+    value = model.send(field)
+    # options[:value] = value
+    # options[:disabled] ||= false
+    # 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(form_label_tag(model, field, value, options))
+    end
+  end
+
+  def text_area(model, field, value, options = {})
+    tag_options = text_field_options(model, field, options)
+    tag_options[:class] += ['materialize-textarea']
+    content_tag(:textarea, tag_options) do
+      concat(value)
+    end
+  end
+
   #
   # Text field
   #
@@ -18,6 +42,7 @@ module CoreFormHelper
     value = model.send(field)
     options[:type] = :text
     options[:value] = value
+    options[:disabled] ||= false
     tag_options = text_field_options(model, field, options)
     content_tag(:div, class: (%w[input-field col] + classes).join(' ')) do
       concat(tag(:input, tag_options))
@@ -30,6 +55,7 @@ module CoreFormHelper
     value = model.send(field)
     options[:value] = value.strftime('%d %B, %Y') if value.present?
     options[:type] = :text
+    options[:disabled] ||= false
     tag_options = text_field_options(model, field, options)
     tag_options[:class] = options[:date_picker_type] || 'simple-date-picker'
     content_tag(:div, class: (%w[input-field col] + classes).join(' ')) do
@@ -38,6 +64,23 @@ module CoreFormHelper
     end
   end
 
+  #
+  # Time picker field
+  #
+  def form_time_field(model, field, options = {})
+    classes = options[:classes] || %w[s12 m6 l4 xl3]
+    value = model.send(field)
+    options[:value] = value
+    options[:type] = :text
+    options[:disabled] ||= false
+    tag_options = text_field_options(model, field, options)
+    tag_options[:class] = options[:time_picker_type] || 'time-picker'
+    content_tag(:div, class: (%w[input-field col] + classes).join(' ')) do
+      concat(tag(:input, tag_options))
+      concat(form_label_tag(model, field, value, options))
+    end
+  end
+
   #
   # Password field
   #
@@ -80,7 +123,13 @@ module CoreFormHelper
   #
   def form_select_tag(model, field, options = {})
     form_name = form_field_name(model, field, options)
-    content_tag(:select, id: form_name, name: form_name, class: options[:input_classes]) do
+    select_content = {
+      id: form_name,
+      name: form_name,
+      class: options[:input_classes],
+      disabled: options[:disabled]
+    }
+    content_tag(:select, select_content) do
       form_select_option_key_values(model.send(field), options).each do |value|
         concat(content_tag(:option, value: value[:key], selected: value[:selected]) do
           concat(value[:value])
@@ -96,15 +145,16 @@ module CoreFormHelper
     select_options << { key: '', value: options[:prompt], selected: false } if options[:prompt].present?
     options[:options].each do |option_value|
       option_value[:display_name] = option_value.display_name if option_value.respond_to?(:display_name)
+      option_value[:display_name] = option_value.user_display_name if option_value.respond_to?(:user_display_name)
       select_options << case option_value
                         when String, Integer
                           { key: option_value,
                             value: option_value,
                             selected: value.eql?(option_value) }
                         when Array
-                          { key: option_value.first,
-                            value: option_value.last,
-                            selected: value.to_s.eql?(option_value.first.to_s) }
+                          { key: option_value.last,
+                            value: option_value.first,
+                            selected: value.to_s.eql?(option_value.last.to_s) }
                         when Hash
                           { key: option_value[:key],
                             value: option_value[:value],
@@ -164,6 +214,20 @@ module CoreFormHelper
     end
   end
 
+  #
+  # File field
+  #
+  def form_file(model, field, file_types = '.xlsx', classes = %w[s12 m6 l4 xl3])
+    form_name = form_field_name(model, field)
+    form_id = "#{model.class.to_s.underscore}_#{field}"
+    value = model.send(field)
+    file_tag = tag(:input, id: form_id, name: form_name, type: :file, accept: file_types)
+    content_tag(:div, class: (%w[input-field col] + classes).join(' ')) do
+      concat(file_tag)
+      concat(form_label_tag(model, field, value))
+    end
+  end
+
   #
   # get the label for field
   #

data/app/helpers/core_link_helper.rb

@@ -5,12 +5,22 @@
 #
 module CoreLinkHelper
   #
-  # Create a copy tag for data to be copied to the clipboard
+  # Generate a download link with the download icon
+  #
+  def download_tag(url, options = {})
+    content_tag(:a, href: url) do
+      concat(materialize_icon(options[:download_icon_name] || 'cloud_download'))
+    end
+  end
+
+  #
+  # Setup the text as copy text
   #
   def copy_tag(copy_text, options = {})
     content_tag(:p, class: 'stack-tight') do
-      concat(copy_text)
+      concat(content_tag(:span) { copy_text })
       concat(copy_text_tag(copy_text, options))
+      concat(download_tag(options[:download_url], options)) if options[:download_url].present?
     end
   end
 
@@ -34,11 +44,21 @@ module CoreLinkHelper
               constrainWidth: false,
               gutter: 28,
               alignment: 'right' }
-    content_tag(:a, class: 'dropdown-button', data: datum) do
+    content_tag(:a, class: 'dropdown-trigger', data: datum) do
       concat(materialize_icon(icon_name))
     end
   end
 
+  #
+  # Add a favorite tag
+  #
+  def favorite_tag(favorite)
+    content_tag(:i,
+                class: 'material-icons pointer favorite',
+                id: favorite.id.to_s,
+                type: favorite.favorite_type) { concat('favorite_border') }
+  end
+
   #
   # Add a material icon by name
   #
@@ -52,7 +72,7 @@ module CoreLinkHelper
   # Generic link tag
   #
   def link_tag(title, path, options = {})
-    content_tag(:a, href: path) do
+    content_tag(:a, href: path, class: options[:class]) do
       concat(content_tag(:i, class: 'material-icons left') { options[:icon_name] }) if options[:icon_name].present?
       concat(title)
     end
@@ -71,14 +91,15 @@ module CoreLinkHelper
   end
 
   #
-  # Edit an thingy
+  # Edit a thingy
   #
   def edit_link_tag(obj, path, options = {})
     return unless can? :edit, obj
 
+    icon = options[:icon] || 'edit'
     content_tag(:a, href: path) do
       concat(content_tag(:i, class: 'material-icons') do
-        'edit'
+        icon
       end)
       concat(options[:label]) if options[:label].present?
     end
@@ -136,9 +157,10 @@ module CoreLinkHelper
   def info_link_tag(obj, path, options = {})
     return unless can? :read, obj
 
-    content_tag(:a, href: path, class: options[:link_classes]) do
+    icon = options[:icon] || 'info'
+    content_tag(:a, href: path) do
       concat(content_tag(:i, class: 'material-icons') do
-        'info'
+        icon
       end)
       concat(options[:label]) if options[:label].present?
     end
@@ -149,6 +171,7 @@ module CoreLinkHelper
   #
   def action_list_tag(condition, path, options = {})
     return unless condition
+
     raise('Label Required') if options[:label].blank?
 
     content_tag(:li) do
@@ -162,7 +185,9 @@ module CoreLinkHelper
   def action_link_tag(condition, path, options = {})
     return unless condition
 
-    content_tag(:a, href: path, class: options[:link_classes]) do
+    confirmation = options[:confirmation] || t('links.action_confirmation')
+    confirmation_required = options[:confirmation].present? ? { confirm: confirmation } : {}
+    content_tag(:a, href: path, class: options[:classes], data: confirmation_required) do
       concat(content_tag(:i, class: 'material-icons') do
         options[:icon_name] || 'info'
       end)
@@ -174,7 +199,7 @@ module CoreLinkHelper
   # Delete a thingy in a pull down list
   #
   def delete_list_tag(obj, path, options = {})
-    return unless can? :delete, obj
+    return unless can? :destroy, obj
 
     options[:label] ||= I18n.t('ui_form.actions.delete')
     content_tag(:li) do
@@ -186,7 +211,7 @@ module CoreLinkHelper
   # Delete an thingy
   #
   def delete_link_tag(obj, path, options = {})
-    return unless can? :delete, obj
+    return unless can? :destroy, obj
 
     data = { method: :delete,
              confirm: options[:confirm] || t('links.deletion_confirmation', name: obj.class.to_s.underscore.humanize) }
@@ -198,6 +223,111 @@ module CoreLinkHelper
     end
   end
 
+  #
+  # Create a thingy in a pull-down list
+  #
+  def create_list_tag(obj, path, options = {})
+    return unless can? :create, obj
+
+    options[:label] ||= I18n.t('ui_form.actions.create')
+    content_tag(:li) do
+      create_link_tag(obj, path, options)
+    end
+  end
+
+  #
+  # Create a thingy
+  #
+  def create_link_tag(obj, path, options = {})
+    return unless can? :create, obj
+
+    confirmation = options[:confirmation] || t('links.action_confirmation', name: obj.class.to_s.underscore.humanize)
+    content_tag(:a, href: path, data: { confirm: confirmation }) do
+      concat(content_tag(:i, class: 'material-icons') do
+        options[:icon_name] || 'add'
+      end)
+      concat(options[:label]) if options[:label].present?
+    end
+  end
+
+  #
+  # Send notification in a pull down list
+  #
+  def notification_list_tag(obj, path, options = {})
+    return unless can? :manage, obj
+
+    options[:label] ||= I18n.t('customer_account_users.index.reset_password')
+    content_tag(:li) do
+      notification_link_tag(obj, path, options)
+    end
+  end
+
+  #
+  # Send notification
+  #
+  def notification_link_tag(obj, path, options = {})
+    return unless can? :manage, obj
+
+    content_tag(:a, href: path) do
+      concat(content_tag(:i, class: 'material-icons') do
+        options[:icon_name] || 'email'
+      end)
+      concat(options[:label]) if options[:label].present?
+    end
+  end
+
+  #
+  # Promote a publishable kb object in a pull down list
+  #
+  def promote_list_tag(obj, path, options = {})
+    return unless can? :promote, obj
+
+    options[:label] ||= I18n.t('links.promote')
+    content_tag(:li) do
+      promote_link_tag(obj, path, options)
+    end
+  end
+
+  #
+  # Promote a publishable kb object
+  #
+  def promote_link_tag(obj, path, options = {})
+    return unless can? :promote, obj
+
+    content_tag(:a, href: path) do
+      concat(content_tag(:i, class: 'material-icons') do
+        'file_upload'
+      end)
+      concat(options[:label]) if options[:label].present?
+    end
+  end
+
+  #
+  # Demote a publishable kb object in a pull down list
+  #
+  def demote_list_tag(obj, path, options = {})
+    return unless can? :demote, obj
+
+    options[:label] ||= I18n.t('links.demote')
+    content_tag(:li) do
+      demote_link_tag(obj, path, options)
+    end
+  end
+
+  #
+  # Demote a publishable kb object
+  #
+  def demote_link_tag(obj, path, options = {})
+    return unless can? :demote, obj
+
+    content_tag(:a, href: path) do
+      concat(content_tag(:i, class: 'material-icons') do
+        'file_download'
+      end)
+      concat(options[:label]) if options[:label].present?
+    end
+  end
+
   #
   # Edit a page
   #
@@ -214,36 +344,58 @@ module CoreLinkHelper
   #
   # Add a thingy
   #
-  def add_link_tag(klass, path)
-    return unless can?(:manage, klass)
+  def add_link_tag(klass, path, options = {})
+    return unless can?(:create, klass)
 
     content_tag(:div, class: 'fixed-action-btn horizontal') do
-      concat(content_tag(:a, href: path, class: 'btn-floating btn-large right', style: 'padding: 0;margin: 0px 15px') do
-        concat(content_tag(:i, class: 'material-icons') { 'add' })
-      end)
+      concat(add_link_button(path, options))
+    end
+  end
+
+  #
+  # Add the `Add` button
+  #
+  def add_link_button(path, options)
+    options[:title] ||= t('ui_form.actions.add')
+    options[:icon] ||= 'add'
+    content_tag(:a,
+                href: path,
+                class: 'btn-floating btn-large right',
+                style: 'padding: 0;margin: 0px 15px',
+                title: options[:title]) do
+      concat(content_tag(:i, class: 'material-icons') { options[:icon] })
     end
   end
 
   #
   # Form cancel button
   #
-  def form_cancel_button_tag(path)
+  def form_cancel_button_tag(path, name = 'cancel')
     options = { class: 'btn-large waves-effect waves-light secondary', href: path }
     content_tag(:a, options) do
-      concat(t('ui_form.actions.cancel'))
+      concat(t("ui_form.actions.#{name}"))
     end
   end
 
   #
   # Form submit button
   #
-  def form_submit_button_tag(obj)
-    return unless can? :update, obj
+  def form_submit_button_tag(condition = true, options = {})
+    return unless condition
 
-    options = { class: 'btn-large waves-effect waves-light', type: :submit }
-    content_tag(:button, options) do
-      concat(t('ui_form.actions.save'))
-      concat(content_tag(:i, class: 'material-icons right') { 'save' })
+    tag_options = { class: 'btn-large waves-effect waves-light', type: :submit }
+    if options[:action].present?
+      tag_options[:name] = options[:name] || 'button_action'
+      tag_options[:value] = options[:action]
+    end
+    tag_options[:class] += ' disabled' if options[:disabled]
+    tag_options[:class] += ' disabled' if options[:disabled]
+
+    button_text = options[:text] || t('ui_form.actions.save')
+    button_icon = options[:icon] || 'save'
+    content_tag(:button, tag_options) do
+      concat(button_text)
+      concat(content_tag(:i, class: 'material-icons right') { button_icon })
     end
   end
 end

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

@@ -19,8 +19,12 @@ module CoreSystemConfigurationsController
   def update
     # @system_configuration.update_attributes_and_log! @current_admin_user, system_configuration_params
     SystemConfiguration.configuration.update! system_configuration_params
-    flash[:info] = 'System Configuration Updated, sync job running in the background'
-    Cron::SwitchboardSyncConfiguration.perform_later
+    if SystemConfiguration.switchboard_configured?
+      flash[:info] = 'System Configuration Updated, sync job running in the background'
+      Cron::SwitchboardSyncConfiguration.perform_later
+    else
+      flash[:info] = 'System Configuration Updated'
+    end
     redirect_to index_path
   rescue StandardError => error
     log_controller_error error

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

@@ -55,6 +55,7 @@ module Cron
     def daemonize
       dir = @options[:pid_dir]
       FileUtils.mkdir_p(dir) unless File.exist?(dir)
+      GC.enable
 
       Cron::JobTab.ensure_cron_tabs
       Daemons.run_proc('cron_server', dir: @options[:pid_dir], monitor: @options[:monitor], ARGV: @args) do

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

@@ -27,5 +27,16 @@ module Cron
       email.from_template('support_ticket_notification', params)
       email.send_notification
     end
+
+    #
+    # Sends support a notification if something goes awry
+    #
+    def notify_job_failure(error, event)
+      message = { job_name: self.class.to_s.titleize,
+                  event: event,
+                  error_message: error.message,
+                  stack_trace: error.backtrace }
+      SlackNotification.say message, to: SystemConfiguration.slack_support_channel, template: :job_failure
+    end
   end
 end

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

@@ -5,7 +5,7 @@ module Cron
   # Value object for a cron tab entry
   #
   class JobTab < Tab
-    FRAMEWORK_CLASSES = %w[Job TrimCollection Command Server Tab JobTab].freeze unless defined? FRAMEWORK_CLASSES
+    FRAMEWORK_CLASSES = %w[job trim_collection command server tab job_tab].freeze unless defined? FRAMEWORK_CLASSES
     #
     # Validations
     #
@@ -36,7 +36,7 @@ module Cron
       end
 
       def job_names
-        @job_names ||= Cron.constants.collect do |job|
+        @job_names ||= all_jobs.collect do |job|
           job_name = job.to_s
           next if FRAMEWORK_CLASSES.include?(job_name) || job_name.end_with?('Test') || job_name.start_with?('Base')
 
@@ -46,6 +46,14 @@ module Cron
 
       private
 
+      def all_jobs
+        (list_jobs("#{__dir__}/*.rb") + list_jobs(Rails.root.join('app/jobs/cron/*.rb'))).compact.uniq
+      end
+
+      def list_jobs(directory)
+        Dir[directory].collect { |file| file.split('/cron/').last.split('.rb').first }
+      end
+
       def configure_cron_tab(tab, type)
         case type
         when :always

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

@@ -48,6 +48,7 @@ module Cron
       time_to_next_run
     ensure
       check_in
+      GC.start
     end
 
     def run_cron_jobs
@@ -151,7 +152,7 @@ module Cron
     # Perform a check in for the server
     #
     def check_in
-      set last_check_in_at: Time.now.utc
+      set({ last_check_in_at: Time.now.utc })
     end
 
     #

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

@@ -11,6 +11,8 @@ module Cron
     # Constants
     #
     WILDCARD = '*' unless defined? WILDCARD
+    COMMA_DELIM = ',' unless defined? COMMA_DELIM
+    SLASH_DEMO = '/' unless defined? SLASH_DEMO
     TIME_UNITS = %i[min hour wday mday month].freeze unless defined? TIME_UNITS
     #
     # Fields
@@ -45,7 +47,7 @@ module Cron
     # For completion of class, but must be implemented by child class
     #
     def run
-      set last_run_at: Time.now.utc
+      set({ last_run_at: Time.now.utc })
     end
 
     private
@@ -69,11 +71,11 @@ module Cron
               when Integer
                 range.include?(value)
               else
-                if value.include?('/')
-                  (numerator, divisor) = value.split('/')
+                if value.include?(SLASH_DEMO)
+                  (numerator, divisor) = value.split(SLASH_DEMO)
                   range.include?(divisor.to_i) && numerator.eql?(WILDCARD)
-                elsif value.include?(',')
-                  options = value.split(',')
+                elsif value.include?(COMMA_DELIM)
+                  options = value.split(COMMA_DELIM)
                   options.collect { |o| range.include?(o.to_i) }.all?
                 else
                   range.include?(value.to_i)
@@ -96,11 +98,11 @@ module Cron
       when Integer
         time.send(unit).eql?(target)
       else
-        if target.include?('/')
-          divisor = target.split('/').last.to_i
+        if target.include?(SLASH_DEMO)
+          divisor = target.split(SLASH_DEMO).last.to_i
           (time.send(unit) % divisor).zero?
-        elsif target.include?(',')
-          options = target.split(',')
+        elsif target.include?(COMMA_DELIM)
+          options = target.split(COMMA_DELIM)
           options.collect { |o| time.send(unit.eql?(o.to_i)) }.any?
         else
           time.send(unit).eql?(target.to_i)

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

@@ -12,18 +12,6 @@ module Cron
       AuditLog.all
     end
 
-    #
-    # Check which audit logs we wanted deleted
-    #
-    # Should be older than 90 days and either not a user model audit log or the model associated with
-    # the UserModelAuditLog has been deleted
-    #
-    def archive?(item)
-      super && (!item.is_a?(UserModelAuditLog) || item.model.blank?)
-    rescue StandardError
-      super
-    end
-
     #
     # Allowed time the amount of time allowed to exists before deleting
     #

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

@@ -68,6 +68,8 @@ module CoreSystemConfiguration
       field :switchboard_stack_id, type: String
       field :switchboard_stack_api_token, type: String
       field :switchboard_last_sync_at, type: Time
+      # Audit Logs TTL
+      field :user_model_audit_log_ttl, type: Integer, default: 365
       #
       # Validations
       #
@@ -75,6 +77,8 @@ module CoreSystemConfiguration
       validates :slack_support_channel, presence: true
       validates :slack_sales_channel, presence: true
       validates :default_time_zone, presence: true
+      validates :switchboard_base_url, url: true
+      validates :zendesk_base_url, url: true
     end
     base.extend ClassMethods
   end

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

@@ -16,7 +16,7 @@ module SearchAble
       #
       # Call backs
       #
-      before_validation :update_search_and_sort_text
+      before_save :update_search_and_sort_text
     end
   end
 
@@ -31,7 +31,7 @@ module SearchAble
   #
   module ClassMethods
     def matching_search_text(search_text = nil)
-      (search_text.blank? ? all : where(search_text: /#{search_text.downcase}/)).order(sort_order)
+      (search_text.blank? ? all : where(search_text: /#{search_text.downcase}/)).order([:sort_text, 1])
     end
 
     def sort_order

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

@@ -22,8 +22,8 @@ module StandardModel
       #
       # Relationships
       #
-      belongs_to :last_modified_by, polymorphic: true, dependent: :nullify, optional: true
-      belongs_to :created_by, polymorphic: true, dependent: :nullify, optional: true
+      belongs_to :last_modified_by, polymorphic: true, optional: true
+      belongs_to :created_by, polymorphic: true, optional: true
       has_many Web47core::Config.audit_model_log_symbol, dependent: :nullify, inverse_of: :model
       #
       # Callbacks
@@ -51,20 +51,47 @@ module StandardModel
     # Turn the array into a list of options
     #
     def make_options(options)
-      options.collect { |t| [t, t.humanize] }
+      options.collect { |t| [t.humanize, t] }
     end
 
     #
     # Return the complete list of key names that would appear in the form.
     #
-    def allowed_param_names(filter_names = [])
+    def allowed_param_names(filter_names = [], include_relationships = true)
       # Always filter out the mongoid reserved items
-      filter_names += %w[created_at updated_at _type _id]
-      field_names(filter_names)
+      filter_names += %w[created_at updated_at _type _id search_text sort_text]
+      associations = many_to_many_associations
+      # filter out the relationship names so we don't have dups
+      associations.each { |association| filter_names << association.keys.first }
+      names = field_names(filter_names)
+      names += associations if include_relationships
+      names.delete_if { |name| filter_names.include?(name) }
     rescue StandardError
       attribute_names.delete_if { |name| filter_names.include?(name) }
     end
 
+    #
+    # Return a collection of many to many associations. 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
+    end
+
     #
     # allow the model to filter out a name if they want to, meaning the model
     # can return a subset of attribute names
@@ -89,8 +116,12 @@ module StandardModel
     #
     def find_or_create_by_and_log!(user, attributes)
       model = find_or_initialize_by(attributes)
-      log_change(user, model, attributes) if model.new_record? && model.valid?
-      model.save!
+      if model.new_record?
+        model.last_modified_by = user
+        model.created_by = user
+        model.save!
+        log_change(user, model, attributes)
+      end
       model
     end
 
@@ -98,7 +129,7 @@ module StandardModel
     # Record the creation with this user
     #
     def create_and_log(user, attributes)
-      model = create(attributes)
+      model = new(attributes)
       model.last_modified_by = user
       model.created_by = user
       model.save
@@ -110,7 +141,7 @@ module StandardModel
     # Record the creation with this user
     #
     def create_and_log!(user, attributes)
-      model = create!(attributes)
+      model = new(attributes)
       model.last_modified_by = user
       model.created_by = user
       model.save!
@@ -175,7 +206,7 @@ module StandardModel
   #
   # record a change for the object instance
   #
-  def log_change(user, changes, action)
+  def log_change(user, changes, action = nil)
     Web47core::Config.audit_model_log_class.create!(Web47core::Config.audit_model => user,
                                                     model: self,
                                                     action: action,
@@ -190,7 +221,7 @@ module StandardModel
   # Safely get the display name of who last modified this object
   #
   def last_modified_by_display_name
-    last_modified_by.name
+    last_modified_by.display_name
   rescue StandardError
     "#{last_modified_by_name} (#{last_modified_by_email}) - deleted"
   end
@@ -199,7 +230,7 @@ module StandardModel
   # Safely get the display name of who created this object
   #
   def created_by_display_name
-    created_by.name
+    created_by.display_name
   rescue StandardError
     "#{created_by_name} (#{created_by_email}) - deleted"
   end

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

@@ -27,6 +27,16 @@ module TimeZoneAble
     TZInfo::Timezone.all_identifiers
   end
 
+  #
+  # Return the given time in the localized time for this object
+  #
+  def local_date(date, format = :medium, default = 'N/A')
+    tz = TZInfo::Timezone.get(time_zone || 'GMT')
+    date.present? ? I18n.l(date.in_time_zone(tz).to_date, format: format) : default
+  rescue StandardError
+    default
+  end
+
   #
   # Return the given time in the localized time for this object
   #

data/lib/web47core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.6
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -306,6 +306,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: validate_url
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement