sidekiq-status 3.0.3 → 4.0.0

data/web/views/status.erb

@@ -1,117 +1,155 @@
 <% require 'cgi'; def h(v); CGI.escape_html(v.to_s); end %>
-<style>
-  .progress {
-    background-color: #C8E1ED;
-  }
-  .progress-percentage {
-    margin: 5px;
-    padding-left: 4px;
-    color: #333;
-    text-align: left;
-    text-shadow: 0 0 5px white;
-    font-weight: bold;
-    font-size: 14px;
-  }
-</style>
-
-<h3>
-  Job Status: <%= h @status["jid"] %>
+<%
+  def format_iso_timestamp(timestamp)
+    return "<i>n/a</i>" unless timestamp && !timestamp.empty?
+    Time.at(timestamp.to_i).utc.iso8601
+  end
+%>
+<link rel="stylesheet" href="<%= root_path %>assets/statuses.css" />
+<script type="text/javascript" src="<%= root_path %>assets/statuses.js"></script>
+<h3 class="status-header">
+  Job Status
   <span class='label label-<%= h @status["label"] %>'>
     <%= h @status["status"] %>
   </span>
 </h3>
 
-<div class="progress" style="height: 30px;">
-  <div class="progress-bar" role="progressbar" aria-valuenow="<%= @status["pct_complete"].to_i %>" aria-valuemin="0" aria-valuemax="100" style="width: <%= @status["pct_complete"].to_i %>%">
-    <div class="progress-percentage">
+<div class="progress h-30px">
+  <div class="progress-bar" role="progressbar" aria-valuenow="<%= @status["pct_complete"].to_i %>" aria-valuemin="0" aria-valuemax="100">
+    <div class="progress-percentage fs-lg">
       <%= @status["pct_complete"].to_i %>%
     </div>
   </div>
 </div>
 
-<div class="panel panel-default" style="background-color: inherit">
-  <div class="panel-body">
-    <h4><%= h @status["worker"] %></h4>
-
-    <div class="row">
-      <div class="col-sm-2">
-        <strong>Arguments</strong>
-      </div>
-      <div class="col-sm-10">
-        <p><%= @status["args"].empty? ? "<i>none</i>" : h(@status["args"]) %></p>
-      </div>
-    </div>
+<br />
 
-    <div class="row">
-      <div class="col-sm-2">
-        <strong>Message</strong>
-      </div>
-      <div class="col-sm-10">
-        <p><%= h(@status["message"]) || "<i>none</i>" %></p>
-      </div>
-    </div>
+  <div class="header-container">
+    <h3>Job Details</h3>
+  </div>
 
-    <div class="row">
-      <div class="col-sm-2">
-        <strong>Last Updated</strong>
-      </div>
-      <div class="col-sm-10">
-        <p>
-          <% secs = Time.now.to_i - @status["update_time"].to_i %>
-          <% if secs > 0 %>
-            <%= ChronicDuration.output(secs, :weeks => true, :units => 2) %> ago
+  <table class="table table-bordered table-striped status-table">
+    <tbody>
+      <tr>
+        <th>Job ID</th>
+        <td><code><%= h @status["jid"] %></code></td>
+      </tr>
+      <tr>
+        <th>Job</th>
+        <td><%= h @status["worker"] %></td>
+      </tr>
+      <tr>
+        <th>Arguments</th>
+        <td>
+          <% if @status["args"] && !@status["args"].empty? %>
+            <% args_content = h(@status["args"]) %>
+            <% if args_content.include?("\n") %>
+              <div class="multiline"><%= args_content %></div>
+            <% else %>
+              <%= args_content %>
+            <% end %>
           <% else %>
-            Now
+            <i>none</i>
           <% end %>
