web47core 1.0.17 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f29428cb56a63bc4f4f292c98cf1590a2f8db0b4b064c2bc3197c05995ab7738
-  data.tar.gz: 9ae18c5548f3688c4fc9bc5fba07c7e59a27df7196c3140a40a140ea1f5657fd
+  metadata.gz: 545d59c80e6d9e2feb0a379b49f765a0b6a5911d901f2eee369785b3a941916b
+  data.tar.gz: 2f98551b73af32e6779aec38942421dd4ffd8279ef3da5f2bb4edf699e90349f
 SHA512:
-  metadata.gz: ccda0a34ac1b2570827137ea2fe6bc5247f11754a3596139d75110ab3842cc8361915654bf0ff4a95b7c306d9986c690a4ca9c5e6c2d24cef023c73369745ad2
-  data.tar.gz: 7868d55800b8c3bcaabbb52703aa0fb273f3cbf83c06faf78c3cabbfbfedcd408a397f10fc47e64095a5d93c2c89359833acaf9a2388014047f64f21c4e0f9d6
+  metadata.gz: b4b06e1c1637fc8345b2706f4587ab45f093eb0b5afb3f61ca20ef7d7b38a9f9314e130bd631017a2280e672a26fd6b0d737b3911a2d6f908462a1679f4cdc99
+  data.tar.gz: 142d15c993e81f30a77b2d148497fb194f726fde3d990a7e544d1f867a975e821423c6c1985f67e2ea414ad40473b302f0ced0581cd8d68bd2380b4b19e43ec1

data/app/helpers/core_form_helper.rb

@@ -160,7 +160,7 @@ module CoreFormHelper
                             value: option_value[:value],
                             selected: value.eql?(option_value[:key]) }
                         else
-                          { key: option_value[:_id],
+                          { key: option_value[:_id].to_s,
                             value: option_value[:display_name] || option_value[:name],
                             selected: value.eql?(option_value) }
                         end

data/app/helpers/core_link_helper.rb

@@ -65,6 +65,8 @@ module CoreLinkHelper
   # Add a material icon by name
   #
   def materialize_icon(name, options = {})
+    return if name.blank?
+
     classes = %w[material-icons]
     classes += options[:classes] if options[:classes].present?
     content_tag(:i, class: classes.join(' '), title: options[:title]) { name }
@@ -74,8 +76,11 @@ module CoreLinkHelper
   # Generic link tag
   #
   def link_tag(title, path, options = {})
-    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?
+    data = {}
+    link_classes = tooltip_data(options, data)
+    confirmation_data(options, data)
+    content_tag(:a, href: path, class: link_classes, data: data) do
+      concat(materialize_icon(icon_name(options), options))
       concat(title)
     end
   end
@@ -98,12 +103,10 @@ module CoreLinkHelper
   def edit_link_tag(obj, path, options = {})
     return unless can? :edit, obj
 
-    icon = options[:icon] || 'edit'
-    tooltip = options[:tooltip] || 'Edit'
-    content_tag(:a, href: path, class: 'tooltipped', data: {tooltip: tooltip}) do
-      concat(content_tag(:i, class: 'material-icons') do
-        icon
-      end)
+    data = {}
+    link_classes = tooltip_data(options, data, 'Edit')
+    content_tag(:a, href: path, class: link_classes.join(' '), data: data) do
+      concat(materialize_icon(icon_name(options, 'edit'), options))
       concat(options[:label]) if options[:label].present?
     end
   end
@@ -122,12 +125,11 @@ module CoreLinkHelper
   def replay_link_tag(obj, path, options = {})
     return unless can? :edit, obj
 
-    icon_name = options[:icon_name] || 'replay'
-    data = { confirm: options[:confirm] || t('links.replay_confirmation', name: obj.class.to_s.underscore.humanize) }
-    content_tag(:a, href: path, data: data, class: options[:link_classes]) do
-      concat(content_tag(:i, class: 'material-icons') do
-        icon_name
-      end)
+    data = {}
+    confirmation_data(options, data, t('links.replay_confirmation', name: obj.class.to_s.underscore.humanize))
+    link_classes = tooltip_data(options, data)
+    content_tag(:a, href: path, data: data, class: link_classes.join(' ')) do
+      concat(materialize_icon(icon_name(options), options))
       concat(options[:label]) if options[:label].present?
     end
   end
@@ -160,11 +162,10 @@ module CoreLinkHelper
   def info_link_tag(obj, path, options = {})
     return unless can? :read, obj
 
-    icon = options[:icon] || 'info'
-    content_tag(:a, href: path) do
-      concat(content_tag(:i, class: 'material-icons') do
-        icon
-      end)
+    data = {}
+    link_classes = tooltip_data(options, data)
+    content_tag(:a, href: path, classes: link_classes, data: data) do
+      concat(materialize_icon(icon_name(options, 'info'), options))
       concat(options[:label]) if options[:label].present?
     end
   end
@@ -188,12 +189,11 @@ module CoreLinkHelper
   def action_link_tag(condition, path, options = {})
     return unless condition
 
-    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)
+    data = {}
+    confirmation_data(options, data)
+    link_classes = tooltip_data(options, data)
+    content_tag(:a, href: path, class: link_classes.join(' '), data: data) do
+      concat(materialize_icon(icon_name(options, 'directions_run'), options))
       concat(options[:label]) if options[:label].present?
     end
   end
