resque-status 0.1.4 → 0.1.5

data/README.rdoc

@@ -124,7 +124,7 @@ To use, you need to setup a resque-web config file:
   # ~/resque_conf.rb  
   require 'resque/status_server'
   
-The start resque-web with your config:
+Then start resque-web with your config:
 
   resque-web ~/resque_conf.rb
   

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'rake'
-require 'lib/resque/status'
+require File.join(File.expand_path('.'), 'lib/resque/status')
 require 'resque/tasks'
 
 begin

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

@@ -39,6 +39,8 @@
   <% end %>
 </table>
 
+<%= poll %>
+
 <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.1.4'
+    VERSION = '0.1.5'
 
     extend Resque::Helpers
 
@@ -47,7 +47,10 @@ module Resque
     
     # returns a Redisk::Logger scoped to the UUID. Any options passed are passed
     # to the logger initialization.
+    #
+    # Ensures that Redisk is logging to the same Redis connection as Resque.
     def self.logger(uuid, options = {})
+      Redisk.redis = redis
       Redisk::Logger.new(logger_key(uuid), options)
     end
 
@@ -216,4 +219,4 @@ module Resque
     end
 
   end
-end
+end

data/lib/resque/status_server.rb

@@ -15,7 +15,7 @@ module Resque
       app.get '/statuses/:id.js' do
         @status = Resque::Status.get(params[:id])
         content_type :js
-        @status.to_json
+        @status.json
       end
       
       app.get '/statuses/:id' do
@@ -33,9 +33,17 @@ module Resque
         redirect url(:statuses)
       end
       
+      app.get "/statuses.poll" do
+        content_type "text/plain"
+        @polling = true
+
+        @statuses = Resque::Status.statuses
+        status_view(:statuses, {:layout => false})
+      end
+      
       app.helpers do
         def status_view(filename, options = {}, locals = {})
-          erb(File.read(File.join(VIEW_PATH, "#{filename}.erb")), options, locals)
+          erb(File.read(File.join(::Resque::StatusServer::VIEW_PATH, "#{filename}.erb")), options, locals)
         end
       end
       

data/resque-status.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resque-status}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = %q{2010-06-06}
+  s.date = %q{2010-08-23}
   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 = [
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{quirkey}
-  s.rubygems_version = %q{1.3.6}
+  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 = [
     "test/test_helper.rb",
@@ -53,7 +53,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<uuid>, [">= 2.0.2"])
       s.add_runtime_dependency(%q<resque>, [">= 1.3.1"])
       s.add_runtime_dependency(%q<redisk>, [">= 0.2.1"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Aaron Quint
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 -07:00
+date: 2010-08-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: uuid
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: resque
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -49,6 +51,7 @@ dependencies:
   name: redisk
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -63,6 +66,7 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -77,6 +81,7 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -125,6 +130,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -132,6 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -141,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: quirkey
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: resque-status is an extension to the resque queue system that provides simple trackable jobs.