-        </p>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-sm-2">
-        <strong>Elapsed Time</strong>
-      </div>
-      <div class="col-sm-10">
-        <p>
-          <% if @status["elapsed"] %>
-            <%= ChronicDuration.output(@status["elapsed"].to_i, :weeks => true, :units => 2) %>
+        </td>
+      </tr>
+      <tr>
+        <th>Status</th>
+        <td><span class='label label-<%= h @status["label"] %>'><%= h @status["status"] %></span></td>
+      </tr>
+      <tr>
+        <th>Elapsed Time</th>
+        <td>
+          <% unless @status["elapsed"].nil? %>
+            <%= ChronicDuration.output(@status["elapsed"].to_i, :weeks => true, :units => 2) || '0 secs' %>
+          <% else %>
+            <i>n/a</i>
           <% end %>
-        </p>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-sm-2">
-        <strong>ETA</strong>
-      </div>
-      <div class="col-sm-10">
-        <p>
+        </td>
+      </tr>
+      <tr>
+        <th>Progress</th>
+        <td>
+          <%= @status["pct_complete"].to_i %>%
+          <% if @status["at"] && @status["total"] %>
+            (<%= @status["at"] %> of <%= @status["total"] %>)
+          <% end %>
+        </td>
+      </tr>
+      <% if @status["status"] == "working" %>
+      <tr>
+        <th>ETA</th>
+        <td>
           <% if @status["eta"] %>
             <%= ChronicDuration.output(@status["eta"].to_i, :weeks => true, :units => 2) %>
+          <% else %>
+            <i>n/a</i>
           <% end %>
-        </p>
-      </div>
-    </div>
-
-    <% if @status["custom"].any? %>
-      <hr>
-      <% @status["custom"].each do |key, val| %>
-        <div class="row">
-          <div class="col-sm-2">
-            <strong><%= key %></strong>
-          </div>
-          <div class="col-sm-10">
-            <% if val && val.include?("\n") %>
-              <pre><%= h val %></pre>
-            <% else  %>
-              <p><%= h(val) || "<i>none</i>" %></p>
-            <% end %>
-          </div>
-        </div>
+        </td>
+      </tr>
       <% end %>
-    <% end %>
+      <tr>
+        <th>Message</th>
+        <td>
+          <% if @status["message"] && !@status["message"].empty? %>
+            <%= h(@status["message"]) %>
+          <% else %>
+            <i>none</i>
+          <% end %>
+        </td>
+      </tr>
+      <tr>
+        <th>Enqueued At</th>
+        <td class="timestamp"><%= format_iso_timestamp(@status["enqueued_at"]) %></td>
+      </tr>
+      <tr>
+        <th>Started At</th>
+        <td class="timestamp"><%= format_iso_timestamp(@status["started_at"]) %></td>
+      </tr>
+      <tr>
+        <th>Last Updated</th>
+        <td class="timestamp">
+          <%= format_iso_timestamp(@status["updated_at"]) %>
+          <% if @status["updated_at"] %>
+            <br><small class="text-muted">
+              <% secs = Time.now.to_i - @status["updated_at"].to_i %>
+              <% if secs > 0 %>
+                (<%= ChronicDuration.output(secs, :weeks => true, :units => 2) %> ago)
+              <% else %>
+                (now)
+              <% end %>
+            </small>
+          <% end %>
+        </td>
+      </tr>
+      <tr>
+        <th>Ended At</th>
+        <td class="timestamp"><%= format_iso_timestamp(@status["ended_at"]) %></td>
+      </tr>
+    </tbody>
+  </table>
+
+<% if @status["custom"] && @status["custom"].any? %>
+  <div class="header-container">
+    <h3>Custom Data</h3>
   </div>
-</div>
+  <table class="table table-bordered table-striped status-table">
+    <% @status["custom"].each do |key, val| %>
+      <tr>
+        <th><%= h key %></th>
+        <td>
+          <% if val && val.to_s.include?("\n") %>
+            <div class="multiline"><%= h val %></div>
+          <% else %>
+            <%= h(val) || "<i>none</i>" %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>
+
+<br />
 
 <a href="<%= root_path %>statuses">
   <small>&larr; back to all statuses</small>

data/web/views/status_not_found.erb

@@ -1,5 +1,5 @@
 <% require 'cgi'; def h(v); CGI.escape_html(v.to_s); end %>
-<h3>Job Status: <%= h params[:jid] %></h3>
+<h3>Job Status: <%= h safe_url_params("jid") %></h3>
 
 <div role="alert">
   <strong>Uh oh!</strong> That job can't be found. It may have expired already.