@@ -216,12 +216,11 @@ module CoreLinkHelper
   def delete_link_tag(obj, path, options = {})
     return unless can? :destroy, obj
 
-    data = { method: :delete,
-             confirm: options[:confirm] || t('links.deletion_confirmation', name: obj.class.to_s.underscore.humanize) }
-    content_tag(:a, href: path, data: data) do
-      concat(content_tag(:i, class: 'material-icons') do
-        options[:icon_name] || 'delete'
-      end)
+    data = { method: :delete }
+    confirmation_data(data, options, t('links.deletion_confirmation', name: obj.class.to_s.underscore.humanize))
+    link_classes = tooltip_data(options, data)
+    content_tag(:a, href: path, class: link_classes, data: data) do
+      concat(materialize_icon(icon_name(options, 'delete'), options))
       concat(options[:label]) if options[:label].present?
     end
   end
@@ -244,11 +243,11 @@ module CoreLinkHelper
   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)
+    data = {}
+    confirmation_data(options, data, t('links.action_confirmation', name: obj.class.to_s.underscore.humanize))
+    link_classes = tooltip_data(options, data)
+    content_tag(:a, href: path, class: link_classes, data: { confirm: data }) do
+      concat(materialize_icon(icon_name(options, 'add'), options))
       concat(options[:label]) if options[:label].present?
     end
   end
@@ -401,4 +400,26 @@ module CoreLinkHelper
       concat(content_tag(:i, class: 'material-icons right') { button_icon })
     end
   end
+
+  #
+  # See if there is any confirmation and add it to the data element
+  #
+  def confirmation_data(options, data, default = nil)
+    confirm = options[:confirm] || options[:confirmation] || default
+    data[:confirm] = confirm if confirm.present?
+  end
+
+  def tooltip_data(options, data, default = nil)
+    link_classes = options[:link_classes] || []
+    tooltip = options[:tooltip] || default
+    if tooltip.present?
+      link_classes << 'tooltipped'
+      data[:tooltip] = tooltip
+    end
+    link_classes
+  end
+
+  def icon_name(options, default = nil)
+    options[:icon] || options[:icon_name] || default
+  end
 end

data/app/views/common/_flash.html.haml

@@ -1,5 +1,6 @@
 .flash
   - flash.each do |key, value|
+    - next if 'timedout'.eql?(key)
     .message
       %i.material-icons
         = flash_map_name(key)

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

@@ -10,7 +10,7 @@ module CoreDelayedJobsController
   #
   def index
     authorize! :read, Delayed::Backend::Mongoid::Job
-    @delayed_jobs = Delayed::Backend::Mongoid::Job.asc(%i[locked_by priority run_at]).limit(100)
+    delayed_jobs
   end
 
   def show
@@ -23,7 +23,7 @@ module CoreDelayedJobsController
   def destroy_all
     authorize! :manage, Delayed::Backend::Mongoid::Job
     failed_only = params[:failed_only].eql?('true')
-    Delayed::Backend::Mongoid::Job.each do |job|
+    delayed_jobs.each do |job|
       next if failed_only && !job.failed?
 
       job.destroy
@@ -41,7 +41,7 @@ module CoreDelayedJobsController
   def resubmit_all
     authorize! :read, Delayed::Backend::Mongoid::Job
     failed_only = params[:failed_only].eql?('true')
-    Delayed::Backend::Mongoid::Job.each do |job|
+    delayed_jobs.each do |job|
       next if failed_only && !job.failed?
 
       job.resubmit
@@ -79,9 +79,28 @@ module CoreDelayedJobsController
     redirect_to index_path
   end
 
-  private
-
+  #
+  # Fetch the required job by id
+  #
   def delayed_job
     @delayed_job ||= Delayed::Backend::Mongoid::Job.find(params[:id])
   end
+
+  #
+  # Find the first jobs for index or deleting all
+  #
+  def delayed_jobs
+    @delayed_jobs ||= Delayed::Backend::Mongoid::Job
+                        .order_by(locked_by: :desc, priority: :asc, run_at: :asc)
+                        .limit(delayed_jobs_limit)
+  end
+
+  #
+  # Define the limit of jobs to fetch for the index of delete all/resubmit all
+  #
+  # Override this in your project if you want a different limit
+  #
+  def delayed_jobs_limit
+    100
+  end
 end

data/lib/app/models/template.rb

@@ -40,7 +40,7 @@ class Template
     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))
+      File.open(File.join(__dir__, '../../../lib/templates', delivery_channel, file_name))
     end.read
   rescue StandardError
     nil

data/lib/templates/slack/error_message.liquid

@@ -1,3 +1,3 @@
 *ERROR:* `{{message}}`{% if exception != blank %} -
-```ruby {{exception}}```
+```{{exception}}```
 {% endif %}

data/lib/web47core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.1.3
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -42,16 +42,16 @@ dependencies:
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement