que-web 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 70f3a29ddd4f76bdfb0a2aa84d663874366639a4
-  data.tar.gz: e6887380327c8e50a8a4e3aeb682d4d7408c81f9
+SHA256:
+  metadata.gz: 47ad5fd3031d35ffde2d864982d7f7d044b3fd2bc193f8922a9bad7ab71784a6
+  data.tar.gz: eca71d27a53c880ba3b1d7fd389556d675badf38b5e91631dff93e1f17eb7652
 SHA512:
-  metadata.gz: 90343c4a7898f6085ae331a3062006032ff299704431f6e255818b9325423c54902df5f52191574bd840617953e1b6a21477083ca7c47f8922c6cd82403e6025
-  data.tar.gz: e2b62a44728afe7c43c3d5f14fc873e3c090c792de35a589d7c1dc57df98b2bee8808bd61b88b6d4ed26cf9f4cf8a7ff25597e420fb10a0a3a78e9040a4698e1
+  metadata.gz: d5e19332be846121014c41f85fb5d86bb5bb672745f136e2e9e5bfd75c36a5c39bbfe68711f8b51e8c7db578adfd1106f4a415acf76f5387e7f4421de4ead8b5
+  data.tar.gz: c0511bdd77dfad2284ee0781b52e51392df33dd62856ccd99b27beb09360430abb6df9ce92ea5a2e44df5477b1d2b2032bcb6d8a3f346b3ddb7e75d91719c350

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ### Unreleased
 
+### 0.8 - 2018-09-21
+
+#### Compatibility with 1.0.0.beta3 Que:
+- Changed job_id to id
+- Removed pg_* attributes
+
 ### 0.7.1 - 2018-03-02
 
 #### Fixed:

data/lib/que/web.rb

@@ -20,7 +20,7 @@ module Que
     end
 
     get "/running" do
-      worker_states = search_running Que.worker_states
+      worker_states = search_running Que.job_states
       pager = get_pager worker_states.count
       @list = Viewmodels::JobList.new(worker_states, pager)
       erb :running
@@ -28,7 +28,7 @@ module Que
 
     get "/failing" do
       stats = Que.execute SQL[:dashboard_stats], [search]
-      pager = get_pager stats[0]["failing"]
+      pager = get_pager stats[0][:failing]
       failing_jobs = Que.execute SQL[:failing_jobs], [pager.page_size, pager.offset, search]
       @list = Viewmodels::JobList.new(failing_jobs, pager)
       erb :failing
@@ -36,9 +36,8 @@ module Que
 
     get "/scheduled" do
       stats = Que.execute SQL[:dashboard_stats], [search]
-      pager = get_pager stats[0]["scheduled"]
+      pager = get_pager stats[0][:scheduled]
       scheduled_jobs = Que.execute SQL[:scheduled_jobs], [pager.page_size, pager.offset, search]
-
       @list = Viewmodels::JobList.new(scheduled_jobs, pager)
       erb :scheduled
     end
@@ -62,9 +61,7 @@ module Que
       job_id = id.to_i
       if job_id > 0
         run_at = Time.now
-
         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"
@@ -163,7 +160,7 @@ module Que
 
       def search_running(jobs)
         return jobs unless search_param
-        jobs.select { |job| job.fetch('job_class').include? search_param }
+        jobs.select { |job| job.fetch(:job_class).include? search_param }
       end
 
       def search_param
@@ -183,8 +180,8 @@ module Que
       end
 
       def format_error(job)
-        return unless job.last_error
-        line = job.last_error.lines.first || ''
+        return unless job.last_error_message
+        line = job.last_error_message.lines.first || ''
         truncate line, 30
       end
 

data/lib/que/web/sql.rb

@@ -1,17 +1,17 @@
 lock_job_sql = <<-SQL.freeze
-    SELECT job_id, pg_try_advisory_lock(job_id) AS locked
+    SELECT id, pg_try_advisory_lock(id) AS locked
     FROM que_jobs
-    WHERE job_id = $1::bigint
+    WHERE id = $1::bigint
 SQL
 
 lock_all_failing_jobs_sql = <<-SQL.freeze
-    SELECT job_id, pg_try_advisory_lock(job_id) AS locked
+    SELECT id, pg_try_advisory_lock(id) AS locked
     FROM que_jobs
     WHERE error_count > 0
 SQL
 
 lock_all_scheduled_jobs_sql = <<-SQL.freeze
-    SELECT job_id, pg_try_advisory_lock(job_id) AS locked
+    SELECT id, pg_try_advisory_lock(id) AS locked
     FROM que_jobs
     WHERE error_count = 0
 SQL
