delayed_job 3.0.0 → 3.0.1

data/README.textile

@@ -1,4 +1,4 @@
-h1. Delayed::Job
+h1. Delayed::Job "!http://travis-ci.org/collectiveidea/delayed_job.png!":http://travis-ci.org/collectiveidea/delayed_job "!https://gemnasium.com/collectiveidea/delayed_job.png?travis!":https://gemnasium.com/collectiveidea/delayed_job
 
 Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background.
 
@@ -18,6 +18,8 @@ h2. Installation
 
 delayed_job 3.0.0 only supports Rails 3.0+. See the "2.0 branch":https://github.com/collectiveidea/delayed_job/tree/v2.0 for Rails 2.
 
+delayed_job supports multiple backends for storing the job queue. "See the wiki for other backends":http://wiki.github.com/collectiveidea/delayed_job/backends.
+
 If you plan to use delayed_job with Active Record, add @delayed_job_active_record@ to your @Gemfile@.
 
 <pre>
@@ -32,11 +34,7 @@ gem 'delayed_job_mongoid'
 
 Run @bundle install@ to install the backend and delayed_job gems.
 
-h3. Backends
-
-delayed_job supports multiple backends for storing the job queue. "See the wiki for other backends":http://wiki.github.com/collectiveidea/delayed_job/backends besides Active Record.
-
-The default is Active Record, which requires a jobs table. You can create that table by running the following command:
+The Active Record backend requires a jobs table. You can create that table by running the following command:
 
 <pre>
 $ script/rails generate delayed_job:active_record
@@ -80,7 +78,7 @@ device = Device.new
 device.deliver
 </pre>
 
-handle_asynchronously can take as options anything you can pass to delay. In addition the values can be Proc objects allowing call time evaluation of the value. For some examples:
+handle_asynchronously can take as options anything you can pass to delay. In addition, the values can be Proc objects allowing call time evaluation of the value. For some examples:
 
 <pre>
 class LongTasks
@@ -127,6 +125,19 @@ Notifier.delay.signup(@user)
 
 Remove the @.deliver@ method to make it work. It's not ideal, but it's the best we could do for now.
 
+h3. Named Queues
+
+DJ 3 introduces Resque-style named queues while still retaining DJ-style priority. The goal is to provide a system for grouping tasks to be worked by separate pools of workers, which may be scaled and controlled individually.
+
+Jobs can be assigned to a queue by setting the @queue@ option:
+
+<pre>object.delay(:queue => 'tracking').method
+
+Delayed::Job.enqueue job, :queue => 'tracking'
+
+handle_asynchronously :tweet_later, :queue => 'tweets'
+</pre>
+
 h2. Running Jobs
 
 @script/delayed_job@ can be used to manage a background process which will start working off jobs.
@@ -142,12 +153,23 @@ $ RAILS_ENV=production script/delayed_job stop
 # Runs two workers in separate processes.
 $ RAILS_ENV=production script/delayed_job -n 2 start
 $ RAILS_ENV=production script/delayed_job stop
+
+# Set the --queue or --queues option to work from a particular queue.
+$ RAILS_ENV=production script/delayed_job --queue=tracking start
+$ RAILS_ENV=production script/delayed_job --queues=mailers,tasks start
 </pre>
 
 Workers can be running on any computer, as long as they have access to the database and their clock is in sync. Keep in mind that each worker will check the database at least every 5 seconds.
 
 You can also invoke @rake jobs:work@ which will start working off jobs. You can cancel the rake task with @CTRL-C@.
 
+Work off queues by setting the @QUEUE@ or @QUEUES@ environment variable.
+
+<pre>
+QUEUE=tracking rake jobs:work
+QUEUES=mailers,tasks rake jobs:work
+</pre>
+
 h2. Custom Jobs
 
 Jobs are simple ruby objects with a method called perform. Any object which responds to perform can be stuffed into the jobs table. Job objects are serialized to yaml so that they can later be resurrected by the job runner.
@@ -251,14 +273,6 @@ h2. Mailing List
 
 Join us on the "mailing list":http://groups.google.com/group/delayed_job
 
-h2. Build Status
-
-"!http://travis-ci.org/collectiveidea/delayed_job.png!":http://travis-ci.org/collectiveidea/delayed_job
-
-h2. Dependency Status
-
-"!https://gemnasium.com/collectiveidea/delayed_job.png?travis!":https://gemnasium.com/collectiveidea/delayed_job
-
 h2. How to contribute
 
 If you find what looks like a bug:

data/lib/delayed/backend/shared_spec.rb

@@ -237,8 +237,8 @@ shared_examples_for 'a delayed_job backend' do
     end
 
     it "should be the instance method that will be called if its a performable method object" do
-      @job = Story.create(:text => "...").delay.save
-      @job.name.should == 'Story#save'
+      job = Story.create(:text => "...").delay.save
+      job.name.should == 'Story#save'
     end
 
     it "should parse from handler on deserialization error" do
@@ -415,10 +415,10 @@ shared_examples_for 'a delayed_job backend' do
         begin
           old_max_run_time = Delayed::Worker.max_run_time
           Delayed::Worker.max_run_time = 1.second
-          @job = Delayed::Job.create :payload_object => LongRunningJob.new
-          worker.run(@job)
-          @job.reload.last_error.should =~ /expired/
-          @job.attempts.should == 1
+          job = Delayed::Job.create :payload_object => LongRunningJob.new
+          worker.run(job)
+          job.reload.last_error.should =~ /expired/
+          job.attempts.should == 1
         ensure
           Delayed::Worker.max_run_time = old_max_run_time
         end
@@ -467,11 +467,11 @@ shared_examples_for 'a delayed_job backend' do
       end
 
       it 'should re-schedule with handler provided time if present' do
-        @job = Delayed::Job.enqueue(CustomRescheduleJob.new(99.minutes))
-        worker.run(@job)
-        @job.reload
+        job = Delayed::Job.enqueue(CustomRescheduleJob.new(99.minutes))
+        worker.run(job)
+        job.reload
 
-        (Delayed::Job.db_time_now + 99.minutes - @job.run_at).abs.should < 1
+        (Delayed::Job.db_time_now + 99.minutes - job.run_at).abs.should < 1
       end
 
       it "should not fail when the triggered error doesn't have a message" do

data/lib/delayed/psych_ext.rb

@@ -23,19 +23,77 @@ module Psych
   module Visitors
     class YAMLTree
       def visit_Class(klass)
-        tag = ['!ruby/class', klass.name].join(':')
-        register(klass, @emitter.start_mapping(nil, tag, false, Nodes::Mapping::BLOCK))
-        @emitter.end_mapping
+        @emitter.scalar klass.name, nil, '!ruby/class', false, false, Nodes::Scalar::SINGLE_QUOTED
       end
     end
 
     class ToRuby
+      def visit_Psych_Nodes_Scalar(o)
+        @st[o.anchor] = o.value if o.anchor
+
+        if klass = Psych.load_tags[o.tag]
+          instance = klass.allocate
+
+          if instance.respond_to?(:init_with)
+            coder = Psych::Coder.new(o.tag)
+            coder.scalar = o.value
+            instance.init_with coder
+          end
+
+          return instance
+        end
+
+        return o.value if o.quoted
+        return @ss.tokenize(o.value) unless o.tag
+
+        case o.tag
+        when '!binary', 'tag:yaml.org,2002:binary'
+          o.value.unpack('m').first
+        when '!str', 'tag:yaml.org,2002:str'
+          o.value
+        when "!ruby/object:DateTime"
+          require 'date'
+          @ss.parse_time(o.value).to_datetime
+        when "!ruby/object:Complex"
+          Complex(o.value)
+        when "!ruby/object:Rational"
+          Rational(o.value)
+        when "!ruby/class", "!ruby/module"
+          resolve_class o.value
+        when "tag:yaml.org,2002:float", "!float"
+          Float(@ss.tokenize(o.value))
+        when "!ruby/regexp"
+          o.value =~ /^\/(.*)\/([mixn]*)$/
+          source  = $1
+          options = 0
+          lang    = nil
+          ($2 || '').split('').each do |option|
+            case option
+            when 'x' then options |= Regexp::EXTENDED
+            when 'i' then options |= Regexp::IGNORECASE
+            when 'm' then options |= Regexp::MULTILINE
+            when 'n' then options |= Regexp::NOENCODING
+            else lang = option
+            end
+          end
+          Regexp.new(*[source, options, lang].compact)
+        when "!ruby/range"
+          args = o.value.split(/([.]{2,3})/, 2).map { |s|
+            accept Nodes::Scalar.new(s)
+          }
+          args.push(args.delete_at(1) == '...')
+          Range.new(*args)
+        when /^!ruby\/sym(bol)?:?(.*)?$/
+          o.value.to_sym
+        else
+          @ss.tokenize o.value
+        end
+      end
+      
       def visit_Psych_Nodes_Mapping_with_class(object)
         return revive(Psych.load_tags[object.tag], object) if Psych.load_tags[object.tag]
 
         case object.tag
-        when /^!ruby\/class:?(.*)?$/
-          resolve_class $1
         when /^!ruby\/ActiveRecord:(.+)$/
           klass = resolve_class($1)
           payload = Hash[*object.children.map { |c| accept c }]
@@ -72,4 +130,3 @@ module Psych
     end
   end
 end
-

data/lib/delayed/serialization/active_record.rb

@@ -9,7 +9,7 @@ if defined?(ActiveRecord)
         klass.with_exclusive_scope { klass.find(val['attributes'][klass.primary_key]) }
       end
     rescue ActiveRecord::RecordNotFound
-      raise Delayed::DeserializationError
+      raise Delayed::DeserializationError, "ActiveRecord::RecordNotFound, class: #{klass} , primary key: #{val['attributes'][klass.primary_key]} "
     end
 
     def to_yaml_properties

data/lib/delayed/syck_ext.rb

@@ -2,7 +2,7 @@ class Module
   yaml_as "tag:ruby.yaml.org,2002:module"
 
   def self.yaml_new(klass, tag, val)
-    klass
+    val.constantize
   end
 
   def to_yaml(options = {})

data/lib/delayed/yaml_ext.rb

@@ -2,7 +2,7 @@
 # Classes, Modules and Structs
 
 require 'yaml'
-if YAML.parser.class.name =~ /syck/i
+if YAML.parser.class.name =~ /syck|yecht/i
   require File.expand_path('../syck_ext', __FILE__)
   require File.expand_path('../serialization/active_record', __FILE__)
 else

data/spec/lifecycle_spec.rb

@@ -64,44 +64,4 @@ describe Delayed::Lifecycle do
     lifecycle.before(:execute, &callback)
     expect { lifecycle.run_callbacks(:execute, 1,2,3) {} }.to raise_error(ArgumentError, /1 parameter/)
   end
-
-  # # This is a spectacularly crappy way to test callbacks. What's a better way?
-  # describe 'arguments callbacks' do
-  #   subject do
-  #     class Testarguments < Delayed::arguments
-  #       def before_execute; end
-  #       def before_loop; end
-  #       def before_perform; end
-  #
-  #       set_callback :execute, :before, :before_execute
-  #       set_callback :loop, :before, :before_loop
-  #       set_callback :perform, :before, :before_perform
-  #     end
-  #
-  #     Testarguments.new.tap { |w| w.stop }
-  #   end
-  #
-  #   it "should trigger for execute event" do
-  #     subject.should_receive(:before_execute).with()
-  #     subject.start
-  #   end
-  #
-  #   it "should trigger for loop event" do
-  #     subject.should_receive(:before_loop).with()
-  #     subject.start
-  #   end
-  #
-  #   it "should trigger for perform event" do
-  #     "foo".delay.length
-  #     subject.should_receive(:before_perform).with()
-  #     subject.start
-  #   end
-  # end
-  #
-  # describe 'job callbacks' do
-  #   it "should trigger for enqueue event" do
-  #     pending 'figure out how to test this'
-  #   end
-  # end
-
 end

data/spec/message_sending_spec.rb

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe Delayed::MessageSending do
   describe "handle_asynchronously" do
     class Story
-      def tell!(arg)
-      end
+      def tell!(arg);end
       handle_asynchronously :tell!
     end
 
@@ -17,19 +16,16 @@ describe Delayed::MessageSending do
       story = Story.new
       lambda {
         job = story.tell!(1)
-        job.payload_object.class.should   == Delayed::PerformableMethod
-        job.payload_object.method_name.should  == :tell_without_delay!
-        job.payload_object.args.should    == [1]
+        job.payload_object.class.should == Delayed::PerformableMethod
+        job.payload_object.method_name.should == :tell_without_delay!
+        job.payload_object.args.should == [1]
       }.should change { Delayed::Job.count }
     end
 
     describe 'with options' do
       class Fable
-        class << self
-          attr_accessor :importance
-        end
-        def tell
-        end
+        cattr_accessor :importance
+        def tell;end
         handle_asynchronously :tell, :priority => Proc.new { self.importance }
       end
 
@@ -43,7 +39,7 @@ describe Delayed::MessageSending do
         job.priority.should == 20
       end
 
-      describe 'using a proc with parament' do
+      describe 'using a proc with parameters' do
         class Yarn
           attr_accessor :importance
           def spin
@@ -63,36 +59,37 @@ describe Delayed::MessageSending do
   end
 
   context "delay" do
+    class FairyTail
+      attr_accessor :happy_ending
+      def self.princesses;end
+      def tell
+        @happy_ending = true
+      end
+    end
+
     it "should create a new PerformableMethod job" do
       lambda {
         job = "hello".delay.count('l')
-        job.payload_object.class.should   == Delayed::PerformableMethod
-        job.payload_object.method_name.should  == :count
-        job.payload_object.args.should    == ['l']
+        job.payload_object.class.should == Delayed::PerformableMethod
+        job.payload_object.method_name.should == :count
+        job.payload_object.args.should == ['l']
       }.should change { Delayed::Job.count }.by(1)
     end
 
     it "should set default priority" do
       Delayed::Worker.default_priority = 99
-      job = Object.delay.to_s
+      job = FairyTail.delay.to_s
       job.priority.should == 99
       Delayed::Worker.default_priority = 0
     end
 
     it "should set job options" do
       run_at = Time.parse('2010-05-03 12:55 AM')
-      job = Object.delay(:priority => 20, :run_at => run_at).to_s
+      job = FairyTail.delay(:priority => 20, :run_at => run_at).to_s
       job.run_at.should == run_at
       job.priority.should == 20
     end
     
-    class FairyTail
-      attr_accessor :happy_ending
-      def tell
-        @happy_ending = true
-      end
-    end
-    
     it "should not delay the job when delay_jobs is false" do
       Delayed::Worker.delay_jobs = false
       fairy_tail = FairyTail.new

data/spec/performable_mailer_spec.rb

@@ -12,9 +12,9 @@ describe ActionMailer::Base do
     it "should enqueue a PerformableEmail job" do
       lambda {
         job = MyMailer.delay.signup('john@example.com')
-        job.payload_object.class.should   == Delayed::PerformableMailer
-        job.payload_object.method_name.should  == :signup
-        job.payload_object.args.should    == ['john@example.com']
+        job.payload_object.class.should == Delayed::PerformableMailer
+        job.payload_object.method_name.should == :signup
+        job.payload_object.args.should == ['john@example.com']
       }.should change { Delayed::Job.count }.by(1)
     end
   end
@@ -29,16 +29,14 @@ describe ActionMailer::Base do
 
   describe Delayed::PerformableMailer do
     describe "perform" do
-      before do
-        @email = mock('email', :deliver => true)
-        @mailer_class = mock('MailerClass', :signup => @email)
-        @mailer = Delayed::PerformableMailer.new(@mailer_class, :signup, ['john@example.com'])
-      end
-
       it "should call the method and #deliver on the mailer" do
-        @mailer_class.should_receive(:signup).with('john@example.com')
-        @email.should_receive(:deliver)
-        @mailer.perform
+        email = mock('email', :deliver => true)
+        mailer_class = mock('MailerClass', :signup => email)
+        mailer = Delayed::PerformableMailer.new(mailer_class, :signup, ['john@example.com'])
+
+        mailer_class.should_receive(:signup).with('john@example.com')
+        email.should_receive(:deliver)
+        mailer.perform
       end
     end
   end

data/spec/yaml_ext_spec.rb

@@ -3,14 +3,14 @@ require 'spec_helper'
 describe "YAML" do
   it "should autoload classes" do
     lambda {
-      yaml = "--- !ruby/class:Autoloaded::Clazz {}\n"
+      yaml = "--- !ruby/class Autoloaded::Clazz\n"
       YAML.load(yaml).should == Autoloaded::Clazz
     }.should_not raise_error
   end
 
   it "should autoload the class of a struct" do
     lambda {
-      yaml = "--- !ruby/class:Autoloaded::Struct {}\n"
+      yaml = "--- !ruby/class Autoloaded::Struct\n"
       YAML.load(yaml).should == Autoloaded::Struct
     }.should_not raise_error
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: delayed_job
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Matt Griffin
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-30 00:00:00 Z
+date: 2012-01-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement