que-web 0.9.1 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f5e06bded6cf5319e09f634fe0809caf7641d70d
-  data.tar.gz: a406e5ba28ce34b545be8fb6b57ad33f61a5c83d
+SHA256:
+  metadata.gz: 53df036811b3eda332469ccbb064fa0ce0ef6115a5c1e4be7bea8dae18adf612
+  data.tar.gz: 6e8855009352f7b0199fdbaf167ac38ad36655dce35f02aba95f1198ef1a4fba
 SHA512:
-  metadata.gz: 81b2db6fcda3a58c41c728df545e3ba337e61dc2a4d468ba697bca8950ab52db6607adf37cb8d0701bfdbd12bfafcbee85dff313c0fbe09016caa10904070547
-  data.tar.gz: 916b183b6e4c1f293d53094170cc640f8cf06fb330a9c6d710baa494bde0410a8ebdc1cbd2e5aa06a6d13659be3e4ef141fcc70796b25168fd9a5afed8767467
+  metadata.gz: a6e848926b6f28e94f119ecf888ba1b1cf10d895b77a196f68caa9f9823766eaa426bc68892b84dfd3ab42364b8f3b6ea10f897b6fb72a82b403fcc6d0897bbf
+  data.tar.gz: 847907469ccc57d2873b72de4d7c0af552358242757cb47c9187d3ca506feb00721c1f475f3c5f6648e373a9ed2b525ec206d87942fa15a844d3c0665bf48332

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+### Unreleased
+#### Fixed:
+- Fixed inconsistent pagination when several jobs have the same `run_at`
+
+### 0.9.3 - 2020-06-17
+#### Added:
+- Set expired_at=NULL when rescheduling job
+- Make job search case-insensitive
+- Allow to search by ActiveJob class name
+
+### 0.9.2 - 2020-04-24
+#### Fixed:
+- Fixed rendering "running" page
+- Fixed displaying relative time on "failing" page
+
 ### 0.9.1 - 2020-04-01
 #### Fixed:
 - Fixed rendering HTML

data/docker/Gemfile.lock

@@ -4,13 +4,13 @@ GEM
     erubis (2.7.0)
     mustermann (1.0.3)
     pg (1.0.0)
-    puma (3.12.3)
+    puma (3.12.6)
     que (0.14.2)
     que-web (0.7.0)
       erubis
       que (~> 0.8)
       sinatra
-    rack (2.0.8)
+    rack (2.2.3)
     rack-protection (2.0.7)
       rack
     sequel (5.5.0)

data/examples/rack/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    que-web (0.9.0)
+    que-web (0.9.3)
       que (~> 1.0.0.beta3)
       sinatra
 
@@ -12,11 +12,11 @@ GEM
       ruby2_keywords (~> 0.0.1)
     pg (1.2.3)
     que (1.0.0.beta4)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-protection (2.0.8.1)
       rack
     ruby2_keywords (0.0.2)
-    sequel (5.30.0)
+    sequel (5.31.0)
     sinatra (2.0.8.1)
       mustermann (~> 1.0)
       rack (~> 2.0)

data/lib/que/web/sql.rb