@@ -23,8 +23,8 @@ def reschedule_all_jobs_query(scope)
     SET run_at = $1::timestamptz
     FROM target
     WHERE target.locked
-    AND target.job_id = que_jobs.job_id
-    RETURNING pg_advisory_unlock(target.job_id)
+    AND target.id = que_jobs.id
+    RETURNING pg_advisory_unlock(target.id)
   SQL
 end
 
@@ -34,8 +34,8 @@ def delete_jobs_query(scope)
     DELETE FROM que_jobs
     USING target
     WHERE target.locked
-    AND target.job_id = que_jobs.job_id
-    RETURNING pg_advisory_unlock(target.job_id)
+    AND target.id = que_jobs.id
+    RETURNING pg_advisory_unlock(target.id)
   SQL
 end
 
@@ -50,7 +50,7 @@ Que::Web::SQL = {
       SELECT (classid::bigint << 32) + objid::bigint AS job_id
       FROM pg_locks
       WHERE locktype = 'advisory'
-    ) locks USING (job_id)
+    ) locks ON (que_jobs.id=locks.job_id)
     WHERE
       job_class LIKE ($1)
   SQL
@@ -61,7 +61,7 @@ Que::Web::SQL = {
       SELECT (classid::bigint << 32) + objid::bigint AS job_id
       FROM pg_locks
       WHERE locktype = 'advisory'
-    ) locks USING (job_id)
+    ) 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
     LIMIT $1::int
@@ -74,7 +74,7 @@ Que::Web::SQL = {
       SELECT (classid::bigint << 32) + objid::bigint AS job_id
       FROM pg_locks
       WHERE locktype = 'advisory'
-    ) locks USING (job_id)
+    ) 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
     LIMIT $1::int
@@ -89,15 +89,15 @@ Que::Web::SQL = {
     SET run_at = $2::timestamptz
     FROM target
     WHERE target.locked
-    AND target.job_id = que_jobs.job_id
-    RETURNING pg_advisory_unlock(target.job_id)
+    AND target.id = que_jobs.id
+    RETURNING pg_advisory_unlock(target.id)
   SQL
   reschedule_all_scheduled_jobs: reschedule_all_jobs_query(lock_all_scheduled_jobs_sql),
   reschedule_all_failing_jobs: reschedule_all_jobs_query(lock_all_failing_jobs_sql),
   fetch_job: <<-SQL.freeze,
     SELECT *
     FROM que_jobs
-    WHERE job_id = $1::bigint
+    WHERE id = $1::bigint
     LIMIT 1
   SQL
 }.freeze

data/lib/que/web/viewmodels/dashboard.rb

@@ -2,7 +2,7 @@ module Que::Web::Viewmodels
   class Dashboard < Struct.new(:running, :scheduled, :failing)
     def initialize(stats)
       members.each do |m|
-        self[m] = stats[m.to_s]
+        self[m] = stats[m]
       end
     end
   end

data/lib/que/web/viewmodels/job.rb

@@ -1,13 +1,12 @@
 module Que::Web::Viewmodels
   class Job < Struct.new(
-    :args, :error_count, :job_class, :job_id, :last_error,
-    :pg_backend_pid, :pg_last_query, :pg_last_query_started_at, :pg_state,
-    :pg_state_changed_at, :pg_transaction_started_at, :pg_waiting_on_lock,
-    :priority, :queue, :run_at)
+      :priority, :run_at, :id, :job_class, :error_count, :last_error_message,
+      :queue, :last_error_backtrace, :finished_at, :expired_at, :args, :data,
+      :backend_pid)
 
     def initialize(job)
       members.each do |m|
-        self[m] = job[m.to_s]
+        self[m] = job[m]
       end
     end
 

data/que-web.gemspec

@@ -4,9 +4,9 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "que-web"
-  spec.version       = "0.7.2"
-  spec.authors       = ["Jason Staten"]
-  spec.email         = ["jstaten07@gmail.com"]
+  spec.version       = "0.8.0"
+  spec.authors       = ["Jason Staten", "Bruno Porto"]
+  spec.email         = ["jstaten07@gmail.com", "brunotporto@gmail.com"]
   spec.summary       = %q{A web interface for the que queue}
   spec.description   = %q{A web interface for the que queue}
   spec.homepage      = "https://github.com/statianzo/que-web"
@@ -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", "~> 0.8"
+  spec.add_dependency "que", "~> 1.0.0.beta3"
   spec.add_dependency "sinatra"
   spec.add_dependency "erubis"
 

data/spec/viewmodels/dashboard_spec.rb

