rush_job_mongoid 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfe3e243025032efc67c34edd6acc243999d62de370ffbd8773d483ccccb639d
-  data.tar.gz: 687116c6dad0b2fd37b23e63d21ef08da63d2236f3ced42335d1fdaca31ece9e
+  metadata.gz: 3054de3624de32c8d3dfb815b7ae7f41cd3ec094309f057beb420943a1f05b9e
+  data.tar.gz: 8eb924984ce3ac7e84d6d62975c9c3e3e0020ee519ccf1cd50589f14f15759cb
 SHA512:
-  metadata.gz: ec16e5c8b09cd397694ae254ce88452d31f21328f4e3508924ef5a274eb52e1dbe6a9886e9f23a35d14476b9f61ec80b617c3d40e3c809d647cafb2488995202
-  data.tar.gz: 6562c846568c565c98c24ccd2cd2f5e5ffebd5c084f05cba0ffcdd9833e99f4786dad70142bf6ecd35d9f5493a21d22321c3fbf5cf115d5f4c1f94b2cf64710e
+  metadata.gz: 7cc9a9715ccb15e9ead71841abd4c250164a92d6411a5de53374378273a124132c7dacb50f8d5d3c979205dda19ca8d4d8e71e1473977ad14dbee192ab6ba57f
+  data.tar.gz: 499a2698a09fa5cd7f7e8c21509b93f7801777302f7f70eb1436e7caf1881d6fdf902f6d1353b93844651260f5629be8bca1956c3f94a3a4b73f4c51c90f57e9

data/README.md

@@ -30,7 +30,7 @@ Queues on the dashboard are eager loaded. If there are lots of queues this can a
 Add this line to your Ruby on Rails application's Gemfile:
 
 ```ruby
-gem 'rush_job_mongoid', '~> 1.2.0'
+gem 'rush_job_mongoid', '~> 1.4'
 ```
 
 And then execute:
@@ -48,7 +48,7 @@ Open an issue or
   1. Fork
   2. Update
   3. Test
-      1. `bundle exec rails app:test:all` and check coverage in `test/coverage/index.html`
+      1. `bundle exec rails test:all` and check coverage in `test/coverage/index.html`
       2. `bundle exec rubocop`
       3. `bundle exec brakeman`
   4. Open pull request

data/app/assets/javascript/rush_job_mongoid/controllers/rush_job_mongoid_polling_controller.js