@@ -20,7 +20,8 @@ def reschedule_all_jobs_query(scope)
   <<-SQL.freeze
     WITH target AS (#{scope})
     UPDATE que_jobs
-    SET run_at = $1::timestamptz
+    SET run_at = $1::timestamptz,
+        expired_at = NULL
     FROM target
     WHERE target.locked
     AND target.id = que_jobs.id
@@ -52,7 +53,8 @@ Que::Web::SQL = {
       WHERE locktype = 'advisory'
     ) locks ON (que_jobs.id=locks.job_id)
     WHERE
-      job_class LIKE ($1)
+      job_class ILIKE ($1)
+      OR que_jobs.args #>> '{0, job_class}' ILIKE ($1)
   SQL
   failing_jobs: <<-SQL.freeze,
     SELECT que_jobs.*
@@ -62,8 +64,13 @@ Que::Web::SQL = {
       FROM pg_locks
       WHERE locktype = 'advisory'
     ) locks ON (que_jobs.id=locks.job_id)
-    WHERE locks.job_id IS NULL AND error_count > 0 AND job_class LIKE ($3)
-    ORDER BY run_at
+    WHERE locks.job_id IS NULL
+      AND error_count > 0
+      AND (
+        job_class ILIKE ($3)
+        OR que_jobs.args #>> '{0, job_class}' ILIKE ($3)
+      )
+    ORDER BY run_at, id
     LIMIT $1::int
     OFFSET $2::int
   SQL
@@ -75,8 +82,13 @@ Que::Web::SQL = {
       FROM pg_locks
       WHERE locktype = 'advisory'
     ) locks ON (que_jobs.id=locks.job_id)
-    WHERE locks.job_id IS NULL AND error_count = 0 AND job_class LIKE ($3)
-    ORDER BY run_at
+    WHERE locks.job_id IS NULL
+      AND error_count = 0
+      AND (
+        job_class ILIKE ($3)
+        OR que_jobs.args #>> '{0, job_class}' ILIKE ($3)
+      )
+    ORDER BY run_at, id
     LIMIT $1::int
     OFFSET $2::int
   SQL
@@ -86,7 +98,8 @@ Que::Web::SQL = {
   reschedule_job: <<-SQL.freeze,
     WITH target AS (#{lock_job_sql})
     UPDATE que_jobs
-    SET run_at = $2::timestamptz
+    SET run_at = $2::timestamptz,
+        expired_at = NULL
     FROM target
     WHERE target.locked
     AND target.id = que_jobs.id

data/lib/que/web.rb

@@ -63,7 +63,7 @@ module Que
         updated_rows = Que.execute SQL[:reschedule_job], [job_id, run_at]
         if updated_rows.empty?
           # Didn't get the advisory lock
-          set_flash "warning", "Job #{job_id} not rescheduled as it was already runnning"
+          set_flash "warning", "Job #{job_id} not rescheduled as it was already running"
         else
           set_flash "info", "Job #{job_id} rescheduled for #{run_at}"
         end
@@ -101,7 +101,7 @@ module Que
 
         if updated_rows.empty?
           # Didn't get the advisory lock
-          set_flash "warning", "Job #{job_id} not deleted as it was already runnning"
+          set_flash "warning", "Job #{job_id} not deleted as it was already running"
         else
           set_flash "info", "Job #{job_id} deleted"
         end

data/que-web.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "que-web"
-  spec.version       = "0.9.1"
+  spec.version       = "0.9.4"
   spec.authors       = ["Jason Staten", "Bruno Porto"]
   spec.email         = ["jstaten07@gmail.com", "brunotporto@gmail.com"]
   spec.summary       = %q{A web interface for the que queue}
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "que", "~> 1.0.0.beta3"
+  spec.add_dependency "que", "~> 1"
   spec.add_dependency "sinatra"
 
   spec.add_development_dependency "bundler", ">= 1.6"

data/web/views/failing.erb

@@ -25,7 +25,7 @@
         <% @list.page_jobs.each do |job| %>
           <tr>
             <td><a href="<%= link_to "jobs/#{job.id}" %>">
-              <%= h relative_time job.run_at %></a>
+              <%= relative_time job.run_at %></a>
               <%= erb :_past_due, locals: {job: job} %>
             </td>
             <td><%= job.error_count %></td>

data/web/views/running.erb

@@ -20,10 +20,12 @@
       <tbody>
         <% @list.page_jobs.each do |job| %>
           <tr>
-            <td><%= relative_time job.run_at %></td>
+            <td>
+              <a href="<%= link_to "jobs/#{job.id}" %>"><%= relative_time job.run_at %></a>
+            </td>
             <td><%= h job.humanized_job_class %></td>
             <td><%= job.queue %></td>
-            <td><pre><%= h job.args %></pre></td>
+            <td><pre><%= h format_args(job) %></pre></td>
           </tr>
         <% end %>
       </tbody>

data/web/views/scheduled.erb

@@ -24,7 +24,7 @@
           <tr>
             <td>
               <a href="<%= link_to "jobs/#{job.id}" %>"><%= relative_time job.run_at %></a>
-              <%= erb :_past_due, locals: {job: job}%>
+              <%= erb :_past_due, locals: {job: job} %>
             </td>
             <td><%= h job.humanized_job_class %></td>
             <td><%= h job.queue %></td>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: que-web
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.4
 platform: ruby
 authors:
 - Jason Staten
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: que
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -161,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A web interface for the que queue