delayed_job 2.1.4 → 3.0.0.pre

data/spec/worker_spec.rb

@@ -12,26 +12,8 @@ describe Delayed::Worker do
     end
 
     it "should set backend with a symbol" do
-      Delayed::Worker.backend = :active_record
-      Delayed::Worker.backend.should == Delayed::Backend::ActiveRecord::Job
-    end
-  end
-
-  describe "guess_backend" do
-    after do
-      Delayed::Worker.backend = :active_record
-    end
-
-    it "should set to active_record if nil" do
-      Delayed::Worker.backend = nil
-      lambda {
-        Delayed::Worker.guess_backend
-      }.should change { Delayed::Worker.backend }.to(Delayed::Backend::ActiveRecord::Job)
-    end
-
-    it "should not override the existing backend" do
-      Delayed::Worker.backend = Class.new
-      lambda { Delayed::Worker.guess_backend }.should_not change { Delayed::Worker.backend }
+      Delayed::Worker.backend = :test
+      Delayed::Worker.backend.should == Delayed::Backend::Test::Job
     end
   end
 end

data/spec/yaml_ext_spec.rb

@@ -1,31 +1,31 @@
 require 'spec_helper'
 
-describe YAML do
-  it "should autoload classes that are unknown at runtime" do
+describe "YAML" do
+  it "should autoload classes" do
     lambda {
-      obj = YAML.load("--- !ruby/object:Autoloaded::Clazz {}")
-      obj.class.to_s.should == 'Autoloaded::Clazz'
+      yaml = "--- !ruby/class:Autoloaded::Clazz {}\n"
+      YAML.load(yaml).should == Autoloaded::Clazz
     }.should_not raise_error
   end
 
-  it "should autoload structs that are unknown at runtime" do
+  it "should autoload the class of a struct" do
     lambda {
-      obj = YAML.load("--- !ruby/struct:Autoloaded::Struct {}")
-      obj.class.to_s.should == 'Autoloaded::Struct'
+      yaml = "--- !ruby/class:Autoloaded::Struct {}\n"
+      YAML.load(yaml).should == Autoloaded::Struct
     }.should_not raise_error
   end
 
-  # As we're overriding some of Yaml's internals it is best that our changes
-  # don't impact other places where Yaml is used. Or at least don't make it
-  # look like the exception is caused by DJ
-  it "should not raise exception on poorly formatted yaml" do
-    lambda do
-      YAML.load(<<-EOYAML
-default:
-  <<: *login
-EOYAML
-      )
-    end.should_not raise_error
+  it "should autoload the class for the instance of a struct" do
+    lambda {
+      yaml = "--- !ruby/struct:Autoloaded::InstanceStruct {}"
+      YAML.load(yaml).class.should == Autoloaded::InstanceStruct
+    }.should_not raise_error
+  end
+
+  it "should autoload the class for the instance" do
+    lambda {
+      yaml = "--- !ruby/object:Autoloaded::InstanceClazz {}\n"
+      YAML.load(yaml).class.should == Autoloaded::InstanceClazz
+    }.should_not raise_error
   end
-  
 end

metadata

@@ -1,220 +1,194 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: delayed_job
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 4
-  version: 2.1.4
+version: !ruby/object:Gem::Version
+  version: 3.0.0.pre
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Chris Gaffney
 - Brandon Keepers
-- "Tobias L\xC3\xBCtke"
+- Tobias Lütke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-11 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+date: 2011-09-28 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: daemons
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70127307821420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
+  prerelease: false
+  version_requirements: *70127307821420
+- !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70127307819760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
   prerelease: false
+  version_requirements: *70127307819760
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70127307818840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
+  prerelease: false
+  version_requirements: *70127307818840
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70127307818160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70127307818160
+- !ruby/object:Gem::Dependency
   name: rails
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70127307817220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
+  prerelease: false
+  version_requirements: *70127307817220
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70127307816440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
+  prerelease: false
+  version_requirements: *70127307816440
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70127307815820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: sqlite3
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  name: mysql
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
-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: 
+  version_requirements: *70127307815820
+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
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
+files:
 - contrib/delayed_job.monitrc
 - contrib/delayed_job_multiple.monitrc
-- 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/lifecycle.rb
 - lib/delayed/message_sending.rb
 - lib/delayed/performable_mailer.rb
 - lib/delayed/performable_method.rb
+- lib/delayed/plugin.rb
+- lib/delayed/plugins/clear_locks.rb
+- lib/delayed/psych_ext.rb
 - lib/delayed/railtie.rb
 - lib/delayed/recipes.rb
 - lib/delayed/serialization/active_record.rb
+- lib/delayed/syck_ext.rb
 - lib/delayed/tasks.rb
 - lib/delayed/worker.rb
 - lib/delayed/yaml_ext.rb
 - lib/delayed_job.rb
 - lib/generators/delayed_job/delayed_job_generator.rb
-- lib/generators/delayed_job/templates/migration.rb
 - lib/generators/delayed_job/templates/script
 - recipes/delayed_job.rb
-- spec/active_record_job_spec.rb
 - spec/autoloaded/clazz.rb
+- spec/autoloaded/instance_clazz.rb
+- spec/autoloaded/instance_struct.rb
 - spec/autoloaded/struct.rb
-- spec/database.yml
+- spec/delayed/backend/test.rb
+- spec/delayed/serialization/test.rb
+- spec/lifecycle_spec.rb
 - spec/message_sending_spec.rb
 - spec/performable_mailer_spec.rb
 - spec/performable_method_spec.rb
 - spec/sample_jobs.rb
 - spec/spec_helper.rb
