que-web 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5d0822590ed95eae50f53e560a7bb684fc88327
-  data.tar.gz: bace56f4a38d819d5b6a54253ba637e8f14660bc
+  metadata.gz: e462dea7156e236045867d2dc8738e060f62517d
+  data.tar.gz: 8d01b77c484316f7b34a4dff2f0c61d432fbe92e
 SHA512:
-  metadata.gz: 9ce5decd963f58bb67363dadd7faaf4cace6a6f552c0f842e76e0ea6e27288a50cd1e012f47d7b6df5e9560b1ec39b760b5175351b015da01fa87fce8791115c
-  data.tar.gz: c10020a7a740268d5352fca93f93fa2cfa579135e4424224918ca74f56f5a1bb5e59c221c4480b51ec62bacec24e6d501ecc70f05ac405e0cd2f133a28d3a78d
+  metadata.gz: dcb503d51659fcded547811282f5bee869312fc17a2006bcb36da240fcea46fb1c6de959832620c4d17b2154d8f427cb9c5d4ae1e1ea2263561551a938fbd2ed
+  data.tar.gz: b8a3383ffec238ec16c63a07d7a78f02b306ed12482c45eba53c8a3bd564efb95a6db50c143c496b4f22a115edda3d729fbc982a3ec7db094d4558bc0d706655

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 0.4.0 - 2015-04-09
+#### Added:
+- Indicate when a job is past due #2
+
+#### Fixed:
+- Fix clipping of pagination buttons #11
+- Turn time string into time object #13
+
+
 ### 0.3.2 - 2014-12-05
 #### Fixed:
 - Fix escaping on pagination controls #10

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014, Jason Staten
+Copyright (c) 2014 - 2015, Jason Staten
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -1,4 +1,4 @@
-# que-web ![Travis](https://travis-ci.org/statianzo/que-web.svg)
+# que-web [![Build Status](https://travis-ci.org/statianzo/que-web.svg?branch=master)](https://travis-ci.org/statianzo/que-web)
 
 que-web is a web UI to the [Que](https://github.com/chanks/que) job queue.
 

data/examples/rack/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    que-web (0.3.1)
+    que-web (0.3.2)
       erubis
       que (~> 0.8)
       sinatra
@@ -10,12 +10,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     erubis (2.7.0)
-    pg (0.17.1)
-    que (0.8.2)
-    rack (1.5.2)
+    pg (0.18.1)
+    que (0.9.1)
+    rack (1.6.0)
     rack-protection (1.5.3)
       rack
-    sequel (4.16.0)
+    sequel (4.19.0)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)

data/lib/que/web.rb

@@ -109,6 +109,9 @@ module Que
       end
 
       def relative_time(time)