@@ -3,7 +3,7 @@ import { RushJobMongoidTableUpdateController } from './rush_job_mongoid_table_up
 let intervalID;
 
 export default class RushJobMongoidPollingController extends RushJobMongoidTableUpdateController {
-  static targets = ['pollingTime', 'pollingTimeLabel', 'pollingSlide'];
+  static targets = ['pollingTime', 'pollingTimeLabel', 'pollingSlide', 'progressBar', 'progressBarProgress'];
 
   connect() {
     this.pollingChange();
@@ -22,17 +22,36 @@ export default class RushJobMongoidPollingController extends RushJobMongoidTable
 
     if (pollingSlide.checked === true) {
       this.startPolling();
+      this.progressBarTarget.style = 'height: 7px;';
     } else {
       this.stopPolling();
+      this.progressBarTarget.style = 'display: none;';
     }
   }
 
   startPolling() {
+    this.stopPolling();
     this.updateJobs();
 
-    intervalID = setTimeout(() => {
-      this.startPolling();
-    }, this.pollingTime() * 1000);
+    let progressInterval = 100;
+    let progressPrecent = 1;
+    let progressIntervalTime = this.pollingTime() * 10;
+
+    if (progressIntervalTime < 130) {
+      progressPrecent = 10;
+      progressIntervalTime = progressIntervalTime * 10;
+    }
+
+    intervalID = setInterval(() => {
+      this.progressBarProgressTarget.style = `width: ${progressInterval}%;`;
+      this.progressBarTarget.setAttribute('aria-valuenow', progressInterval);
+
+      progressInterval -= progressPrecent;
+
+      if (progressInterval < 0) {
+        this.startPolling();
+      }
+    }, progressIntervalTime);
   }
 
   stopPolling() {

data/app/assets/javascript/rush_job_mongoid/controllers/rush_job_mongoid_table_update_controller.js

@@ -1,15 +1,24 @@
 import { Controller } from '@hotwired/stimulus';
 
 export class RushJobMongoidTableUpdateController extends Controller {
-  updateJobs() {
+  async updateJobs() {
     const headers = { 'Accept': 'text/vnd.turbo-stream.html' };
 
     this.blurTable();
     this.clearFlash();
 
-    fetch(document.location.href, { headers: headers })
-      .then(response => response.text())
-      .then(html => Turbo.renderStreamMessage(html));
+    try {
+      const response = await fetch(document.location.href, { headers: headers })
+
+      if (!response.ok) {
+        throw new Error(`Failed to fetch job data. Status: ${response.status}`);
+      }
+
+      const response_text = await response.text();
+      Turbo.renderStreamMessage(response_text);
+    } catch (error) {
+      console.error(error.message);
+    }
   }
 
   blurTable() {

data/app/models/rush_job_mongoid/rush_job.rb

@@ -45,10 +45,8 @@ module RushJobMongoid
                                       } }
                                     ]).to_a
 
-      group_result = []
-
-      groups.each do |group|
-        group_result << { queue: group['_id']['queue'], priority: group['_id']['priority'], count: group['count'] }
+      group_result = groups.map do |group|
+        { queue: group['_id']['queue'], priority: group['_id']['priority'], count: group['count'] }
       end
 
       group_result.sort_by! { |group| [group[:priority], group[:queue]] }

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

@@ -2,6 +2,7 @@
 <html>
 <head>
   <title>Rush job mongoid</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
 

data/app/views/rush_job_mongoid/rush_jobs/edit.html.erb

@@ -1,4 +1,4 @@
-<h3 class="text-body">Edit Job <%= @job.id %></h3>
+<h3 class="text-body"><%= t :edit_job %> <%= @job.id %></h3>
 
 <%= link_to 'Back', :back, class: 'btn btn-primary btn-sm mb-3' %>
 
@@ -43,7 +43,7 @@
 <% end %>
 
 <div class="mt-3">
-<%= button_to "Delete",
+<%= button_to t(:delete),
     rush_job_url(@job),
     class: "btn btn-danger",
     method: :delete,

data/app/views/rush_job_mongoid/rush_jobs/index.html.erb

@@ -1,4 +1,4 @@
-<h3 class="text-body">Delayed Jobs</h3>
+<h3 class="text-body"><%= t :delayed_title %></h3>
 
 <%= render 'rush_job_mongoid/shared/polling' %>
 

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

@@ -13,6 +13,19 @@
              max="6"
              data-rush-job-mongoid-polling-target="pollingTime"
              data-action="input->rush-job-mongoid-polling#pollingChange">
+    <div id="rush-job-mongoid-polling-progress"
+          class="progress mb-2"
+          role="progressbar"
+          aria-label="polling progress"
+          aria-valuenow="100"
+          aria-valuemin="0"
+          aria-valuemax="100"
+          style="display: none;"
+          data-rush-job-mongoid-polling-target="progressBar">
+      <div class="progress-bar"
+            style="width: 100%;"
+            data-rush-job-mongoid-polling-target="progressBarProgress"></div>
+      </div>
     </div>
     <div class="col-3">
       <div class="form-check form-switch">

data/config/locales/en.yml

@@ -9,11 +9,13 @@ en:
   dark_mode: "Dark Mode"
   dashboard: "Dashboard"
   delayed_title: "Delayed Jobs"
+  delete: "Delete"
   deleted_job: "Deleted job %{job_id}"
   delete_job_confirmation: "Are you sure you want to delete job %{job_id} ?"
   disable_editing: "Disable Editing"
   disable_editing_confirmation: "Are you sure?"
   disable_queues: "Disable Queues"
+  edit_job: "Edit Job"
   edit_warning: "Verify workers are stopped before editing. Minimal validations are applied."
   enable_editing: "Enable Editing"
   enable_editing_confirmation: "Are you sure? Verify workers are stopped before editing."

data/lib/rush_job_mongoid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rush_job_mongoid
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - JavaKoala
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-15 00:00:00.000000000 Z
+date: 2024-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: delayed_job
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.39'
+        version: '3.40'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.39'
+        version: '3.40'
 - !ruby/object:Gem::Dependency
   name: database_cleaner-mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -170,84 +170,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.3'
+        version: '6.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.3'
+        version: '6.4'
 - !ruby/object:Gem::Dependency
   name: rubocop-capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '2.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '2.21'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: 0.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: 0.36.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.21'
+        version: '2.27'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.21'
+        version: '2.27'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.12'
+        version: '4.26'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.12'
+        version: '4.26'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 description: Rails web interface for delayed_job using Rails::Engine and MongoDB
 email:
 - javakoala1@gmail.com