delayed_job 2.1.0.pre2 → 2.1.1

data/spec/performable_mailer_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+require 'action_mailer'
+class MyMailer < ActionMailer::Base
+  def signup(email)
+    mail :to => email, :subject => "Delaying Emails"
+  end
+end
+
+describe ActionMailer::Base do
+  describe "delay" 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']
+      }.should change { Delayed::Job.count }.by(1)
+    end
+  end
+
+  describe "delay on a mail object" do
+    it "should raise an exception" do
+      lambda {
+        MyMailer.signup('john@example.com').delay
+      }.should raise_error(RuntimeError)
+    end
+  end
+
+  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
+      end
+    end
+  end
+
+end

data/spec/performable_method_spec.rb

@@ -5,28 +5,21 @@ describe Delayed::PerformableMethod do
     before do
       @method = Delayed::PerformableMethod.new("foo", :count, ['o'])
     end
-    
+
     context "with the persisted record cannot be found" do
       before do
         @method.object = nil
       end
-    
+
       it "should be a no-op if object is nil" do
         lambda { @method.perform }.should_not raise_error
       end
     end
-    
+
     it "should call the method on the object" do
       @method.object.should_receive(:count).with('o')
       @method.perform
     end
-    
-    it "should respond to on_permanent_failure when implemented and target object is called via object.delay.do_something" do
-      @method = Delayed::PerformableMethod.new(OnPermanentFailureJob.new, :perform, [])
-      @method.respond_to?(:on_permanent_failure).should be_true
-      @method.object.should_receive(:on_permanent_failure)
-      @method.on_permanent_failure
-    end    
   end
 
   it "should raise a NoMethodError if target method doesn't exist" do
@@ -34,7 +27,7 @@ describe Delayed::PerformableMethod do
       Delayed::PerformableMethod.new(Object, :method_that_does_not_exist, [])
     }.should raise_error(NoMethodError)
   end
-  
+
   it "should not raise NoMethodError if target method is private" do
     clazz = Class.new do
       def private_method
@@ -45,4 +38,27 @@ describe Delayed::PerformableMethod do
       Delayed::PerformableMethod.new(clazz.new, :private_method, [])
     }.should_not raise_error(NoMethodError)
   end
+
+  describe "hooks" do
+    %w(enqueue before after success).each do |hook|
+      it "should delegate #{hook} hook to object" do
+        story = Story.new
+        story.should_receive(hook).with(an_instance_of(Delayed::Job))
+        story.delay.tell.invoke_job
+      end
+    end
+
+    it "should delegate error hook to object" do
+      story = Story.new
+      story.should_receive(:error).with(an_instance_of(Delayed::Job), an_instance_of(RuntimeError))
+      story.should_receive(:tell).and_raise(RuntimeError)
+      lambda { story.delay.tell.invoke_job }.should raise_error
+    end
+
+    it "should delegate failure hook to object" do
+      method = Delayed::PerformableMethod.new("object", :size, [])
+      method.object.should_receive(:failure)
+      method.failure
+    end
+  end
 end

data/spec/sample_jobs.rb

@@ -12,50 +12,58 @@ end
 class ErrorJob
   cattr_accessor :runs; self.runs = 0
   def perform; raise 'did not work'; end
-end             
+end
+
+class CustomRescheduleJob < Struct.new(:offset)
+  cattr_accessor :runs; self.runs = 0
+  def perform; raise 'did not work'; end
+  def reschedule_at(time, attempts); time + offset; end
+end
 
 class LongRunningJob
   def perform; sleep 250; end
 end
 
 class OnPermanentFailureJob < SimpleJob
-  def on_permanent_failure
+  def failure
   end
 end
 
 module M
   class ModuleJob
     cattr_accessor :runs; self.runs = 0
-    def perform; @@runs += 1; end    
+    def perform; @@runs += 1; end
   end
 end
 
-class SuccessfulCallbackJob
+class CallbackJob
   cattr_accessor :messages
 
+  def enqueue(job)
+    self.class.messages << 'enqueue'
+  end
+
   def before(job)
-    SuccessfulCallbackJob.messages << 'before perform'
+    self.class.messages << 'before'
   end
-  
+
   def perform
-    SuccessfulCallbackJob.messages << 'perform'
+    self.class.messages << 'perform'
   end
-  
-  def after(job, error = nil)
-    SuccessfulCallbackJob.messages << 'after perform'
+
+  def after(job)
+    self.class.messages << 'after'
   end
-  
+
   def success(job)
-    SuccessfulCallbackJob.messages << 'success!'
+    self.class.messages << 'success'
   end
-  
-  def failure(job, error)
-    SuccessfulCallbackJob.messages << "error: #{error.class}"
+
+  def error(job, error)
+    self.class.messages << "error: #{error.class}"
   end
-end
 
-class FailureCallbackJob < SuccessfulCallbackJob
-  def perform
-     raise "failure job"
+  def failure(job)
+    self.class.messages << 'failure'
   end
 end

data/spec/spec_helper.rb

@@ -2,20 +2,22 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'bundler/setup'
-require 'spec'
+require 'rspec'
 require 'logger'
 
-gem 'activerecord', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+require 'active_record'
+require 'action_mailer'
 
 require 'delayed_job'
 require 'delayed/backend/shared_spec'
 
 Delayed::Worker.logger = Logger.new('/tmp/dj.log')
-RAILS_ENV = 'test'
-
-require 'active_record'
+ENV['RAILS_ENV'] = 'test'
+require 'rails'
 
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+config = YAML.load(File.read('spec/database.yml'))
+ActiveRecord::Base.configurations = {'test' => config['mysql']}
+ActiveRecord::Base.establish_connection
 ActiveRecord::Base.logger = Delayed::Worker.logger
 ActiveRecord::Migration.verbose = false
 
@@ -41,9 +43,9 @@ end
 
 # Purely useful for test cases...
 class Story < ActiveRecord::Base
-  def tell; text; end       
+  def tell; text; end
   def whatever(n, _); tell*n; end
-  
+
   handle_asynchronously :whatever
 end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: delayed_job
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 2
   - 1
-  - 0
-  - pre2
-  version: 2.1.0.pre2
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-05 00:00:00 -04:00
+date: 2010-11-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,15 +48,16 @@ dependencies:
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 2
         - 0
-        version: "0"
+        version: "2.0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -69,9 +69,22 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: rails
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -79,7 +92,31 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: mysql
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: |-
   Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks.
   
@@ -94,17 +131,17 @@ extra_rdoc_files:
 files: 
 - contrib/delayed_job.monitrc
 - contrib/delayed_job_multiple.monitrc
-- generators/delayed_job/delayed_job_generator.rb
-- generators/delayed_job/templates/migration.rb
-- generators/delayed_job/templates/script
 - lib/delayed/backend/active_record.rb
 - lib/delayed/backend/base.rb
 - lib/delayed/backend/shared_spec.rb
 - lib/delayed/command.rb
+- lib/delayed/deserialization_error.rb
 - lib/delayed/message_sending.rb
+- lib/delayed/performable_mailer.rb
 - lib/delayed/performable_method.rb
 - lib/delayed/railtie.rb
 - lib/delayed/recipes.rb
+- lib/delayed/serialization/active_record.rb
 - lib/delayed/tasks.rb
 - lib/delayed/worker.rb
 - lib/delayed/yaml_ext.rb
@@ -112,19 +149,18 @@ files:
 - lib/generators/delayed_job/delayed_job_generator.rb
 - lib/generators/delayed_job/templates/migration.rb
 - lib/generators/delayed_job/templates/script
-- rails/init.rb
 - recipes/delayed_job.rb
 - spec/active_record_job_spec.rb
 - spec/autoloaded/clazz.rb
 - spec/autoloaded/struct.rb
+- spec/database.yml
 - spec/message_sending_spec.rb
+- spec/performable_mailer_spec.rb
 - spec/performable_method_spec.rb
 - spec/sample_jobs.rb
 - spec/spec_helper.rb
 - spec/worker_spec.rb
 - spec/yaml_ext_spec.rb
-- tasks/jobs.rake
-- init.rb
 - MIT-LICENSE
 - README.textile
 has_rdoc: true
@@ -148,13 +184,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -166,7 +200,9 @@ test_files:
 - spec/active_record_job_spec.rb
 - spec/autoloaded/clazz.rb
 - spec/autoloaded/struct.rb
+- spec/database.yml
 - spec/message_sending_spec.rb
+- spec/performable_mailer_spec.rb
 - spec/performable_method_spec.rb
 - spec/sample_jobs.rb
 - spec/spec_helper.rb

data/generators/delayed_job/delayed_job_generator.rb

@@ -1,22 +0,0 @@
-class DelayedJobGenerator < Rails::Generator::Base
-  default_options :skip_migration => false
-  
-  def manifest
-    record do |m|
-      m.template 'script', 'script/delayed_job', :chmod => 0755
-      if !options[:skip_migration] && defined?(ActiveRecord)
-        m.migration_template "migration.rb", 'db/migrate',
-                             :migration_file_name => "create_delayed_jobs"
-      end
-    end
-  end
-  
-protected
-
-  def add_options!(opt)
-    opt.separator ''
-    opt.separator 'Options:'
-    opt.on("--skip-migration", "Don't generate a migration") { |v| options[:skip_migration] = v }
-  end
-  
-end

data/generators/delayed_job/templates/migration.rb

@@ -1,21 +0,0 @@
-class CreateDelayedJobs < ActiveRecord::Migration
-  def self.up
-    create_table :delayed_jobs, :force => true do |table|
-      table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
-      table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
-      table.text     :handler                      # YAML-encoded string of the object that will do work
-      table.text     :last_error                   # reason for last failure (See Note below)
-      table.datetime :run_at                       # When to run. Could be Time.zone.now for immediately, or sometime in the future.
-      table.datetime :locked_at                    # Set when a client is working on this object
-      table.datetime :failed_at                    # Set when all retries have failed (actually, by default, the record is deleted instead)
-      table.string   :locked_by                    # Who is working on this object (if locked)
-      table.timestamps
-    end
-	
-    add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
-  end
-  
-  def self.down
-    drop_table :delayed_jobs  
-  end
-end