+        if time.is_a?(String)
+          time = Time.parse(time)
+        end
         %{<time class="timeago" datetime="#{time.utc.iso8601}">#{time.utc}</time>}
       end
 

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

@@ -10,5 +10,9 @@ module Que::Web::Viewmodels
         self[m] = job[m.to_s]
       end
     end
+
+    def past_due?(relative_to = Time.now)
+      run_at < relative_to
+    end
   end
 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.3.2"
+  spec.version       = "0.4.0"
   spec.authors       = ["Jason Staten"]
   spec.email         = ["jstaten07@gmail.com"]
   spec.summary       = %q{A web interface for the que queue}

data/spec/viewmodels/job_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Que::Web::Viewmodels::Job do
   let(:source_job) {
-    {"priority"=>100, "run_at"=> Time.now,
+    {"priority"=>100, "run_at"=> Time.now - 3600,
      "job_id"=>555, "job_class"=>"SuccessJob",
      "args"=>["arg1", {"name"=>"foo", "age"=>10}],
      "error_count"=>0,
@@ -16,4 +16,15 @@ describe Que::Web::Viewmodels::Job do
     subject.priority.must_equal source_job["priority"]
     subject.queue.must_equal source_job["queue"]
   end
+
+  describe 'schedule' do
+    it 'is past due when run_at is behind' do
+      subject.must_be :past_due?
+    end
+
+    it 'is not past due when run_at is ahead of now' do
+      subject.run_at = Time.now + 3600
+      subject.wont_be :past_due?
+    end
+  end
 end

data/web/public/styles/application.css

@@ -60,3 +60,14 @@ pre {
   white-space: pre-wrap;
   word-wrap: break-word;
 }
+
+.version li {
+  padding: 0 15px;
+  line-height: 45px;
+  color: #999999;
+  font-size: 0.8125rem;
+}
+
+i.subtle {
+  color: #999999;
+}

data/web/views/_navbar.erb

@@ -10,5 +10,9 @@
     <li class="<%= active_class('scheduled') %>"><a href="<%= to 'scheduled' %>"><span>Scheduled</span></a></li>
     <li class="<%= active_class('failing') %>"><a href="<%= to 'failing' %>"><span>Failing</span></a></li>
   </ul>
+  <ul class="right version">
+    <li>Que <%= Que::Version %></li>
+    <li><%= Time.now.utc.strftime("%D %H:%M:%S %Z") %></li>
+  </ul>
 </section>
 </nav>

data/web/views/_past_due.erb

@@ -0,0 +1,5 @@
+<% if job.past_due? %>
+  <span title="Job is past due">
+    <i class="fa fa-clock-o subtle"></i>
+  </span>
+<% end %>

data/web/views/failing.erb

@@ -21,7 +21,10 @@
       <tbody>
         <% @list.page_jobs.each do |job| %>
           <tr>
-            <td><a href="<%= to "jobs/#{job.job_id}" %>"><%== relative_time job.run_at %></a></td>
+            <td><a href="<%= to "jobs/#{job.job_id}" %>">
+              <%== relative_time job.run_at %></a>
+              <%== erb :_past_due, locals: {job: job} %>
+            </td>
             <td><%= job.error_count %></td>
             <td><%= job.job_class %></td>
             <td><%= job.queue %></td>

data/web/views/layout.erb

@@ -10,7 +10,6 @@
   <%== erb :_navbar %>
   <%== erb :_flash %>
   <%== yield %>
-  <%== erb :_footer %>
   <script src="<%= root_path %>js/jquery.min.js"></script>
   <script src="<%= root_path %>js/jquery.timeago.min.js"></script>
   <script>

data/web/views/scheduled.erb

@@ -19,7 +19,10 @@
       <tbody>
         <% @list.page_jobs.each do |job| %>
           <tr>
-            <td><a href="<%= to "jobs/#{job.job_id}" %>"><%== relative_time job.run_at %></a></td>
+            <td>
+              <a href="<%= to "jobs/#{job.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>

data/web/views/show.erb

@@ -21,7 +21,10 @@
         </tr>
         <tr>
           <th>Run At</th>
-          <td><%== relative_time @job.run_at %></td>
+          <td>
+            <%== relative_time @job.run_at %>
+            <%== erb :_past_due, locals: {job: @job} %>
+          </td>
         </tr>
         <tr>
           <th>Failures</th>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-web
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Jason Staten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: que
@@ -147,9 +147,9 @@ files:
 - web/public/styles/foundation.min.css
 - web/public/styles/normalize.css
 - web/views/_flash.erb
-- web/views/_footer.erb
 - web/views/_navbar.erb
 - web/views/_pager.erb
+- web/views/_past_due.erb
 - web/views/failing.erb
 - web/views/index.erb
 - web/views/layout.erb

data/web/views/_footer.erb

@@ -1,10 +0,0 @@
-<footer class="footer">
-  <div class="row">
-    <div class="small-12 columns">
-      <ul class="right inline-list">
-        <li>Que <%= Que::Version %></li>
-        <li><%= Time.now.utc.strftime("%D %H:%M:%S %Z") %></li>
-      </ul>
-    </div>
-  </div>
-</footer>