+- spec/test_backend_spec.rb
 - spec/worker_spec.rb
 - spec/yaml_ext_spec.rb
 - MIT-LICENSE
 - README.textile
-has_rdoc: true
 homepage: http://github.com/collectiveidea/delayed_job
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.textile
 - --inline-source
 - --line-numbers
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -811957530217889269
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify
-test_files: 
-- spec/active_record_job_spec.rb
+test_files:
 - spec/autoloaded/clazz.rb
+- spec/autoloaded/instance_clazz.rb
+- spec/autoloaded/instance_struct.rb
 - spec/autoloaded/struct.rb
-- spec/database.yml
+- spec/delayed/backend/test.rb
+- spec/delayed/serialization/test.rb
+- spec/lifecycle_spec.rb
 - spec/message_sending_spec.rb
 - spec/performable_mailer_spec.rb
 - spec/performable_method_spec.rb
 - spec/sample_jobs.rb
 - spec/spec_helper.rb
+- spec/test_backend_spec.rb
 - spec/worker_spec.rb
 - spec/yaml_ext_spec.rb

data/lib/delayed/backend/active_record.rb

@@ -1,82 +0,0 @@
-require 'active_record'
-
-module Delayed
-  module Backend
-    module ActiveRecord
-      # A job object that is persisted to the database.
-      # Contains the work object as a YAML field.
-      class Job < ::ActiveRecord::Base
-        include Delayed::Backend::Base
-        set_table_name :delayed_jobs
-
-        before_save :set_default_run_at
-
-        scope :ready_to_run, lambda {|worker_name, max_run_time|
-          where(['(run_at <= ? AND (locked_at IS NULL OR locked_at < ?) OR locked_by = ?) AND failed_at IS NULL', db_time_now, db_time_now - max_run_time, worker_name])
-        }
-        scope :by_priority, order('priority ASC, run_at ASC')
-
-        def self.before_fork
-          ::ActiveRecord::Base.clear_all_connections!
-        end
-
-        def self.after_fork
-          ::ActiveRecord::Base.establish_connection
-        end
-
-        # When a worker is exiting, make sure we don't have any locked jobs.
-        def self.clear_locks!(worker_name)
-          update_all("locked_by = null, locked_at = null", ["locked_by = ?", worker_name])
-        end
-
-        # Find a few candidate jobs to run (in case some immediately get locked by others).
-        def self.find_available(worker_name, limit = 5, max_run_time = Worker.max_run_time)
-          scope = self.ready_to_run(worker_name, max_run_time)
-          scope = scope.scoped(:conditions => ['priority >= ?', Worker.min_priority]) if Worker.min_priority
-          scope = scope.scoped(:conditions => ['priority <= ?', Worker.max_priority]) if Worker.max_priority
-
-          ::ActiveRecord::Base.silence do
-            scope.by_priority.all(:limit => limit)
-          end
-        end
-
-        # Lock this job for this worker.
-        # Returns true if we have the lock, false otherwise.
-        def lock_exclusively!(max_run_time, worker)
-          now = self.class.db_time_now
-          affected_rows = if locked_by != worker
-            # We don't own this job so we will update the locked_by name and the locked_at
-            self.class.update_all(["locked_at = ?, locked_by = ?", now, worker], ["id = ? and (locked_at is null or locked_at < ?) and (run_at <= ?)", id, (now - max_run_time.to_i), now])
-          else
-            # We already own this job, this may happen if the job queue crashes.
-            # Simply resume and update the locked_at
-            self.class.update_all(["locked_at = ?", now], ["id = ? and locked_by = ?", id, worker])
-          end
-          if affected_rows == 1
-            self.locked_at = now
-            self.locked_by = worker
-            self.locked_at_will_change!
-            self.locked_by_will_change!
-            return true
-          else
-            return false
-          end
-        end
-
-        # Get the current time (GMT or local depending on DB)
-        # Note: This does not ping the DB to get the time, so all your clients
-        # must have syncronized clocks.
-        def self.db_time_now
-          if Time.zone
-            Time.zone.now
-          elsif ::ActiveRecord::Base.default_timezone == :utc
-            Time.now.utc
-          else
-            Time.now
-          end
-        end
-
-      end
-    end
-  end
-end

data/lib/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

data/spec/active_record_job_spec.rb

@@ -1,36 +0,0 @@
-require 'spec_helper'
-require 'delayed/backend/active_record'
-
-describe Delayed::Backend::ActiveRecord::Job do
-  after do
-    Time.zone = nil
-  end
-
-  it_should_behave_like 'a delayed_job backend'
-
-  context "db_time_now" do
-    it "should return time in current time zone if set" do
-      Time.zone = 'Eastern Time (US & Canada)'
-      %w(EST EDT).should include(Delayed::Job.db_time_now.zone)
-    end
-
-    it "should return UTC time if that is the AR default" do
-      Time.zone = nil
-      ActiveRecord::Base.default_timezone = :utc
-      Delayed::Backend::ActiveRecord::Job.db_time_now.zone.should == 'UTC'
-    end
-
-    it "should return local time if that is the AR default" do
-      Time.zone = 'Central Time (US & Canada)'
-      ActiveRecord::Base.default_timezone = :local
-      %w(CST CDT).should include(Delayed::Backend::ActiveRecord::Job.db_time_now.zone)
-    end
-  end
-
-  describe "after_fork" do
-    it "should call reconnect on the connection" do
-      ActiveRecord::Base.should_receive(:establish_connection)
-      Delayed::Backend::ActiveRecord::Job.after_fork
-    end
-  end
-end

data/spec/database.yml

@@ -1,4 +0,0 @@
-mysql:
-  adapter: mysql
-  database: delayed_job
-  username: root