@@ -3,10 +3,10 @@ require "spec_helper"
 describe Que::Web::Viewmodels::Dashboard do
   let(:dashboard_stats) {
     {
-      "total" => 10,
-      "running" => 6,
-      "failing" => 2,
-      "scheduled" => 2
+      total: 10,
+      running: 6,
+      failing: 2,
+      scheduled: 2
     }
   }
   let(:subject) { Que::Web::Viewmodels::Dashboard.new(dashboard_stats) }

data/spec/viewmodels/job_list_spec.rb

@@ -2,12 +2,13 @@ require "spec_helper"
 
 describe Que::Web::Viewmodels::JobList do
   let(:job) {
-    {"priority"=>100, "run_at"=> Time.now,
-     "job_id"=>555, "job_class"=>"SuccessJob",
-     "args"=>["arg1", {"name"=>"foo", "age"=>10}],
-     "error_count"=>0,
-     "last_error"=>nil,
-     "queue"=>"foo"
+    {priority: 100, run_at: Time.now,
+     id: 555, job_class: "SuccessJob",
+     args: ["arg1", {name: "foo", age: 10}],
+     error_count: 0,
+     last_error_message: nil,
+     last_error_backtrace: nil,
+     queue: "foo"
     }
   }
   let(:pager) { Que::Web::Pager.new(1,10,105) }

data/spec/viewmodels/job_spec.rb

@@ -2,19 +2,20 @@ require "spec_helper"
 
 describe Que::Web::Viewmodels::Job do
   let(:source_job) {
-    {"priority"=>100, "run_at"=> Time.now - 3600,
-     "job_id"=>555, "job_class"=>"SuccessJob",
-     "args"=>["arg1", {"name"=>"foo", "age"=>10}],
-     "error_count"=>0,
-     "last_error"=>nil,
-     "queue"=>"foo"
+    {priority: 100, run_at:  Time.now - 3600,
+     job_id: 555, job_class: "SuccessJob",
+     args: ["arg1", {name: "foo", age: 10}],
+     error_count: 0,
+     last_error_message: nil,
+     last_error_backtracd: nil,
+     queue: "foo"
     }
   }
   let(:subject) { Que::Web::Viewmodels::Job.new(source_job) }
 
   it 'maps fields from source' do
-    subject.priority.must_equal source_job["priority"]
-    subject.queue.must_equal source_job["queue"]
+    subject.priority.must_equal source_job[:priority]
+    subject.queue.must_equal source_job[:queue]
   end
 
   describe 'schedule' do

data/spec/web_spec.rb

@@ -16,7 +16,7 @@ describe Que::Web::Helpers do
   end
 
   def error_job(last_error)
-    Que::Web::Viewmodels::Job.new('last_error' => last_error)
+    Que::Web::Viewmodels::Job.new(last_error_message: last_error)
   end
 
   describe '#format_error' do
@@ -36,10 +36,10 @@ describe Que::Web::Helpers do
   describe '#search_running' do
     let(:jobs) do
       [
-        { 'job_class' => 'JobClassA' },
-        { 'job_class' => 'JobClassB' },
-        { 'job_class' => 'JobClassA2' },
-        { 'job_class' => 'JobClassC' }
+        { job_class: 'JobClassA' },
+        { job_class: 'JobClassB' },
+        { job_class: 'JobClassA2' },
+        { job_class: 'JobClassC' }
       ]
     end
 
@@ -65,8 +65,8 @@ describe Que::Web::Helpers do
       it 'returns only the jobs whose class matches the search' do
         subject.search_running(jobs).must_equal(
           [
-            { 'job_class' => 'JobClassA' },
-            { 'job_class' => 'JobClassA2' }
+            { job_class: 'JobClassA' },
+            { job_class: 'JobClassA2' }
           ]
         )
       end

data/web/views/_navbar.erb

@@ -11,7 +11,7 @@
     <li class="<%= active_class('failing') %>"><a href="<%= link_to 'failing' %>"><span>Failing</span></a></li>
   </ul>
   <ul class="right version">
-    <li>Que <%= Que::Version %></li>
+    <li>Que <%= Que::VERSION %></li>
     <li><%= Time.now.utc.strftime("%D %H:%M:%S %Z") %></li>
   </ul>
 </section>

data/web/views/_search.erb

@@ -1,7 +1,7 @@
 <form class="search" action="<%= request.path %>" method="get">
   <div class="row collapse">
     <div class="small-8 columns">
-      <input type="text" name="search" value="<%= search_param %>" />
+      <input type="text" name="search" value="<%= search_param %>", placeholder="Job Class Name" />
     </div>
     <div class="small-4 columns">
       <button class="button postfix">Search</button>

data/web/views/failing.erb

@@ -24,7 +24,7 @@
       <tbody>
         <% @list.page_jobs.each do |job| %>
           <tr>
-            <td><a href="<%= link_to "jobs/#{job.job_id}" %>">
+            <td><a href="<%= link_to "jobs/#{job.id}" %>">
               <%== relative_time job.run_at %></a>
               <%== erb :_past_due, locals: {job: job} %>
             </td>
@@ -34,13 +34,13 @@
             <td><pre><%= format_args job %></pre></td>
             <td><%= format_error job %></pre></td>
             <td>
-              <form action="<%= link_to "jobs/#{job.job_id}" %>" method="post">
+              <form action="<%= link_to "jobs/#{job.id}" %>" method="post">
                 <input type="hidden" name="_method" value="put" />
                 <button class="plain" title="Retry Immediately"><i class="fa fa-refresh"></i></button>
               </form>
             </td>
             <td>
-              <form action="<%= link_to "jobs/#{job.job_id}" %>" method="post">
+              <form action="<%= link_to "jobs/#{job.id}" %>" method="post">
                 <input type="hidden" name="_method" value="delete" />
                 <button class="plain" title="Delete"><i class="fa fa-trash"></i></button>
               </form>

data/web/views/running.erb

@@ -20,7 +20,7 @@
       <tbody>
         <% @list.page_jobs.each do |job| %>
           <tr>
-            <td><%== relative_time job.pg_state_changed_at %></td>
+            <td><%== relative_time job.run_at %></td>
             <td><%= job.job_class %></td>
             <td><%= job.queue %></td>
             <td><pre><%= job.args.map(&:inspect).join(', ') %></pre></td>

data/web/views/scheduled.erb

@@ -23,20 +23,20 @@
         <% @list.page_jobs.each do |job| %>
           <tr>
             <td>
-              <a href="<%= link_to "jobs/#{job.job_id}" %>"><%== relative_time job.run_at %></a>
+              <a href="<%= link_to "jobs/#{job.id}" %>"><%== relative_time job.run_at %></a>
               <%== erb :_past_due, locals: {job: job}%>
             </td>
             <td><%= job.job_class %></td>
             <td><%= job.queue %></td>
             <td><pre><%= format_args job %></pre></td>
             <td>
-              <form action="<%= link_to "jobs/#{job.job_id}" %>" method="post">
+              <form action="<%= link_to "jobs/#{job.id}" %>" method="post">
                 <input type="hidden" name="_method" value="put" />
                 <button class="plain" title="Run Immediately"><i class="fa fa-play-circle"></i></button>
               </form>
             </td>
             <td>
-              <form action="<%= link_to "jobs/#{job.job_id}" %>" method="post">
+              <form action="<%= link_to "jobs/#{job.id}" %>" method="post">
                 <input type="hidden" name="_method" value="delete" />
                 <button class="plain" title="Delete"><i class="fa fa-trash"></i></button>
               </form>

data/web/views/show.erb

@@ -1,6 +1,6 @@
 <div class="row">
   <div class="small-12 columns">
-    <h1>Job <%= @job.job_id %></h1>
+    <h1>Job <%= @job.id %></h1>
   </div>
 </div>
 <div class="row">
@@ -36,7 +36,10 @@
         </tr>
         <tr>
           <th>Last Error</th>
-          <td><pre><%= @job.last_error %></pre></td>
+          <td>
+            <pre><%= @job.last_error_message %></pre>
+            <pre><%= @job.last_error_backtrace %></pre>
+          </td>
         </tr>
       </tbody>
     </table>
@@ -44,11 +47,11 @@
 </div>
 <div class="row">
   <div class="small-12 columns">
-    <form class="form-inline" action="<%= link_to "/jobs/#{@job.job_id}" %>" method="post">
+    <form class="form-inline" action="<%= link_to "/jobs/#{@job.id}" %>" method="post">
       <input type="hidden" name="_method" value="put" />
       <button><i class="fa fa-play-circle"></i> Run Immediately</button>
     </form>
-    <form class="form-inline" maction="<%= link_to "/jobs/#{@job.job_id}" %>" method="post">
+    <form class="form-inline" maction="<%= link_to "/jobs/#{@job.id}" %>" method="post">
       <input type="hidden" name="_method" value="Delete" />
       <button class="button alert"><i class="fa fa-trash"></i> Delete</button>
     </form>

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: que-web
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Jason Staten
+- Bruno Porto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: que
@@ -16,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 1.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 1.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +98,7 @@ dependencies:
 description: A web interface for the que queue
 email:
 - jstaten07@gmail.com
+- brunotporto@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -178,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A web interface for the que queue