que-view 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 892e7e3d60cac8ff0d076575cb10454e88a2210f537d446bf8af5942f8ba945c
-  data.tar.gz: 92b8d7b993e6d9e6d7c572a144b63a8b00025e4ee9e28096f177f77bc41203f0
+  metadata.gz: 48aaed2dc98a7238f4baa10b5f12c0c67dbd03a5ea588a6d184d95f077f356dd
+  data.tar.gz: 27ed335bcfa4b1a21380438ab1fee77e6f92f123828b1d88d8f8ace39a269dce
 SHA512:
-  metadata.gz: 6a67ca26a2c007d69be9bd7a036a726cc129bb083c9dd86671edd5aaa70882130158b2f8d7573574785b7523b3b2c2c06cad25bfb850e8d5d52dda694192e9eb
-  data.tar.gz: 7b9e498a11c818b8f8cb6d67ba1d816d5d3a4387147fb7ae33ca31dfb400fc51d00e974e1ccacb7683aff92da0090bd170909729809cc0255255d82d0f73d120
+  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

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

data/lib/que/view/version.rb

@@ -2,6 +2,6 @@
 
 module Que
   module View
-    VERSION = '0.4.0'
+    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.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: que