web47core 1.0.15 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20fa4ad255499f3d899ca64125951b60e7502d5e129f4989680bf84182e3671c
-  data.tar.gz: c47a90846316d62d4e63bf9f198912806c637f3a586b2b5441c0962ec22ce9b5
+  metadata.gz: 862ce506f9e7921057f3cb89f87c9adc51d66880f0892af68bf5cd431f60776f
+  data.tar.gz: ba0e7a0c12e80eb580eb0e4ba220b718a5b044665003e59a9c5eb33c032b7a9a
 SHA512:
-  metadata.gz: f2e502d727e5b177adf2a4b22d09ab54f0281b4f0fa2106d4f1dbf18064f10e2c99d0644d99e96e6d44468a5a35c5918ae3ec2c164db8a782195d22419c230a8
-  data.tar.gz: 9b9ae4ea919b1f63a87bc144f9db10a65e047fbca2f28517b0eaf3ef2c4ea510d6b595931d65e1e845dd8f32e940fea07227adc75dc7c4bdfccd0c98498765c6
+  metadata.gz: d0ed82a52e27ddbb93dba4a2cb2970a9171aa815043e68c5ec7eb6251c045ccdb8f1c2b4e187a3635cab09784e45b58f718e752800e62b24c27aba3db5c5bb9d
+  data.tar.gz: a839df6e9d4247884a4f37c66e1f18322c59537cc7d03ab33bcc04263ba990eea06ece2b55676e7032e16192033e3edf208ccaa48e7b2f782990094fbdaa184c

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

@@ -17,8 +17,10 @@ module CoreLinkHelper
   # Setup the text as copy text
   #
   def copy_tag(copy_text, options = {})
+    secure = options[:secure] || false
+    display_text = secure ? mask_value(copy_text) : copy_text
     content_tag(:div, class: 'clipboard') do
-      concat(content_tag(:span) { copy_text })
+      concat(content_tag(:span) { display_text })
       concat(copy_text_tag(copy_text, options))
       concat(download_tag(options[:download_url], options)) if options[:download_url].present?
     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/web47core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.1.1
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2021-01-28 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