web47core 1.0.16 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9553f8bc7619223426f6de884ec71e6965eb2ca281f374bfb27ee0029912bc7b
-  data.tar.gz: 156d2fd7cee65365a662680779e763d38dfc0f7dcc6eaa82b08709bbf5873eee
+  metadata.gz: 5083f4affc41013e5f87fd7255022bc3db758316a6e0d0b653fdd2ee31095f07
+  data.tar.gz: 36dee71787549e3ac8d4f15c3a732b2946823de6e36f5bdbd5b6cf15fb9cbe35
 SHA512:
-  metadata.gz: 22158a5f95e48cc2c0b511c6b3cb8938f05f1d2f44039b4f23a3cbe72e17ebd6c6f12740d900412da2032ff8c32695d4132b5a41e3131621d9510b4e46b00ffb
-  data.tar.gz: 41f2923d8afb2abd12fe91385b45dcd250a2f6cbb757ffd8bc0594b6a12eab5de5e626ec33b0e4fb75fadd36251e76fa5792c97761b74407dd7ce81e4836ba83
+  metadata.gz: 55e9fbe3b7c3d43ae23139437c9ee8b7cedd1ed8bc6c15ab51744b78f64e33d493388eddd0a48a711a7cff3e461e0e1e02913c267b1a76c939ab53b1599e168e
+  data.tar.gz: e1a202c78f7320600a389cec264a4439de66ccc174db973804a6bfcf9ec291a11978c18269629a811868859b71898f0c15915c4a5434bfd10f105537591a4b8b

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

data/lib/web47core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.1.2
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2021-02-07 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