rush_job_mongoid 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ea9484fa0b01542e93d912d9dc060a8d4fe79742ba2e0af06a1afda7c0bd496
-  data.tar.gz: c5a14b81e1b257adfcd0ea74c13a1f8c86db7cdec89ec7413b15fd9c4474721a
+  metadata.gz: e76bab6e36e104771096dc0375e91ad5169b7de0bd5f459dec7a33399eaab02f
+  data.tar.gz: d2539734ed9936ce7290a81aae162b3480e58a0af81ffe1a7a80fcf17084c575
 SHA512:
-  metadata.gz: bb917c0a28582f7872a68d67145a8f61e0bcb9c48df3e2686355efaeebf6e4ddda74d759f948ef6a0e8d02cc7a7fb9902d371edd00cb0a0a94cb4f5a14db10aa
-  data.tar.gz: 3a67a4429fa491727a363a232ee88761d14b6bb9961d56b59c2fff6a269094a6975093c5959a2b2f4879daa64b223892ae67d5aeed952e7eb768446671b28009
+  metadata.gz: 7340d9f60d4d2c1de8293f029fe441d39e315a208fa4108bb21b52d3c5c3f270e50b151e0d01f6130e28d8a0de5ad5846431943ed23147f6eb2f4e31bd6d7903
+  data.tar.gz: 8ff687f743d53fa5bfba46d0b092ee2a49b56a31bd58b2d1390ca097e9b2abc937d9a3fffbf1994cc0ea4d7cb629b6742894191319e694de4a9bb3c0e7254840

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', '~> 1.0.1'
+gem 'rush_job_mongoid', '~> 1.1.0'
 ```
 
 And then execute:
@@ -53,8 +53,8 @@ Open an issue or
       3. `bundle exec brakeman`
   4. Open pull request
 
-## Upcoming
-  1. Remove dependency on Rails UJS and move to Hotwire and Turbo
+## Turbo
+This gem uses turbo-rails, https://github.com/hotwired/turbo-rails. For Rails UJS fork from v1.0.2
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/assets/javascript/rush_job_mongoid/application.js

@@ -1,13 +1,13 @@
 import { Application } from '@hotwired/stimulus';
-import Rails from '@rails/ujs';
+import RushJobMongoidConfirmController from './controllers/rush_job_mongoid_confirm_controller';
 import RushJobMongoidFiltersController from './controllers/rush_job_mongoid_filters_controller';
 import RushJobMongoidPollingController from './controllers/rush_job_mongoid_polling_controller';
 import RushJobMongoidReloadJobsTableController from './controllers/rush_job_mongoid_reload_jobs_table_controller';
 import 'bootstrap';
-
-Rails.start();
+import '@hotwired/turbo-rails';
 
 window.Stimulus = Application.start();
+Stimulus.register('rush-job-mongoid-confirm', RushJobMongoidConfirmController);
 Stimulus.register('rush-job-mongoid-filter', RushJobMongoidFiltersController);
 Stimulus.register('rush-job-mongoid-polling', RushJobMongoidPollingController);
 Stimulus.register('rush-job-mongoid-reload-jobs-table', RushJobMongoidReloadJobsTableController);

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

@@ -0,0 +1,11 @@
+import { Controller } from '@hotwired/stimulus';
+
+export default class RushJobMongoidConfirmController extends Controller {
+  displayConfirm(e) {
+    const confirmMessage = e.target.dataset.confirmMessage;
+
+    if (confirm(confirmMessage) !== true) {
+      e.preventDefault();
+    }
+  }
+}

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

@@ -1,19 +1,23 @@
 import { Controller } from '@hotwired/stimulus';
-import Rails from '@rails/ujs';
 
 export class RushJobMongoidTableUpdateController extends Controller {
   updateJobs() {
+    const headers = { 'Accept': 'text/vnd.turbo-stream.html' };
+
     this.blurTable();
+    this.clearFlash();
 
-    Rails.ajax({
-      url: document.location.href,
-      type: 'GET',
-      dataType: 'script',
-    });
+    fetch(document.location.href, { headers: headers })
+      .then(response => response.text())
+      .then(html => Turbo.renderStreamMessage(html));
   }
 
   blurTable() {
     const jobsContainer = document.getElementById('rush-job-mongoid-jobs');
     jobsContainer.classList.add('table-refresh');
   }
+
+  clearFlash() {
+    document.getElementById('rush-job-mongoid-flash-messages').innerHTML = '';
+  }
 }

data/app/controllers/rush_job_mongoid/dashboard_controller.rb

@@ -6,6 +6,11 @@ module RushJobMongoid
       @locked_jobs_presenter = PaginationPresenter.new(params[:locked_jobs_page])
       @locked_jobs = LockedJobs.new(filter_params)
       @queues_presenter = QueueGroupsPresenter.new(params[:queue_groups_page]) if queue_groups_enabled?
+
+      respond_to do |format|
+        format.html
+        format.turbo_stream
+      end
     end
 
     def destroy

data/app/controllers/rush_job_mongoid/rush_jobs_controller.rb

@@ -5,6 +5,11 @@ module RushJobMongoid
     def index
       @pagination_presenter = PaginationPresenter.new(params[:page])
       @rush_jobs = RushJob.filter(filter_params).locked_by_desc.paginate(@pagination_presenter.page, 20)
+
+      respond_to do |format|
+        format.html
+        format.turbo_stream
+      end
     end
 
     def edit

data/app/presenters/rush_job_mongoid/queue_groups_presenter.rb

@@ -19,7 +19,7 @@ module RushJobMongoid
     private
 
     def queue_groups_from_presener
-      @rush_job_queue_groups[(@queue_groups_presenter.page - 1) * 10, 10]
+      @rush_job_queue_groups[(@queue_groups_presenter.page - 1) * 10, 10] || []
     end
   end
 end

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

@@ -49,18 +49,28 @@
             </a>
             <div class="dropdown-menu"
                  data-bs-popper="static">
-              <%= button_to t("#{invert_theme}_mode"), settings_path, class: "nav-link", method: :patch, params: { setting: 'theme' } %>
+              <%= button_to t("#{invert_theme}_mode"),
+                            settings_path, class: "nav-link",
+                            method: :patch,
+                            params: { setting: 'theme' },
+                            data: { turbo: false } %>
               <%= button_to t("#{editing_enabled? ? 'disable_editing' : 'enable_editing'}"),
                             settings_path,
                             class: "nav-link",
                             method: :patch,
                             params: { setting: 'editing' },
-                            data: { confirm: t("#{editing_enabled? ? 'disable_editing_confirmation' : 'enable_editing_confirmation'}") } %>
+                            data: {
+                              turbo: false,
+                              controller: 'rush-job-mongoid-confirm',
+                              action: 'click->rush-job-mongoid-confirm#displayConfirm',
+                              confirm_message: t("#{editing_enabled? ? 'disable_editing_confirmation' : 'enable_editing_confirmation'}")
+                            } %>
               <%= button_to t("#{queue_groups_enabled? ? 'disable_queues' : 'enable_queues'}"),
                             settings_path,
                             class: "nav-link",
                             method: :patch,
-                            params: { setting: 'queue_groups_presenter' } %>
+                            params: { setting: 'queue_groups_presenter' },
+                            data: { turbo: false } %>
             </div>
           </li>
         </ul>

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

@@ -1,34 +1,38 @@
-<div id="rush-job-mongoid-dashboard-locked-jobs">
-  <div class="d-flex justify-content-left">
-    <div class="table-responsive">
-      <table class="table table-bordered table-striped">
-        <thead>
-          <tr>
-            <th><%= t :id %></th>
-            <th><%= t :locked_at %></th>
-            <th><%= t :locked_by %></th>
-            <th><%= t :job_class %></th>
-            <th><%= t :arguments %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% @locked_jobs.paginate(@locked_jobs_presenter.page).each do |job| %>
-            <tr>
-              <td><%= job.id %></td>
-              <td><%= job.locked_at %></td>
-              <td><%= job.locked_by %></td>
-              <td><%= job.job_class %></td>
-              <td><%= job.job_arguments %></td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
-  </div>
+<%= turbo_frame_tag 'rush_job_mongoid_dashboard_frame' do %>
+  <div id="rush-job-mongoid-jobs">
+    <div id="rush-job-mongoid-dashboard-locked-jobs">
+      <div class="d-flex justify-content-left">
+        <div class="table-responsive">
+          <table class="table table-bordered table-striped">
+            <thead>
+              <tr>
+                <th><%= t :id %></th>
+                <th><%= t :locked_at %></th>
+                <th><%= t :locked_by %></th>
+                <th><%= t :job_class %></th>
+                <th><%= t :arguments %></th>
+              </tr>
+            </thead>
+            <tbody>
+              <% @locked_jobs.paginate(@locked_jobs_presenter.page).each do |job| %>
+                <tr>
+                  <td><%= job.id %></td>
+                  <td><%= job.locked_at %></td>
+                  <td><%= job.locked_by %></td>
+                  <td><%= job.job_class %></td>
+                  <td><%= job.job_arguments %></td>
+                </tr>
+              <% end %>
+            </tbody>
+          </table>
+        </div>
+      </div>
 
-  <%= render 'rush_job_mongoid/shared/pagination', controller: 'dashboard', pagination_param: 'locked_jobs_page', pages_count: @locked_jobs_presenter.pages(@locked_jobs.jobs.count, 10), page: @locked_jobs_presenter.page %>
-</div>
+      <%= render 'rush_job_mongoid/shared/pagination', controller: 'dashboard', pagination_param: 'locked_jobs_page', pages_count: @locked_jobs_presenter.pages(@locked_jobs.jobs.count, 10), page: @locked_jobs_presenter.page %>
+    </div>
 
-<% if queue_groups_enabled? %>
-  <%= render 'queues_table' %>
+    <% if queue_groups_enabled? %>
+      <%= render 'queues_table' %>
+    <% end %>
+  </div>
 <% end %>

data/app/views/rush_job_mongoid/dashboard/_queues_table.html.erb

@@ -26,7 +26,12 @@
                                   class: "btn btn-danger btn-sm",
                                   method: :delete,
                                   params: { queue: group[:queue], priority: group[:priority] },
-                                  data: { confirm: t(:clear_queue_confirmation, queue: group[:queue]) } %></td>
+                                  data: {
+                                    turbo: false,
+                                    controller: 'rush-job-mongoid-confirm',
+                                    action: 'click->rush-job-mongoid-confirm#displayConfirm',
+                                    confirm_message: t(:clear_queue_confirmation, queue: group[:queue])
+                                  } %></td>
               <% end %>
             </tr>
           <% end %>

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

@@ -2,6 +2,4 @@
 
 <h3 class="text-body"><%= t :locked_jobs %></h3>
 
-<div id="rush-job-mongoid-jobs">
-  <%= render 'dashboard_tables' %>
-</div>
+<%= render 'dashboard_tables' %>

data/app/views/rush_job_mongoid/dashboard/index.turbo_stream.erb

@@ -0,0 +1,7 @@
+<%= turbo_stream.replace 'rush_job_mongoid_dashboard_frame',
+    partial: 'dashboard_tables',
+    locals: {
+      locked_jobs_presenter: @locked_jobs_presenter,
+      pagination_presenter: @pagination_presenter,
+      queues_presenter: @queues_presenter
+    } %>

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

@@ -1,43 +1,51 @@
-<table class="table table-bordered table-striped">
-  <thead>
-    <tr>
-      <% if editing_enabled? %>
-        <th></th>
-      <% end %>
-      <th><%= t :priority %></th>
-      <th><%= t :attempts %></th>
-      <th><%= t :job_class %></th>
-      <th><%= t :arguments %></th>
-      <th><%= t :run_at %></th>
-      <th><%= t :locked_at %></th>
-      <th><%= t :locked_by %></th>
-      <th><%= t :failed_at %></th>
-      <th><%= t :last_error %></th>
-      <th><%= t :queue %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @rush_jobs.each do |job| %>
-      <tr>
-        <% if editing_enabled? %>
-          <td><%= link_to image_tag("rush_job_mongoid/pencil-square-#{invert_theme}.svg", id: "rush-job-mongoid-pencil-square-#{job.id}", alt: 'pencil square'), edit_rush_job_path(job.id) %></td>
+<%= turbo_frame_tag 'rush_job_mongoid_jobs_frame' do %>
+  <div id="rush-job-mongoid-jobs">
+    <table class="table table-bordered table-striped">
+      <thead>
+        <tr>
+          <% if editing_enabled? %>
+            <th></th>
+          <% end %>
+          <th><%= t :priority %></th>
+          <th><%= t :attempts %></th>
+          <th><%= t :job_class %></th>
+          <th><%= t :arguments %></th>
+          <th><%= t :run_at %></th>
+          <th><%= t :locked_at %></th>
+          <th><%= t :locked_by %></th>
+          <th><%= t :failed_at %></th>
+          <th><%= t :last_error %></th>
+          <th><%= t :queue %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @rush_jobs.each do |job| %>
+          <tr>
+            <% if editing_enabled? %>
+              <td><%= link_to image_tag("rush_job_mongoid/pencil-square-#{invert_theme}.svg",
+                      id: "rush-job-mongoid-pencil-square-#{job.id}",
+                      alt: 'pencil square'), edit_rush_job_path(job.id),
+                      target: '_top' %>
+              </td>
+            <% end %>
+            <td><%= job.priority %></td>
+            <td><%= job.attempts %></td>
+            <td><%= job.job_class %></td>
+            <td><%= job.job_arguments %></td>
+            <td><%= job.run_at %></td>
+            <td><%= job.locked_at %></td>
+            <td><%= job.locked_by %></td>
+            <td><%= job.failed_at %></td>
+            <td><%= job.last_error %></td>
+            <td><%= job.queue %></td>
+          </tr>
         <% end %>
-        <td><%= job.priority %></td>
-        <td><%= job.attempts %></td>
-        <td><%= job.job_class %></td>
-        <td><%= job.job_arguments %></td>
-        <td><%= job.run_at %></td>
-        <td><%= job.locked_at %></td>
-        <td><%= job.locked_by %></td>
-        <td><%= job.failed_at %></td>
-        <td><%= job.last_error %></td>
-        <td><%= job.queue %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+      </tbody>
+    </table>
 
-<%= render 'rush_job_mongoid/shared/pagination', controller: 'rush_jobs',
-                                                 pagination_param: 'page',
-                                                 pages_count: @pagination_presenter.pages(RushJobMongoid::RushJob.filter(filter_param_query).count, 20),
-                                                 page: @pagination_presenter.page %>
+    <%= render 'rush_job_mongoid/shared/pagination', controller: 'rush_jobs',
+                                                     pagination_param: 'page',
+                                                     pages_count: @pagination_presenter.pages(RushJobMongoid::RushJob.filter(filter_param_query).count, 20),
+                                                     page: @pagination_presenter.page %>
+  </div>
+<% end %>

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

@@ -39,7 +39,7 @@
     <%= form.label :queue, t(:queue), class: 'form-label' %>
     <%= form.text_field :queue, class: 'form-control' %>
   </div>
-  <%= form.submit t(:update), class: 'btn btn-primary' %>
+  <%= form.submit t(:update), class: 'btn btn-primary', data: { turbo: false } %>
 <% end %>
 
 <div class="mt-3">
@@ -47,5 +47,10 @@
     rush_job_url(@job),
     class: "btn btn-danger",
     method: :delete,
-    data: { confirm: t(:delete_job_confirmation, job_id: @job.id) } %>
+    data: {
+      turbo: false,
+      controller: 'rush-job-mongoid-confirm',
+      action: 'click->rush-job-mongoid-confirm#displayConfirm',
+      confirm_message: t(:delete_job_confirmation, job_id: @job.id)
+    } %>
 </div>

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

@@ -2,6 +2,4 @@
 
 <%= render 'rush_job_mongoid/shared/polling' %>
 
-<div id="rush-job-mongoid-jobs">
-  <%= render 'jobs_table' %>
-</div>
+<%= render 'jobs_table' %>

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

@@ -0,0 +1,6 @@
+<%= turbo_stream.replace 'rush_job_mongoid_jobs_frame',
+    partial: 'jobs_table',
+    locals: {
+      rush_jobs: @rush_jobs,
+      locked_jobs: @locked_jobs
+    } %>

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

@@ -1,3 +1,6 @@
 <li class="page-item">
-  <%= link_to link_display, { controller: controller, params: request.parameters.merge(pagination_param => page) }, class: link_class %>
-</li>
+  <%= link_to link_display,
+              { controller: controller, params: request.parameters.merge(pagination_param => page) },
+              class: link_class,
+              target: '_top' %>
+</li>

data/config/importmap.rb

@@ -1,5 +1,5 @@
 pin 'rush_job_mongoid/application', preload: true
 pin 'bootstrap', to: 'https://ga.jspm.io/npm:bootstrap@5.3.1/dist/js/bootstrap.esm.js'
 pin '@popperjs/core', to: 'https://ga.jspm.io/npm:@popperjs/core@2.11.8/lib/index.js'
-pin '@rails/ujs', to: 'https://ga.jspm.io/npm:@rails/ujs@7.0.6/lib/assets/compiled/rails-ujs.js'
 pin '@hotwired/stimulus', to: 'https://ga.jspm.io/npm:@hotwired/stimulus@3.2.2/dist/stimulus.js'
+pin '@hotwired/turbo-rails', to: 'turbo.min.js', preload: true

data/lib/rush_job_mongoid/version.rb

@@ -1,3 +1,3 @@
 module RushJobMongoid
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rush_job_mongoid
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - JavaKoala
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-28 00:00:00.000000000 Z
+date: 2024-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: turbo-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: delayed_job
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +292,7 @@ files:
 - app/assets/images/rush_job_mongoid/pencil-square-dark.svg
 - app/assets/images/rush_job_mongoid/pencil-square-light.svg
 - app/assets/javascript/rush_job_mongoid/application.js
+- app/assets/javascript/rush_job_mongoid/controllers/rush_job_mongoid_confirm_controller.js
 - app/assets/javascript/rush_job_mongoid/controllers/rush_job_mongoid_filters_controller.js
 - app/assets/javascript/rush_job_mongoid/controllers/rush_job_mongoid_polling_controller.js
 - app/assets/javascript/rush_job_mongoid/controllers/rush_job_mongoid_reload_jobs_table_controller.js
@@ -304,11 +319,11 @@ files:
 - app/views/rush_job_mongoid/dashboard/_dashboard_tables.html.erb
 - app/views/rush_job_mongoid/dashboard/_queues_table.html.erb
 - app/views/rush_job_mongoid/dashboard/index.html.erb
-- app/views/rush_job_mongoid/dashboard/index.js.erb
+- app/views/rush_job_mongoid/dashboard/index.turbo_stream.erb
 - app/views/rush_job_mongoid/rush_jobs/_jobs_table.html.erb
 - app/views/rush_job_mongoid/rush_jobs/edit.html.erb
 - app/views/rush_job_mongoid/rush_jobs/index.html.erb
-- app/views/rush_job_mongoid/rush_jobs/index.js.erb
+- app/views/rush_job_mongoid/rush_jobs/index.turbo_stream.erb
 - app/views/rush_job_mongoid/shared/_pagination.html.erb
 - app/views/rush_job_mongoid/shared/_pagination_link.html.erb
 - app/views/rush_job_mongoid/shared/_polling.html.erb

data/app/views/rush_job_mongoid/dashboard/index.js.erb

@@ -1,3 +0,0 @@
-document.getElementById('rush-job-mongoid-flash-messages').innerHTML = "<%= j (render partial: 'layouts/rush_job_mongoid/flash_messages') %>"
-document.getElementById('rush-job-mongoid-jobs').innerHTML = "<%= j (render partial: 'dashboard_tables') %>"
-document.getElementById('rush-job-mongoid-jobs').classList.remove('table-refresh');

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

@@ -1,3 +0,0 @@
-document.getElementById('rush-job-mongoid-flash-messages').innerHTML = "<%= j (render partial: 'layouts/rush_job_mongoid/flash_messages') %>"
-document.getElementById('rush-job-mongoid-jobs').innerHTML = "<%= j (render partial: 'jobs_table') %>"
-document.getElementById('rush-job-mongoid-jobs').classList.remove('table-refresh');