delayed_job 3.0.0.pre4 → 3.0.0

data/README.textile

@@ -14,27 +14,43 @@ It is a direct extraction from Shopify where the job table is responsible for a
 
 "Follow us on Twitter":https://twitter.com/delayedjob to get updates and notices about new releases.
 
-
 h2. Installation
 
-delayed_job 2.1 only supports Rails 3.0+. See the "2.0 branch":https://github.com/collectiveidea/delayed_job/tree/v2.0 for Rails 2.
+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.
+
+If you plan to use delayed_job with Active Record, add @delayed_job_active_record@ to your @Gemfile@.
+
+<pre>
+gem 'delayed_job_active_record'
+</pre>
 
-To install, add delayed_job to your @Gemfile@ and run `bundle install`:
+If you plan to use delayed_job with Mongoid, add @delayed_job_mongoid@ to your @Gemfile@.
 
 <pre>
-gem 'delayed_job'
+gem 'delayed_job_mongoid'
 </pre>
 
-After delayed_job is installed, you will need to setup the backend.
+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.
+The default is Active Record, which requires a jobs table. You can create that table by running the following command:
+
+<pre>
+$ script/rails generate delayed_job:active_record
+$ rake db:migrate
+</pre>
+
+h3. Upgrading from 2.x to 3.0.0 on Active Record
+
+Delayed Job 3.0.0 introduces a new column to the delayed_jobs table.
+
+If you're upgrading from Delayed Job 2.x, run the upgrade generator to create a migration to add the column.
 
 <pre>
-$ script/rails generate delayed_job
+$ script/rails generate delayed_job:upgrade
 $ rake db:migrate
 </pre>
 
@@ -113,7 +129,11 @@ Remove the @.deliver@ method to make it work. It's not ideal, but it's the best
 
 h2. Running Jobs
 
-@script/delayed_job@ can be used to manage a background process which will start working off jobs.  Make sure you've run `script/generate delayed_job`.
+@script/delayed_job@ can be used to manage a background process which will start working off jobs.
+
+To do so, add @gem "daemons"@ to your @Gemfile@ and make sure you've run `script/rails generate delayed_job`.
+
+You can then do the following:
 
 <pre>
 $ RAILS_ENV=production script/delayed_job start
@@ -169,7 +189,7 @@ class ParanoidNewsletterJob < NewsletterJob
   end
 
   def error(job, exception)
-    notify_hoptoad(exception)
+    Airbrake.notify(exception)
   end
 
   def failure
@@ -180,18 +200,19 @@ end
 
 h2. Gory Details
 
-The library evolves around a delayed_jobs table which looks as follows:
+The library revolves around a delayed_jobs table which looks as follows:
 
 <pre>
 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.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.string   :queue                        # The name of the queue this job is in
   table.timestamps
 end
 </pre>
@@ -230,6 +251,14 @@ 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/command.rb

@@ -1,4 +1,8 @@
-require 'daemons'
+begin
+  require 'daemons'
+rescue LoadError
+  raise "You need to add gem 'daemons' to your Gemfile if you wish to use it."
+end
 require 'optparse'
 
 module Delayed

data/lib/delayed/worker.rb

@@ -37,7 +37,7 @@ module Delayed
 
     def self.backend=(backend)
       if backend.is_a? Symbol
-        require "delayed/serialization/#{backend}" if YAML.parser.class.name =~ /syck/i
+        require "delayed/serialization/#{backend}"
         require "delayed/backend/#{backend}"
         backend = "Delayed::Backend::#{backend.to_s.classify}::Job".constantize
       end

data/lib/delayed_job.rb

@@ -1,22 +1,21 @@
 require 'active_support'
-
-require File.dirname(__FILE__) + '/delayed/message_sending'
-require File.dirname(__FILE__) + '/delayed/performable_method'
+require 'delayed/message_sending'
+require 'delayed/performable_method'
 
 # PerformableMailer is compatible with ActionMailer 3 (and possibly 3.1)
 if defined?(ActionMailer)
   require 'action_mailer/version'
