resque 1.9.10 → 1.10.0

data/HISTORY.md

@@ -1,3 +1,12 @@
+## 1.10.0 (2010-08-23)
+
+* Support redis:// string format in `Resque.redis=`
+* Using new cross-platform JSON gem.
+* Added `after_enqueue` plugin hook.
+* Added `shutdown?` method which can be overridden.
+* Added support for the "leftright" gem when running tests.
+* Grammarfix: In the README
+
 ## 1.9.10 (2010-08-06)
 
 * Bugfix: before_fork should get passed the job

data/README.markdown

@@ -9,8 +9,8 @@ Background jobs can be any Ruby class or module that responds to
 jobs or you can create new classes specifically to do work. Or, you
 can do both.
 
-Resque is heavily inspired by DelayedJob (which rocks) and is
-comprised of three parts:
+Resque is heavily inspired by DelayedJob (which rocks) and comprises
+three parts:
 
 1. A Ruby library for creating, querying, and processing jobs
 2. A Rake task for starting a worker which processes jobs

data/lib/resque.rb

@@ -26,14 +26,23 @@ module Resque
   # Accepts:
   #   1. A 'hostname:port' string
   #   2. A 'hostname:port:db' string (to select the Redis db)
-  #   3. An instance of `Redis`, `Redis::Client`, `Redis::DistRedis`,
+  #   3. A 'hostname:port/namespace' string (to set the Redis namespace)
+  #   4. A redis URL string 'redis://host:port'
+  #   5. An instance of `Redis`, `Redis::Client`, `Redis::DistRedis`,
   #      or `Redis::Namespace`.
   def redis=(server)
     if server.respond_to? :split
-      host, port, db = server.split(':')
-      redis = Redis.new(:host => host, :port => port,
-        :thread_safe => true, :db => db)
-      @redis = Redis::Namespace.new(:resque, :redis => redis)
+      if server =~ /redis\:\/\//
+        redis = Redis.connect(:url => server)
+      else
+        server, namespace = server.split('/', 2)
+        host, port, db = server.split(':')
+        redis = Redis.new(:host => host, :port => port,
+          :thread_safe => true, :db => db)
+      end
+      namespace ||= :resque
+
+      @redis = Redis::Namespace.new(namespace, :redis => redis)
     elsif server.respond_to? :namespace=
         @redis = server
     else

data/lib/resque/job.rb

@@ -48,7 +48,11 @@ module Resque
         raise NoClassError.new("Jobs must be given a class.")
       end
 
-      Resque.push(queue, :class => klass.to_s, :args => args)
+      ret = Resque.push(queue, :class => klass.to_s, :args => args)
+      Plugin.after_enqueue_hooks(klass).each do |hook|
+        klass.send(hook, *args)
+      end
+      ret
     end
 
     # Removes a job from a queue. Expects a string queue name, a

data/lib/resque/plugin.rb

@@ -42,5 +42,10 @@ module Resque
     def failure_hooks(job)
       job.methods.grep(/^on_failure/).sort
     end
+
+    # Given an object, returns a list `after_enqueue` hook names.
+    def after_enqueue_hooks(job)
+      job.methods.grep(/^after_enqueue/).sort
+    end
   end
 end

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

@@ -27,7 +27,7 @@
 
 <% else %>
 
-  <% workers = resque.working %>
+  <% workers = resque.working.reject { |w| w.idle? } %>
   <h1 class='wi'><%= workers.size %> of <%= resque.workers.size %> Workers Working</h1>
   <p class='intro'>The list below contains all workers which are currently running a job.</p>
   <table class='workers'>
@@ -45,7 +45,6 @@
 
     <% for worker in workers.sort_by { |w| w.job['run_at'] ? w.job['run_at'] : '' } %>
       <% job = worker.job %>
-      <% next if worker.idle? %>
 
       <tr>
         <td class='icon'><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.9.10'
+  Version = VERSION = '1.10.0'
 end

data/lib/resque/worker.rb

@@ -108,7 +108,7 @@ module Resque
       startup
 
       loop do
-        break if @shutdown
+        break if shutdown?
 
         if not @paused and job = reserve
           log "got: #{job.inspect}"
@@ -265,6 +265,11 @@ module Resque
       kill_child
     end
 
+    # Should this worker shutdown as soon as current job is finished?
+    def shutdown?
+      @shutdown
+    end
+
     # Kills the forked child immediately, without remorse. The job it
     # is processing will not be completed.
     def kill_child

data/test/job_hooks_test.rb

@@ -228,6 +228,27 @@ context "Resque::Job on_failure" do
   end
 end
 
+context "Resque::Job after_enqueue" do
+  include PerformJob
+
+  class ::AfterEnqueueJob
+    def self.after_enqueue_record_history(history)
+      history << :after_enqueue
+    end
+
+    def self.perform(history)
+    end
+  end
+
+  test "the after enqueue hook should run" do
+    history = []
+    @worker = Resque::Worker.new(:jobs)
+    Resque::Job.create(:jobs, AfterEnqueueJob, history)
+    @worker.work(0)
+    assert_equal history, [:after_enqueue], "after_enqueue was not run"
+  end
+end
+
 context "Resque::Job all hooks" do
   include PerformJob
 

data/test/resque_test.rb

@@ -8,6 +8,13 @@ context "Resque" do
     Resque.push(:people, { 'name' => 'bob' })
     Resque.push(:people, { 'name' => 'mark' })
   end
+  
+  test "can set a namespace through a url-like string" do
+    assert Resque.redis
+    assert_equal :resque, Resque.redis.namespace
+    Resque.redis = 'localhost:9736/namespace'
+    assert_equal 'namespace', Resque.redis.namespace
+  end
 
   test "can put jobs on a queue" do
     assert Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')
@@ -222,4 +229,4 @@ context "Resque" do
   test "decode bad json" do
     assert_nil Resque.decode("{\"error\":\"Module not found \\u002\"}")
   end
-end
+end

data/test/test_helper.rb

@@ -5,6 +5,11 @@ require 'test/unit'
 require 'rubygems'
 require 'resque'
 
+begin
+  require 'leftright'
+rescue LoadError
+end
+
 
 #
 # make sure we can run redis

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 9
   - 10
-  version: 1.9.10
+  - 0
+  version: 1.10.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 -07:00
+date: 2010-08-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,7 +60,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  name: json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -69,8 +69,8 @@ dependencies:
         segments: 
         - 1
         - 4
-        - 0
-        version: 1.4.0
+        - 6
+        version: 1.4.6
   type: :runtime
   version_requirements: *id004
 description: "    Resque is a Redis-backed Ruby library for creating background jobs,\n    placing those jobs on multiple queues, and processing them later.\n\n    Background jobs can be any Ruby class or module that responds to\n    perform. Your existing classes can easily be converted to background\n    jobs or you can create new classes specifically to do work. Or, you\n    can do both.\n\n    Resque is heavily inspired by DelayedJob (which rocks) and is\n    comprised of three parts:\n\n    * A Ruby library for creating, querying, and processing jobs\n    * A Rake task for starting a worker which processes jobs\n    * A Sinatra app for monitoring queues, jobs, and workers.\n"