qujo 0.1.0 → 0.1.1

data/app/assets/javascripts/qujo/qujo.js

@@ -1,51 +1,77 @@
 var interval = null;
-function updateStatus() {
-    console.log("update status");
-
-    var q = $("#qujo_status").first();
-    q.addClass('label-inverse');
-    console.log("status: get");
-
-    $.get("/jobs/status", function (d) {
-        console.log("status: return");
-        q.removeClass('label-inverse');
-        q.removeClass("label-important");
-
-        var j = $("#jobs_status").first();
-        j.removeClass("badge-important");
-        j.text(d["jobs"]["count"]);
-        if (d["jobs"]["error"]) {
-            q.addClass("label label-important");
-            j.addClass("badge-important")
-        }
+$(function () {
+    var queuestatus = $("#qujo_status").first();
+    var jobstatus = $("#jobs_status").first();
+    var resqstatus = $("#resque_status").first();
+    function qRun(){
+        queuestatus.addClass('label-inverse');
+    }
+    function qStop(){
+        queuestatus.removeClass('label-inverse');
+    }
+    function qFine(){
+        queuestatus.removeClass("label-important");
+    }
+    function qError(){
+        queuestatus.addClass("label-important");
+    }
+    function jFine(){
+        jobstatus.removeClass("badge-important");
+    }
+    function jError(){
+        jobstatus.addClass("badge-important");
+    }
+    function jText(v){
+        jobstatus.text(v);
+    }
+    function rFine(){
+        resqstatus.removeClass("badge-important");
+    }
+    function rError(){
+        resqstatus.addClass("badge-important");
+    }
+    function rText(v){
+        resqstatus.text(v);
+    }
 
-        var r = $("#resque_status").first();
-        r.removeClass("badge-important");
-        r.text(d["resque"]["count"]);
-        if (d["resque"]["error"]) {
-            q.addClass("label-important");
-            r.addClass("badge-important")
-        }
-    }).fail(function(d){
-            var q = $("#qujo_status").first();
+    function updateStatus() {
+        console.log("update status");
+        qRun();
 
-            var j = $("#jobs_status").first();
-            j.addClass("badge-important");
-            j.text('?');
+        console.log("status: get");
+        $.get("/jobs/status",function (d) {
+            console.log("status: return");
+            qStop();
+            qFine();
 
-            var r = $("#resque_status").first();
-            r.addClass("badge-important");
-            r.text('?');
+            jFine();
+            jText(d["jobs"]["count"]);
 
-            q.addClass("label-important");
+            if (d["jobs"]["error"]) {
+                qError();
+                jError();
+            }
 
-            console.log("disable interval");
-            clearInterval(interval);
-    });
-}
+            rFine();
+            rText(d["resque"]["count"]);
+            if (d["resque"]["error"]) {
+                qError();
+                rError();
+            }
+        }).fail(function (d) {
+                console.log("status: fail: "+d);
+                qStop();
+                qError();
+                jError();
+                rError();
+                jText('!');
+                rText('!');
+                console.log("disable interval");
+                clearInterval(interval);
+            });
+    }
 
-$(function () {
-    if ($("#jobs_status").size()) {
+    if (jobstatus.size()) {
         interval = setInterval(updateStatus, 2000);
     }
 
@@ -61,9 +87,9 @@ $(function () {
         e.preventDefault();
         var id = $(this).attr("data-id");
         var tr = $(this).parent("td").parent("tr");
-        var u = "/jobs/"+id+".json";
-        console.log("job_cancel:"+u);
-        $.post(u, { _method: "DELETE" }, function(){
+        var u = "/jobs/" + id + ".json";
+        console.log("job_cancel:" + u);
+        $.post(u, { _method: "DELETE" }, function () {
             console.log("returned");
             if (tr) {
 //                    $(tr).fadeOut(500, function(){ $(this).remove();})

data/lib/qujo/version.rb

@@ -2,7 +2,7 @@ module Qujo
   module Version
     MAJOR = 0
     MINOR = 1
-    TINY = 0
+    TINY = 1
     TAG = nil
     STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qujo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -140,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3608254013258583857
+      hash: -3642495992486640390
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3608254013258583857
+      hash: -3642495992486640390
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25