que-view 0.3.7 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dac131f76f6eba41951dbf574850e81f64871d9416dddcb07bba66fc1633a3f3
-  data.tar.gz: 6baf1c3c6b73672cdf7e5070d5c3b159ece6c40b830d7d2014554f4aa800fb1e
+  metadata.gz: 48aaed2dc98a7238f4baa10b5f12c0c67dbd03a5ea588a6d184d95f077f356dd
+  data.tar.gz: 27ed335bcfa4b1a21380438ab1fee77e6f92f123828b1d88d8f8ace39a269dce
 SHA512:
-  metadata.gz: 433f9452cea24393b5dcbd6517ce93386ac49fadd8cd209ddd80c952da7505a713672162458cd6ac146707410de04283ec08c60c92f6e6da70a896b11e78e45b
-  data.tar.gz: 66cf2c86b57d6ecbc66e464e7a9afc6e02ce4bafd79d86b419c2e1cebb9eaf5769e1ce2cbae7827307593ec96c42bb015da5e61e8febc2016a0224a08e1c87f7
+  metadata.gz: ef87394a2f147a65384f2aa44d8695a734f3ae9c1c451d25bb763dd45a0cd582269597f21809c5cc1847ad1a1113dca4940baac8751cfe1ccd08910222929d1e
+  data.tar.gz: 4f83aca9ad32a0dd37b6948d69511f6193412f9bf3221b0db53001e2f37535cc6aac053bc252612005af120270c059e6f3aa1889128f41dd1e0e466c85e268b7

data/app/helpers/que/view/application_helper.rb

@@ -15,6 +15,34 @@ module Que
 
         job[:last_error_message].lines.first || ''
       end
+
+      def humanized_job_args(job)
+        case job[:job_class]
+        when 'ActiveJob::QueueAdapters::QueAdapter::JobWrapper' then active_job_args(job)
+        else que_args(job)
+        end.join('<br />').html_safe
+      end
+
+      def humanized_enqueued_at(job)
+        case job[:job_class]
+        when 'ActiveJob::QueueAdapters::QueAdapter::JobWrapper'
+          job.dig(:args, 0, :enqueued_at).to_time.strftime('%Y-%m-%d %H:%M:%S')
+        end
+      end
+
+      private
+
+      def active_job_args(job)
+        job.dig(:args, 0, :arguments)&.map do |arg|
+          next arg.except(:_aj_ruby2_keywords, :_aj_symbol_keys) if arg.is_a?(Hash)
+
+          arg
+        end || []
+      end
+
+      def que_args(job)
+        job[:args].push(job[:kwargs])
+      end
     end
   end
 end

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">
@@ -50,11 +50,7 @@
         <td><%= humanized_job_class(job) %></td>
         <td><%= job[:queue] %></td>
         <td><%= job[:run_at].strftime("%Y-%m-%d %H:%M:%S") %></td>
-        <td>
-          <% Array(job.dig(:args, 0, :arguments)).each do |argument| %>
-            <p><%= argument %></p>
-          <% end %>
-        </td>
+        <td><%= humanized_job_args(job) %></td>
         <% if params[:status] == 'failing' %>
           <td><%= job[:error_count] %></td>
           <td><%= format_error(job) %></td>

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

@@ -20,7 +20,7 @@
       </tr>
       <tr>
         <th>Enqueued at</th>
-        <td><%= @job.dig(:args, 0, :enqueued_at).to_time.strftime('%Y-%m-%d %H:%M:%S') %></td>
+        <td><%= humanized_enqueued_at(@job) %></td>
       </tr>
       <tr>
         <th>Run at</th>
@@ -33,9 +33,7 @@
       <tr>
         <th>Args</th>
         <td>
-          <% @job.dig(:args, 0, :arguments).each do |argument| %>
-            <p><%= argument %></p>
-          <% end %>
+          <%= humanized_job_args(@job) %>
         </td>
       </tr>
       <tr>

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.1'
   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.1
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-30 00:00:00.000000000 Z
+date: 2024-08-08 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