data/web/views/statuses.erb

@@ -1,77 +1,24 @@
 <% require 'cgi'; def h(v); CGI.escape_html(v.to_s); end %>
-<style>
-.progress {
-  background-color: #C8E1ED;
-}
-.bar {
-  background-color: #2897cb;
-  color: white;
-  text-shadow: 0 0 0;
-}
-.message {
-  text-shadow: 0 0 5px white;
-  font-weight: bold; padding-left: 4px;
-  color: #333;
-}
-.actions {
-  text-align: center;
-}
-.header {
-  text-align: center;
-}
-.header_update_time {
-  width: 10%;
-}
-.header_pct_complete {
-  width: 45%;
-}
-.btn-warning {
-  background-image: linear-gradient(#f0ad4e, #eea236)
-}
-.nav-container {
-  display: flex;
-  line-height: 45px;
-}
-.nav-container .pull-right {
-  float: none !important;
-}
-.nav-container .pagination {
-  display: flex;
-  align-items: center;
-}
-.nav-container .per-page, .filter-status {
-  display: flex;
-  align-items: center;
-  margin: 20px 0 20px 10px;
-  white-space: nowrap;
-}
-.nav-container .per-page SELECT {
-  margin: 0 0 0 5px;
-}
-</style>
-<script>
-function setPerPage(select){
-  window.location = select.options[select.selectedIndex].getAttribute('data-url')
-}
-</script>
-<div style="display: flex; justify-content: space-between;">
+<link rel="stylesheet" href="<%= root_path %>assets/statuses.css" />
+<script type="text/javascript" src="<%= root_path %>assets/statuses.js"></script>
+<div class="index-header">
   <h3 class="wi">Recent job statuses</h3>
   <div class="nav-container">
     <%= erb :_paging, locals: { url: "#{root_path}statuses" } %>
     <div class="filter-status">
-      Filter Status:
-      <select class="form-control" onchange="setPerPage(this)">
+      Filter Status:&nbsp;
+      <select class="form-control">
         <% (['all', 'complete', 'failed', 'interrupted', 'queued', 'retrying', 'stopped', 'working']).each do |status| %>
-          <option data-url="?<%= qparams(status: status)%>" value="<%= status %>" <%= 'selected="selected"' if status == (params[:status]) %>><%= status %></option>
+          <option data-url="?<%= qparams(status: status)%>" value="<%= status %>" <%= 'selected="selected"' if status == (safe_url_params("status")) %>><%= status %></option>
         <% end %>
       </select>
     </div>
 
     <div class="per-page">
-      Per page:
-      <select class="form-control" onchange="setPerPage(this)">
+      Per page:&nbsp;
+      <select class="form-control">
         <% (Sidekiq::Status::Web.per_page_opts + ['all']).each do |num| %>
-        <option data-url="?<%= qparams(page: 1, per_page: num)%>" value="<%= num %>" <%= 'selected="selected"' if num.to_s == (params[:per_page] || @count) %>><%= num %></option>
+        <option data-url="?<%= qparams(page: 1, per_page: num)%>" value="<%= num %>" <%= 'selected="selected"' if num.to_s == (safe_url_params("per_page") || @count) %>><%= num %></option>
         <% end %>
       </select>
     </div>
@@ -96,11 +43,11 @@ function setPerPage(select){
       <td>
         <div class='args' title='<%= h container["jid"] %>'><%= h container["args"] %></div>
       </td>
-      <td style='text-align: center;'>
-        <div class='label label-<%= h container["label"] %>'><%= h container["status"] %></div>
+      <td class='center'>
+        <span class='label label-<%= h container["label"] %>'><%= h container["status"] %></span>
       </td>
-      <% secs = Time.now.to_i - container["update_time"].to_i %>
-      <td style='text-align: center; white-space: nowrap;' title="<%= Time.at(container["update_time"].to_i) %>">
+      <% secs = Time.now.to_i - container["updated_at"].to_i %>
+      <td class='center nowrap' title="<%= Time.at(container["updated_at"].to_i) %>">
         <% if secs > 0 %>
           <%= ChronicDuration.output(secs, :weeks => true, :units => 2) %> ago
         <% else %>
@@ -108,23 +55,20 @@ function setPerPage(select){
         <% end %>
       </td>
       <td>
-        <div class="progress progress-striped" style="margin-bottom: 0">
-          <div class='message' style='text-align:right; padding-right:0.5em; background-color: transparent; float:right;'>
-            <%= h container["message"] %>
-          </div>
-          <% if container["pct_complete"].to_i > 0 %>
-            <div class="bar message" style="width: <%= h container["pct_complete"] %>%;">
-              <%= h container["pct_complete"] %>%
+        <div class="progress" class="mb-0">
+          <div class="progress-bar" role="progressbar" aria-valuenow="<%= container["pct_complete"].to_i %>" aria-valuemin="0" aria-valuemax="100">
+            <div class="progress-percentage">
+              <%= container["pct_complete"].to_i %>%
             </div>
-          <% end %>
+          </div>
         </div>
       </td>
-      <td style='text-align: center; white-space: nowrap;'>
-        <% if container["elapsed"] %>
-          <%= ChronicDuration.output(container["elapsed"].to_i, :weeks => true, :units => 2) %>
+      <td class='center nowrap'>
+        <% unless container["elapsed"].nil? %>
+          <%= ChronicDuration.output(container["elapsed"].to_i, :weeks => true, :units => 2) || '0 secs' %>
         <% end %>
       </td>
-      <td style='text-align: center; white-space: nowrap;'>
+      <td class='center nowrap'>
         <% if container["eta"] %>
           <%= ChronicDuration.output(container["eta"].to_i, :weeks => true, :units => 2) %>
         <% end %>
@@ -148,7 +92,7 @@ function setPerPage(select){
   <% end %>
   <% if @statuses.empty? %>
     <tr>
-      <td colspan="6"></td>
+      <td colspan="8"></td>
     </tr>
   <% end %>
 </table>

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-status
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 4.0.0
 platform: ruby
 authors:
 - Evgeniy Tsvigun
 - Kenaniah Cerny
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -17,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +44,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: irb
+  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'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +170,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+- !ruby/object:Gem::Dependency
+  name: webrick
+  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'
+- !ruby/object:Gem::Dependency
+  name: rack-session
+  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'
 email:
 - utgarda@gmail.com
 - kenaniah@gmail.com
@@ -137,21 +205,30 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/Dockerfile"
+- ".devcontainer/README.md"
+- ".devcontainer/devcontainer.json"
+- ".devcontainer/docker-compose.yml"
 - ".github/workflows/ci.yaml"
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".rspec"
 - Appraisals
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/sidekiq_6.1.gemfile
-- gemfiles/sidekiq_6.x.gemfile
+- docker-compose.yml
+- gemfiles/sidekiq_7.0.gemfile
+- gemfiles/sidekiq_7.3.gemfile
 - gemfiles/sidekiq_7.x.gemfile
+- gemfiles/sidekiq_8.0.gemfile
+- gemfiles/sidekiq_8.x.gemfile
 - lib/sidekiq-status.rb
 - lib/sidekiq-status/client_middleware.rb
+- lib/sidekiq-status/helpers.rb
 - lib/sidekiq-status/redis_adapter.rb
 - lib/sidekiq-status/redis_client_adapter.rb
 - lib/sidekiq-status/server_middleware.rb
@@ -171,6 +248,9 @@ files:
 - spec/lib/sidekiq-status_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_jobs.rb
+- spec/test_environment.rb
+- web/assets/statuses.css
+- web/assets/statuses.js
 - web/sidekiq-status-single-web.png
 - web/sidekiq-status-web.png
 - web/views/status.erb
@@ -180,7 +260,6 @@ homepage: https://github.com/kenaniah/sidekiq-status
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -188,15 +267,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: An extension to the sidekiq message processing to track your jobs
 test_files:
@@ -209,3 +287,4 @@ test_files:
 - spec/lib/sidekiq-status_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_jobs.rb
+- spec/test_environment.rb