rush_job 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eb9df24e7c11682daffe5668b62cf2a990221e660e2caa24013a2ce213895b8
-  data.tar.gz: 91b6504b8ef25c7cc6d127f07e443a5809f21ada4d9401cce5644e78179ea480
+  metadata.gz: 92ad8afd84c68007202a9f22abb6d1fc1b61991fd56456d2830fa49b504cd1be
+  data.tar.gz: 4c54a10e9c774979c6280b167c9a4a9a9b880ac7e1b844b38d3181827ac9380a
 SHA512:
-  metadata.gz: d15e808676c9eaa01d10c795898d8a545d2885544010a788a664281a25b6f4ab984b640c2ecd9335e1b2adb48f473d1c49d9edb9a00af69f1d02f9bd8e2cbfa3
-  data.tar.gz: 92bd89d583eb12ff8e82c751cffd7fb364b35f9eb3143b9cedeca0656514980175a016e1cccc094ec21b44a599c2b7e4965bd8798e65f3fb866a5643c1c207bc
+  metadata.gz: 9c13ce385298cfe5b871fc9bde2174a92fdb364703af604d9882dab1793861863f10a776a3585fa35beb1f5aae42b63f76f3339ba1c15911c53197aadcd878b3
+  data.tar.gz: 32e936586c6c64f97271eee5ab73705dd775ceb70eb75fb91da7b85b6ced5b6743b41a8001c046d0180fdf632e577e648d2ad772811a861fb73890f2a082e380

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 JavaKoala
+Copyright 2025 JavaKoala
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,8 +1,10 @@
 # RushJob
 User interface for Delayed Job (https://github.com/collectiveidea/delayed_job) in Ruby on Rails 
 
-<img width="656" alt="Dashboard" src="docs/assets/dashboard.png">
-<img width="1244" alt="Jobs" src="docs/assets/jobs.png">
+<img alt="Light dashboard" src="docs/assets/light-dashboard.gif">
+<img alt="Light jobs" src="docs/assets/light-jobs.png">
+<img alt="Dark dashboard" src="docs/assets/dark-dashboard.gif">
+<img alt="Dark jobs" src="docs/assets/dark-jobs.png">
 
 ### Note
  - This has only been tested with SQLite and Postgresql.
@@ -17,7 +19,7 @@ Navigate to the `/rush_job` route in your application to see the Delayed Jobs. L
 Add this line to your Ruby on Rails application's Gemfile:
 
 ```ruby
-gem 'rush_job', '~> 1.2'
+gem 'rush_job', '~> 1.4'
 ```
 
 And then execute:
@@ -36,10 +38,16 @@ Open an issue or
   2. Update
   3. Test
       1. `bundle exec rails app:test:all` and check coverage in `test/coverage/index.html`
+        - `NO_SANDBOX=true bundle exec rails app:test:all` when running as root
       2. `bundle exec rubocop`
       3. `bundle exec brakeman`
   4. Open pull request
 
+## Propshaft
+This gem uses propshaft, https://github.com/rails/propshaft, and uses a CDN for Bootstrap CSS https://www.jsdelivr.com/package/npm/bootswatch
+
+For the previous bundled CSS and sprockets fork from v1.2.0
+
 ## Turbo
 This gem uses turbo-rails, https://github.com/hotwired/turbo-rails. For Rails UJS fork from v0.6.1
 

data/app/assets/javascript/rush_job/controllers/rush_job_table_update_controller.js

@@ -23,7 +23,7 @@ export class RushJobTableUpdateController extends Controller {
 
   blurTable() {
     const jobsContainer = document.getElementById('rush-job-jobs-container');
-    jobsContainer.classList.add('table-refresh');
+    jobsContainer.classList.add('opacity-25');
   }
 
   clearFlash() {

data/app/controllers/rush_job/dashboard_controller.rb

@@ -1,13 +1,15 @@
 module RushJob
   class DashboardController < ApplicationController
-    include Pagy::Backend
+    include Pagy::Method
 
-    rescue_from Pagy::OverflowError, with: :redirect_to_first_page
+    rescue_from Pagy::RangeError, with: :redirect_to_first_page
 
     def index
-      @pagy_locked_jobs, @locked_jobs = pagy(RushJob.locked_jobs, items: 10, page_param: :locked_jobs_page)
+      @pagy_locked_jobs, @locked_jobs = pagy(RushJob.locked_jobs, items: 10, page_key: 'locked_jobs_page',
+                                                                  raise_range_error: true)
       @queue_groups = RushJob.queue_groups
-      @pagy_queue, @job_queues = pagy_array(@queue_groups.keys, items: 10, page_param: :queue_page)
+      @pagy_queue, @job_queues = pagy(:offset, @queue_groups.keys, items: 10, page_key: 'queue_page',
+                                                                   raise_range_error: true)
 
       respond_to do |format|
         format.html

data/app/controllers/rush_job/rush_jobs_controller.rb

@@ -1,12 +1,12 @@
 module RushJob
   class RushJobsController < ApplicationController
     include SortHelper
-    include Pagy::Backend
+    include Pagy::Method
 
-    rescue_from Pagy::OverflowError, with: :redirect_to_first_page
+    rescue_from Pagy::RangeError, with: :redirect_to_first_page
 
     def index
-      @pagy, @rush_jobs = pagy(RushJob.order("#{sort_column} #{sort_direction}"))
+      @pagy, @rush_jobs = pagy(RushJob.order("#{sort_column} #{sort_direction}"), raise_range_error: true)
 
       respond_to do |format|
         format.html

data/app/helpers/rush_job/rush_jobs_helper.rb

@@ -2,7 +2,6 @@ module RushJob
   module RushJobsHelper
     include ApplicationHelper
     include SortHelper
-    include Pagy::Frontend
 
     def sortable(column)
       direction = column == sort_column && sort_direction == 'asc' ? 'desc' : 'asc'

data/app/views/layouts/rush_job/application.html.erb

@@ -9,15 +9,18 @@
   <%= javascript_importmap_tags %>
   <%= javascript_import_module_tag "rush_job/application" %>
 
-  <%= stylesheet_link_tag    "rush_job/application", media: "all" %>
+  <link href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/spacelab/bootstrap.min.css" rel="stylesheet">
 </head>
-<body class="background-color-<%= current_theme %>">
-  <%= render 'layouts/rush_job/navbar' %>
-  <div id="rush-job-flash-messages">
-    <%= render 'layouts/rush_job/flash_messages' %>
-  </div>
-
-<%= yield %>
+<body data-bs-theme="<%= current_theme %>">
+  <header>
+    <%= render 'layouts/rush_job/navbar' %>
+    <div id="rush-job-flash-messages">
+      <%= render 'layouts/rush_job/flash_messages' %>
+    </div>
+  </header>
 
+  <main class="mx-4">
+    <%= yield %>
+  </main>
 </body>
 </html>

data/app/views/rush_job/dashboard/_dashboard_tables.html.erb

@@ -1,9 +1,7 @@
 <%= turbo_frame_tag 'rush_job_dashboard_frame' do %>
-  <div id="rush-job-jobs-container"
-      class="jobs-container"
-      role="main">
+  <div id="rush-job-jobs-container" role="main">
     <div class="d-flex justify-content-left">
-      <h2 class="color-<%= invert_theme %>"><%= t :locked_jobs %></h2>
+      <h2 class="text-<%= invert_theme %>"><%= t :locked_jobs %></h2>
     </div>
     <div id="rush-job-dashboard-locked-jobs" class="mb-2 d-flex justify-content-left">
       <div class="table-responsive">
@@ -37,11 +35,11 @@
     <div id="rush-job-locked-job-pagination"
         class="d-flex justify-content-left"
         data-bs-theme="<%= current_theme %>">
-      <%== pagy_bootstrap_nav(@pagy_locked_jobs) if @pagy_locked_jobs.pages > 1 %>
+      <%== @pagy_locked_jobs.series_nav(:bootstrap) if @pagy_locked_jobs.pages > 1 %>
     </div>
 
     <div class="d-flex justify-content-left">
-      <h2 class="color-<%= invert_theme %>"><%= t :queues %></h2>
+      <h2 class="text-<%= invert_theme %>"><%= t :queues %></h2>
     </div>
     <div id="rush-job-dashboard-queues" class="d-flex justify-content-left">
       <div class="table-responsive">
@@ -87,7 +85,7 @@
     <div id="rush-job-locked-queue-pagination"
         class="d-flex justify-content-left"
         data-bs-theme="<%= current_theme %>">
-      <%== pagy_bootstrap_nav(@pagy_queue) if @pagy_queue.pages > 1 %>
+      <%== @pagy_queue.series_nav(:bootstrap) if @pagy_queue.pages > 1 %>
     </div>
   </div>
 <% end %>

data/app/views/rush_job/rush_jobs/_jobs_table.html.erb

@@ -1,7 +1,5 @@
 <%= turbo_frame_tag 'rush_job_jobs_frame' do %>
-  <div id="rush-job-jobs-container"
-      class="jobs-container"
-      role="main">
+  <div id="rush-job-jobs-container" role="main">
     <div class="table-responsive">
       <table class="table
                     table-bordered
@@ -43,7 +41,5 @@
     </div>
   </div>
 
-  <div class="footer-container" data-bs-theme="<%= current_theme %>">
-    <%== pagy_bootstrap_nav(@pagy) if @pagy.pages > 1 %>
-  </div>
+  <%== @pagy.series_nav(:bootstrap) if @pagy.pages > 1 %>
 <% end %>

data/app/views/rush_job/shared/_polling.html.erb

@@ -1,8 +1,8 @@
-<div class="polling-container" data-controller="rush-job-polling">
+<div data-controller="rush-job-polling">
   <div class="row align-items-center">
     <div class="col-3">
       <label for="rush-job-polling-range"
-             class="polling-range-form-label-<%= invert_theme %>"
+             class="mb-2"
              data-rush-job-polling-target="pollingTimeLabel">
         <%= t :polling_time %> 13 <%= t :polling_time_unit %>
       </label>
@@ -35,7 +35,7 @@
                role="switch"
                data-rush-job-polling-target="pollingSlide"
                data-action="input->rush-job-polling#pollingToggle">
-        <label class="form-check-label-<%= invert_theme %>" for="rush-job-polling"><%= t :enable_polling %></label>
+        <label for="rush-job-polling"><%= t :enable_polling %></label>
       </div>
     </div>
     <div class="col-3" data-controller="rush-job-reload-jobs-table">

data/lib/rush_job/engine.rb

@@ -1,9 +1,7 @@
 module RushJob
   require 'importmap-rails'
   require 'pagy'
-  require 'pagy/extras/array'
-  require 'pagy/extras/bootstrap'
-  require 'sassc-rails'
+  require 'propshaft'
 
   class Engine < ::Rails::Engine
     isolate_namespace RushJob
@@ -12,18 +10,5 @@ module RushJob
       app.config.importmap.paths << root.join('config/importmap.rb')
       app.config.importmap.cache_sweepers << root.join('app/assets/javascripts')
     end
-
-    initializer 'rush_job.assets.precompile' do |app|
-      app.config.assets.precompile += %w[
-        rush_job/application.css
-        rush_job/application.scss
-        rush_job/application.js
-        rush_job/arrow-up-light.svg
-        rush_job/arrow-up-dark.svg
-        rush_job/arrow-down-light.svg
-        rush_job/arrow-down-dark.svg
-        rush_job_manifest.js
-      ]
-    end
   end
 end

data/lib/rush_job/version.rb

@@ -1,3 +1,3 @@
 module RushJob
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rush_job
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - JavaKoala
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -100,28 +99,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.3'
+        version: '43.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.3'
+        version: '43.2'
 - !ruby/object:Gem::Dependency
-  name: sassc-rails
+  name: propshaft
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -170,84 +169,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.5'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.5'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: rubocop-capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.21'
+        version: '2.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.21'
+        version: '2.22'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.36.0
+        version: 0.38.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.36.0
+        version: 0.38.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.27'
+        version: '2.34'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.27'
+        version: '2.34'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.27'
+        version: '4.39'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.27'
+        version: '4.39'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -262,34 +261,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.22.0
-- !ruby/object:Gem::Dependency
-  name: sprockets-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.8'
 description: Rails web interface for delayed_job using Rails::Engine.
 email:
 - javakoala1@gmail.com
@@ -300,7 +285,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/config/rush_job_manifest.js
 - app/assets/images/rush_job/arrow-down-dark.svg
 - app/assets/images/rush_job/arrow-down-light.svg
 - app/assets/images/rush_job/arrow-up-dark.svg
@@ -310,18 +294,11 @@ files:
 - app/assets/javascript/rush_job/controllers/rush_job_polling_controller.js
 - app/assets/javascript/rush_job/controllers/rush_job_reload_jobs_table_controller.js
 - app/assets/javascript/rush_job/controllers/rush_job_table_update_controller.js
-- app/assets/stylesheets/rush_job/application.scss
-- app/assets/stylesheets/rush_job/components/_pagination.scss
-- app/assets/stylesheets/rush_job/components/_polling.scss
-- app/assets/stylesheets/rush_job/pages/_rush_jobs_index.scss
-- app/assets/stylesheets/rush_job/themes/_dark.scss
-- app/assets/stylesheets/rush_job/themes/_light.scss
 - app/controllers/rush_job/application_controller.rb
 - app/controllers/rush_job/dashboard_controller.rb
 - app/controllers/rush_job/rush_jobs_controller.rb
 - app/controllers/rush_job/settings_controller.rb
 - app/helpers/rush_job/application_helper.rb
-- app/helpers/rush_job/dashboard_helper.rb
 - app/helpers/rush_job/rush_jobs_helper.rb
 - app/helpers/rush_job/settings_helper.rb
 - app/helpers/rush_job/sort_helper.rb
@@ -345,7 +322,6 @@ files:
 - lib/rush_job/engine.rb
 - lib/rush_job/version.rb
 - lib/tasks/rush_job_tasks.rake
-- vendor/stylesheets/rush_job/bootstrap.css
 homepage: https://github.com/JavaKoala/rush_job
 licenses:
 - MIT
@@ -354,7 +330,6 @@ metadata:
   source_code_uri: https://github.com/JavaKoala/rush_job
   changelog_uri: https://github.com/JavaKoala/rush_job
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -369,8 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: User interface for delayed_job
 test_files: []

data/app/assets/config/rush_job_manifest.js

@@ -1,4 +0,0 @@
-//= link_directory ../stylesheets/rush_job .scss
-//= link_directory ../../../vendor/stylesheets/rush_job .css
-//= link_tree ../javascript/rush_job .js
-//= link_directory ../images/rush_job .svg

data/app/assets/stylesheets/rush_job/application.scss

@@ -1,19 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- */
-@import "../../../vendor/stylesheets/rush_job/bootstrap";
-@import "components/pagination";
-@import "components/polling";
-@import "themes/dark";
-@import "themes/light";
-@import "pages/rush_jobs_index";

data/app/assets/stylesheets/rush_job/components/_pagination.scss

@@ -1,15 +0,0 @@
-.page-link.disabled, .disabled > .page-link {
-  color: rgb(68, 110, 155);
-}
-
-.page-item:first-child .page-link {
-  color: rgb(68, 110, 155);
-}
-
-.page-item:last-child .page-link {
-  color: rgb(68, 110, 155);
-}
-
-.page-link {
-  color: rgb(68, 110, 155);
-}

data/app/assets/stylesheets/rush_job/components/_polling.scss

@@ -1,26 +0,0 @@
-.polling-container {
-  margin-left: 5%;
-  margin-right: 5%;
-}
-
-.polling-range-form-label-dark {
-  color: rgb(0, 0, 0);
-  margin-bottom: 0.5rem;
-}
-
-.polling-range-form-label-light {
-  color: rgb(255, 255, 255);
-  margin-bottom: 0.5rem;
-}
-
-.form-check-label-dark {
-  color: rgb(0, 0, 0);
-}
-
-.form-check-label-light {
-  color: rgb(255, 255, 255);
-}
-
-.table-refresh {
-  opacity: 0.3;
-}

data/app/assets/stylesheets/rush_job/pages/_rush_jobs_index.scss

@@ -1,10 +0,0 @@
-.jobs-container {
-  margin-left: 5%;
-  margin-right: 5%;
-}
-
-.footer-container {
-  margin-left: 5%;
-  margin-right: 5%;
-  float: right;
-}

data/app/assets/stylesheets/rush_job/themes/_dark.scss

@@ -1,7 +0,0 @@
-.background-color-dark {
-  background-color: #000;
-}
-
-.color-dark {
-  color: #000;
-}

data/app/assets/stylesheets/rush_job/themes/_light.scss

@@ -1,7 +0,0 @@
-.background-color-light {
-  background-color: #fff;
-}
-
-.color-light {
-  color: #fff;
-}

data/app/helpers/rush_job/dashboard_helper.rb

@@ -1,5 +0,0 @@
-module RushJob
-  module DashboardHelper
-    include Pagy::Frontend
-  end
-end