-  require File.dirname(__FILE__) + '/delayed/performable_mailer' if 3 == ActionMailer::VERSION::MAJOR
+  require 'delayed/performable_mailer' if 3 == ActionMailer::VERSION::MAJOR
 end
 
-require File.dirname(__FILE__) + '/delayed/yaml_ext'
-require File.dirname(__FILE__) + '/delayed/lifecycle'
-require File.dirname(__FILE__) + '/delayed/plugin'
-require File.dirname(__FILE__) + '/delayed/plugins/clear_locks'
-require File.dirname(__FILE__) + '/delayed/backend/base'
-require File.dirname(__FILE__) + '/delayed/worker'
-require File.dirname(__FILE__) + '/delayed/deserialization_error'
-require File.dirname(__FILE__) + '/delayed/railtie' if defined?(Rails::Railtie)
+require 'delayed/yaml_ext'
+require 'delayed/lifecycle'
+require 'delayed/plugin'
+require 'delayed/plugins/clear_locks'
+require 'delayed/backend/base'
+require 'delayed/worker'
+require 'delayed/deserialization_error'
+require 'delayed/railtie' if defined?(Rails::Railtie)
 
 Object.send(:include, Delayed::MessageSending)
 Module.send(:include, Delayed::MessageSending::ClassMethods)

data/lib/generators/delayed_job/delayed_job_generator.rb

@@ -1,11 +1,11 @@
 require 'rails/generators'
 
 class DelayedJobGenerator < Rails::Generators::Base
-  
+
   self.source_paths << File.join(File.dirname(__FILE__), 'templates')
-  
+
   def create_script_file
     template 'script', 'script/delayed_job'
     chmod 'script/delayed_job', 0755
   end
-end
+end

data/spec/performable_mailer_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 require 'action_mailer'
 class MyMailer < ActionMailer::Base
   def signup(email)
-    mail :to => email, :subject => "Delaying Emails"
+    mail :to => email, :subject => "Delaying Emails", :from => "delayedjob@example.com"
   end
 end
 

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: delayed_job
 version: !ruby/object:Gem::Version 
-  hash: 1923832001
-  prerelease: 6
+  hash: 7
+  prerelease: 
   segments: 
   - 3
   - 0
   - 0
-  - pre
-  - 4
-  version: 3.0.0.pre4
+  version: 3.0.0
 platform: ruby
 authors: 
 - Matt Griffin
@@ -22,28 +20,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-14 00:00:00 Z
+date: 2011-12-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
-        version: 1.0.10
-  version_requirements: *id001
-  name: daemons
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -53,12 +33,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  version_requirements: *id002
+  requirement: *id001
+  type: :runtime
+  prerelease: false
   name: activesupport
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -68,12 +48,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  version_requirements: *id003
-  name: activerecord
-- !ruby/object:Gem::Dependency 
+  requirement: *id002
   type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: activerecord
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -82,12 +62,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
-  name: sqlite3
-- !ruby/object:Gem::Dependency 
+  requirement: *id003
   type: :development
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: sqlite3
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,12 +77,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  version_requirements: *id005
-  name: rails
-- !ruby/object:Gem::Dependency 
+  requirement: *id004
   type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: rails
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,12 +92,12 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  version_requirements: *id006
-  name: rspec
-- !ruby/object:Gem::Dependency 
+  requirement: *id005
   type: :development
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,15 +106,16 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
+  requirement: *id006
+  type: :development
+  prerelease: false
   name: rake
 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.
   
   This gem is collectiveidea's fork (http://github.com/collectiveidea/delayed_job).
 email: 
-- chris@collectiveidea.com
-- brandon@opensoul.org
+- brian@collectiveidea.com
 executables: []
 
 extensions: []
@@ -207,14 +188,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: