que-view 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dac131f76f6eba41951dbf574850e81f64871d9416dddcb07bba66fc1633a3f3
-  data.tar.gz: 6baf1c3c6b73672cdf7e5070d5c3b159ece6c40b830d7d2014554f4aa800fb1e
+  metadata.gz: 892e7e3d60cac8ff0d076575cb10454e88a2210f537d446bf8af5942f8ba945c
+  data.tar.gz: 92b8d7b993e6d9e6d7c572a144b63a8b00025e4ee9e28096f177f77bc41203f0
 SHA512:
-  metadata.gz: 433f9452cea24393b5dcbd6517ce93386ac49fadd8cd209ddd80c952da7505a713672162458cd6ac146707410de04283ec08c60c92f6e6da70a896b11e78e45b
-  data.tar.gz: 66cf2c86b57d6ecbc66e464e7a9afc6e02ce4bafd79d86b419c2e1cebb9eaf5769e1ce2cbae7827307593ec96c42bb015da5e61e8febc2016a0224a08e1c87f7
+  metadata.gz: 6a67ca26a2c007d69be9bd7a036a726cc129bb083c9dd86671edd5aaa70882130158b2f8d7573574785b7523b3b2c2c06cad25bfb850e8d5d52dda694192e9eb
+  data.tar.gz: 7b9e498a11c818b8f8cb6d67ba1d816d5d3a4387147fb7ae33ca31dfb400fc51d00e974e1ccacb7683aff92da0090bd170909729809cc0255255d82d0f73d120

data/app/views/que/view/jobs/index.html.erb

@@ -1,4 +1,4 @@
-<h1><%= params[:status].capitalize %> jobs</h1>
+<h1><%= params[:status]&.capitalize %> jobs</h1>
 <%= form_with url: jobs_path, method: :get, class: 'search-form' do |form| %>
   <%= form.hidden_field :status, value: params[:status] %>
   <div class="row">

data/app/views/que/view/jobs/show.html.erb

@@ -33,7 +33,7 @@
       <tr>
         <th>Args</th>
         <td>
-          <% @job.dig(:args, 0, :arguments).each do |argument| %>
+          <% Array(@job.dig(:args, 0, :arguments)).each do |argument| %>
             <p><%= argument %></p>
           <% end %>
         </td>

data/db/migrate/20240731072914_create_que_schema.rb

@@ -0,0 +1,13 @@
+class CreateQueSchema < ActiveRecord::Migration[7.1]
+  def up
+    # Whenever you use Que in a migration, always specify the version you're
+    # migrating to. If you're unsure what the current version is, check the
+    # changelog.
+    Que.migrate!(version: 7)
+  end
+
+  def down
+    # Migrate to version 0 to remove Que entirely.
+    Que.migrate!(version: 0)
+  end
+end

data/lib/que/view/dsl.rb

@@ -95,7 +95,7 @@ module Que
           SELECT count(*) AS total,
                  count(locks.job_id) AS running,
                  coalesce(sum((error_count > 0 AND locks.job_id IS NULL AND expired_at IS NULL)::int), 0) AS failing,
-                 coalesce(sum((error_count = 0 AND locks.job_id IS NULL)::int), 0) AS scheduled,
+                 coalesce(sum((error_count = 0 AND locks.job_id IS NULL AND finished_at IS NULL AND expired_at IS NULL)::int), 0) AS scheduled,
                  coalesce(sum((finished_at IS NOT NULL)::int), 0) AS finished,
                  coalesce(sum((expired_at IS NOT NULL)::int), 0) AS expired
           FROM que_jobs
@@ -121,7 +121,7 @@ module Que
             WHEN expired_at IS NOT NULL THEN 'expired'
             WHEN finished_at IS NOT NULL THEN 'finished'
             WHEN locks.job_id IS NULL AND error_count > 0 AND expired_at IS NULL THEN 'failing'
-            WHEN locks.job_id IS NULL AND error_count = 0 THEN 'scheduled'
+            WHEN locks.job_id IS NULL AND error_count = 0 AND finished_at IS NULL AND expired_at IS NULL THEN 'scheduled'
             ELSE 'running'
             END status
           FROM que_jobs
@@ -135,7 +135,7 @@ module Que
             WHEN expired_at IS NOT NULL THEN 'expired'
             WHEN finished_at IS NOT NULL THEN 'finished'
             WHEN locks.job_id IS NULL AND error_count > 0 AND expired_at IS NULL THEN 'failing'
-            WHEN locks.job_id IS NULL AND error_count = 0 THEN 'scheduled'
+            WHEN locks.job_id IS NULL AND error_count = 0 AND finished_at IS NULL AND expired_at IS NULL THEN 'scheduled'
             ELSE 'running'
             END
         SQL

data/lib/que/view/version.rb

@@ -2,6 +2,6 @@
 
 module Que
   module View
-    VERSION = '0.3.7'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-view
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-30 00:00:00.000000000 Z
+date: 2024-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: que
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.39'
+- !ruby/object:Gem::Dependency
+  name: rubocop-factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: sassc-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails engine as web interface for Que for inspecting jobs.
 email:
 - kortirso@gmail.com
@@ -159,6 +215,7 @@ files:
 - app/views/que/view/queue_metrics/index.html.erb
 - app/views/que/view/welcome/index.html.erb
 - config/routes.rb
+- db/migrate/20240731072914_create_que_schema.rb
 - lib/que/view.rb
 - lib/que/view/configuration.rb
 - lib/que/view/dsl.rb