livetask 0.0.2 → 0.0.3

data/lib/livetask/sidekiq_web.rb

@@ -1,9 +1,25 @@
 module Livetask
   module SidekiqWeb
 
+    def self.show_tasks
+      "<div id='livetask'>Loading tasks...</div>"
+    end
+
+    def get_tasks_ids
+      Sidekiq.redis do |conn|
+        conn.zrevrange("livetask-tasks", 0, (2**(0.size * 8 -2) -1))
+      end
+    end
+
     def get_progress(jid)
       Sidekiq.redis do |conn|
-        conn.get("livetask-#{jid}-progress")
+        conn.hget("livetask-#{jid}-info", "progress")
+      end
+    end
+
+    def get_status(jid)
+      Sidekiq.redis do |conn|
+        conn.hget("livetask-#{jid}-info", "status")
       end
     end
 
@@ -13,9 +29,9 @@ module Livetask
       end
     end
 
-    def get_processes_ids
+    def get_last_changed_at(jid)
       Sidekiq.redis do |conn|
-        conn.zrevrange("livetask-processes", 0, (2**(0.size * 8 -2) -1))
+        Time.at(conn.zscore("livetask-tasks", jid)).to_datetime
       end
     end
 

data/lib/livetask/sidekiq_worker.rb

@@ -1,15 +1,25 @@
 module Livetask
   module SidekiqWorker
 
-    def set_progress(n)
-      register_process(@jid)
+    def set_progress(progress)
+      return false unless @jid
+      register_task(@jid)
       Sidekiq.redis do |conn|
-        conn.set("livetask-#{@jid}-progress", n)
+        conn.hset("livetask-#{@jid}-info", "progress", progress)
+      end
+    end
+
+    def set_status(status)
+      return false unless @jid
+      register_task(@jid)
+      Sidekiq.redis do |conn|
+        conn.hset("livetask-#{@jid}-info", "status", status)
       end
     end
 
     def add_to_log(string)
-      register_process(@jid)
+      return false unless @jid
+      register_task(@jid)
       Sidekiq.redis do |conn|
         string = "[#{Time.now}] #{string}"
         string = "\n#{string}" if conn.get("livetask-#{jid}-log")
@@ -18,9 +28,9 @@ module Livetask
     end
 
     private
-    def register_process(jid)
+    def register_task(jid)
       Sidekiq.redis do |conn|
-        conn.zadd("livetask-processes", Time.now.to_i, jid.to_s)
+        conn.zadd("livetask-tasks", Time.now.to_i, jid.to_s)
       end
     end
 

data/lib/livetask/version.rb

@@ -1,3 +1,3 @@
 module Livetask
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livetask
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies: []
 description: Live broadcast from a background job
 email: