resque-status 0.2.0 → 0.2.1

data/lib/resque/job_with_status.rb

@@ -82,7 +82,8 @@ module Resque
     # options.
     #
     # You should not override this method, rahter the <tt>perform</tt> instance method.
-    def self.perform(uuid, options = {})
+    def self.perform(uuid=nil, options = {})
+      uuid ||= Resque::Status.generate_uuid
       instance = new(uuid, options)
       instance.safe_perform!
       instance

data/lib/resque/server/views/statuses.erb

@@ -43,7 +43,7 @@
 	<%= partial :next_more, :start => @start, :size => @size %>
 <% end %>
 
-<%= poll %>
+<%= status_poll(@start) %>
 
 <script type="text/javascript" charset="utf-8">
   jQuery(function($) {

data/lib/resque/status.rb

@@ -7,7 +7,7 @@ module Resque
   # the common status attributes. It also has a number of class methods for
   # creating/updating/retrieving status objects from Redis
   class Status < Hash
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
 
     extend Resque::Helpers
 
@@ -38,8 +38,10 @@ module Resque
       val
     end
 
-    def self.clear
-      status_ids.each do |id|
+    # clear statuses from redis passing an optional range. See `statuses` for info
+    # about ranges
+    def self.clear(range_start = nil, range_end = nil)
+      status_ids(range_start, range_end).each do |id|
         redis.del(status_key(id))
         redis.zrem(set_key, id)
       end
@@ -64,14 +66,14 @@ module Resque
     # @param [Numeric] range_end The optional ending range
     # @example retuning the last 20 statuses
     #   Resque::Status.statuses(0, 20)
-    def self.statuses(range_start=nil, range_end=nil)
+    def self.statuses(range_start = nil, range_end = nil)
       status_ids(range_start, range_end).collect do |id|
         get(id)
       end.compact
     end
 
     # Return the <tt>num</tt> most recent status/job UUIDs in reverse chronological order.
-    def self.status_ids(range_start=nil, range_end=nil)
+    def self.status_ids(range_start = nil, range_end = nil)
       unless range_end && range_start
         # Because we want a reverse chronological order, we need to get a range starting
         # by the higest negative number.
@@ -85,8 +87,6 @@ module Resque
         else
           range_end -= 1
         end
-
-
         (redis.zrevrange(set_key, -(range_end.abs), -(range_start.abs)) || []).reverse
       end
     end
@@ -200,7 +200,6 @@ module Resque
       case status
       when 'completed' then 100
       when 'queued' then 0
-      when 'failed' then 100
       else
         t = (total == 0 || total.nil?) ? 1 : total
         (((num || 0).to_f / t.to_f) * 100).to_i

data/lib/resque/status_server.rb

@@ -40,7 +40,11 @@ module Resque
         content_type "text/plain"
         @polling = true
 
-        @statuses = Resque::Status.statuses
+        @start = params[:start].to_i
+        @end = @start + (params[:per_page] || 50)
+        @statuses = Resque::Status.statuses(@start, @end)
+        @size = @statuses.size
+
         status_view(:statuses, {:layout => false})
       end
       
@@ -48,6 +52,15 @@ module Resque
         def status_view(filename, options = {}, locals = {})
           erb(File.read(File.join(::Resque::StatusServer::VIEW_PATH, "#{filename}.erb")), options, locals)
         end
+
+        def status_poll(start)
+          if @polling
+            text = "Last Updated: #{Time.now.strftime("%H:%M:%S")}"
+          else
+            text = "<a href='#{url(request.path_info)}.poll?start=#{start}' rel='poll'>Live Poll</a>"
+          end
+          "<p class='poll'>#{text}</p>"
+        end
       end
       
       app.tabs << "Statuses"

data/resque-status.gemspec

@@ -1,52 +1,50 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{resque-status}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = %q{2010-10-11}
+  s.date = %q{2011-01-14}
   s.description = %q{resque-status is an extension to the resque queue system that provides simple trackable jobs. It provides a Resque::Status class which can set/get the statuses of jobs and a Resque::JobWithStatus class that when subclassed provides easily trackable/killable jobs.}
   s.email = %q{aaron@quirkey.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "examples/sleep_job.rb",
-     "init.rb",
-     "lib/resque/job_with_status.rb",
-     "lib/resque/server/views/status.erb",
-     "lib/resque/server/views/status_styles.erb",
-     "lib/resque/server/views/statuses.erb",
-     "lib/resque/status.rb",
-     "lib/resque/status_server.rb",
-     "resque-status.gemspec",
-     "test/redis-test.conf",
-     "test/test_helper.rb",
-     "test/test_resque-job_with_status.rb",
-     "test/test_resque-status.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "examples/sleep_job.rb",
+    "init.rb",
+    "lib/resque/job_with_status.rb",
+    "lib/resque/server/views/status.erb",
+    "lib/resque/server/views/status_styles.erb",
+    "lib/resque/server/views/statuses.erb",
+    "lib/resque/status.rb",
+    "lib/resque/status_server.rb",
+    "resque-status.gemspec",
+    "test/redis-test.conf",
+    "test/test_helper.rb",
+    "test/test_resque-job_with_status.rb",
+    "test/test_resque-status.rb"
   ]
   s.homepage = %q{http://github.com/quirkey/resque-status}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{quirkey}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{resque-status is an extension to the resque queue system that provides simple trackable jobs.}
   s.test_files = [
+    "examples/sleep_job.rb",
     "test/test_helper.rb",
-     "test/test_resque-job_with_status.rb",
-     "test/test_resque-status.rb",
-     "examples/sleep_job.rb"
+    "test/test_resque-job_with_status.rb",
+    "test/test_resque-status.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: resque-status
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Aaron Quint
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -07:00
+date: 2011-01-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 2
         - 0
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 1
         - 3
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 0
         - 2
@@ -74,7 +70,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 35
         segments: 
         - 2
         - 10
@@ -90,7 +85,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
         - 0
         - 9
@@ -109,7 +103,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -131,8 +124,8 @@ homepage: http://github.com/quirkey/resque-status
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -140,7 +133,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -149,7 +141,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -161,7 +152,7 @@ signing_key:
 specification_version: 3
 summary: resque-status is an extension to the resque queue system that provides simple trackable jobs.
 test_files: 
+- examples/sleep_job.rb
 - test/test_helper.rb
 - test/test_resque-job_with_status.rb
 - test/test_resque-status.rb
-- examples/sleep_job.rb

data/.gitignore

@@ -1,23 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-doc
-.yardoc