delayed_job 2.0.8 → 2.1.0.pre

data/spec/performable_method_spec.rb

@@ -1,53 +1,30 @@
 require 'spec_helper'
 
-class StoryReader
-  def read(story)
-    "Epilog: #{story.tell}"
-  end
-end
-
 describe Delayed::PerformableMethod do
-  
-  it "should ignore ActiveRecord::RecordNotFound errors because they are permanent" do
-    story = Story.create :text => 'Once upon...'
-    p = Delayed::PerformableMethod.new(story, :tell, [])
-    story.destroy
-    lambda { p.perform }.should_not raise_error
-  end
-  
-  it "should store the object as string if its an active record" do
-    story = Story.create :text => 'Once upon...'
-    p = Delayed::PerformableMethod.new(story, :tell, [])
-    p.class.should   == Delayed::PerformableMethod
-    p.object.should  == "LOAD;Story;#{story.id}"
-    p.method.should  == :tell
-    p.args.should    == []
-    p.perform.should == 'Once upon...'
-  end
-  
-  it "should allow class methods to be called on ActiveRecord models" do
-    p = Delayed::PerformableMethod.new(Story, :count, [])
-    lambda { p.send(:load, p.object) }.should_not raise_error
-  end
-  
-  it "should store arguments as string if they are active record objects" do
-    story = Story.create :text => 'Once upon...'
-    reader = StoryReader.new
-    p = Delayed::PerformableMethod.new(reader, :read, [story])
-    p.class.should   == Delayed::PerformableMethod
-    p.method.should  == :read
-    p.args.should    == ["LOAD;Story;#{story.id}"]
-    p.perform.should == 'Epilog: Once upon...'
-  end
-
-  it "should not raise NoMethodError if target method is private" do
-    clazz = Class.new do
-      def private_method
+  describe "perform" 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
-      private :private_method
     end
+    
+    it "should call the method on the object" do
+      @method.object.should_receive(:count).with('o')
+      @method.perform
+    end
+  end
+
+  it "should raise a ArgumentError if target method doesn't exist" do
     lambda {
-      Delayed::PerformableMethod.new(clazz.new, :private_method, [])
-    }.should_not raise_error(NoMethodError)
+      Delayed::PerformableMethod.new(Object, :method_that_does_not_exist, [])
+    }.should raise_error(NoMethodError)
   end
 end

data/spec/sample_jobs.rb

@@ -15,7 +15,6 @@ end
 class OnPermanentFailureJob < SimpleJob
   def on_permanent_failure
   end
-  def max_attempts; 1; end
 end
 
 module M

data/spec/setup/couch_rest.rb

@@ -0,0 +1,7 @@
+require 'couchrest'
+require 'delayed/backend/couch_rest'
+
+Delayed::Backend::CouchRest::Job.use_database CouchRest::Server.new.database!('delayed_job_spec')
+
+# try to perform a query to check that we can connect
+Delayed::Backend::CouchRest::Job.all

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'spec'
 require 'logger'
 
-gem 'rails', '~>2.3.5'
+gem 'activerecord', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
 
 require 'delayed_job'
 require 'sample_jobs'
@@ -20,9 +20,12 @@ Dir.glob("#{File.dirname(__FILE__)}/setup/*.rb") do |backend|
     require "setup/#{backend}"
     require "backend/#{backend}_job_spec"
     BACKENDS << backend.to_sym
-  rescue LoadError, Exception
-    puts "Unable to load #{backend} backend! #{$!}"
+  rescue Exception
+    puts "Unable to load #{backend} backend: #{$!}"
   end
 end
 
 Delayed::Worker.backend = BACKENDS.first
+
+# Add this directory so the ActiveSupport autoloading works
+ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__)

data/spec/worker_spec.rb

@@ -6,14 +6,16 @@ describe Delayed::Worker do
   end
 
   describe "backend=" do
-    it "should set the Delayed::Job constant to the backend" do
+    before do
       @clazz = Class.new
       Delayed::Worker.backend = @clazz
+    end
+
+    it "should set the Delayed::Job constant to the backend" do
       Delayed::Job.should == @clazz
     end
     
     it "should set backend with a symbol" do
-      Delayed::Worker.backend = Class.new
       Delayed::Worker.backend = :active_record
       Delayed::Worker.backend.should == Delayed::Backend::ActiveRecord::Job
     end
@@ -51,8 +53,6 @@ describe Delayed::Worker do
         end
 
         it "should only work_off jobs that are >= min_priority" do
-          SimpleJob.runs.should == 0
-
           job_create(:priority => -10)
           job_create(:priority => 0)
           @worker.work_off
@@ -61,8 +61,6 @@ describe Delayed::Worker do
         end
 
         it "should only work_off jobs that are <= max_priority" do
-          SimpleJob.runs.should == 0
-
           job_create(:priority => 10)
           job_create(:priority => 0)
 
@@ -104,7 +102,6 @@ describe Delayed::Worker do
           # reset defaults
           Delayed::Worker.destroy_failed_jobs = true
           Delayed::Worker.max_attempts = 25
-          Delayed::Job.delete_all
 
           @job = Delayed::Job.enqueue ErrorJob.new
         end
@@ -121,33 +118,13 @@ describe Delayed::Worker do
         end
     
         it "should re-schedule jobs after failing" do
-          @worker.work_off
+          @worker.run(@job)
           @job.reload
           @job.last_error.should =~ /did not work/
           @job.last_error.should =~ /sample_jobs.rb:8:in `perform'/
           @job.attempts.should == 1
           @job.run_at.should > Delayed::Job.db_time_now - 10.minutes
           @job.run_at.should < Delayed::Job.db_time_now + 10.minutes
-          @job.locked_at.should be_nil
-          @job.locked_by.should be_nil
-        end
-        
-        context "when the job's payload implements #reschedule_at" do
-          before(:each) do
-            @reschedule_at = Time.current + 7.hours
-            @job.payload_object.stub!(:reschedule_at).and_return(@reschedule_at)
-          end
-
-          it 'should invoke the strategy to re-schedule' do
-            @job.payload_object.should_receive(:reschedule_at) do |time, attempts|
-              (Delayed::Job.db_time_now - time).should < 2
-              attempts.should == 1
-
-              Delayed::Job.db_time_now + 5
-            end
-
-            @worker.run(@job)
-          end
         end
       end
   
@@ -165,7 +142,7 @@ describe Delayed::Worker do
 
             it "should run that hook" do
               @job.payload_object.should_receive :on_permanent_failure
-              @worker.reschedule(@job)
+              Delayed::Worker.max_attempts.times { @worker.reschedule(@job) }
             end
           end
 

metadata

@@ -1,339 +1,253 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: delayed_job
-version: !ruby/object:Gem::Version
-  version: 2.0.8
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: true
+  segments: 
+  - 2
+  - 1
+  - 0
+  - pre
+  version: 2.1.0.pre
 platform: ruby
-authors:
-- Chris Gaffney
+authors: 
 - Brandon Keepers
-- Tobias Lütke
+- "Tobias L\xC3\xBCtke"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2010-05-21 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: daemons
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.10
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.10
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activerecord
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: mongo_mapper
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: dm-core
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: dm-core
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: dm-observer
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: dm-observer
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: dm-aggregates
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  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: dm-aggregates
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: dm-validations
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: dm-validations
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: do_sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: do_sqlite3
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: couchrest
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-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
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
+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: tobi@leetsoft.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.textile
-files:
+files: 
+- .gitignore
+- MIT-LICENSE
+- README.textile
+- Rakefile
+- VERSION
+- benchmarks.rb
 - contrib/delayed_job.monitrc
 - contrib/delayed_job_multiple.monitrc
+- delayed_job.gemspec
+- generators/delayed_job/delayed_job_generator.rb
+- generators/delayed_job/templates/migration.rb
+- generators/delayed_job/templates/script
+- init.rb
 - lib/delayed/backend/active_record.rb
 - lib/delayed/backend/base.rb
+- lib/delayed/backend/couch_rest.rb
 - lib/delayed/backend/data_mapper.rb
 - lib/delayed/backend/mongo_mapper.rb
 - lib/delayed/command.rb
-- lib/delayed/deserialization_error.rb
 - lib/delayed/message_sending.rb
 - lib/delayed/performable_method.rb
 - lib/delayed/railtie.rb
 - lib/delayed/recipes.rb
 - lib/delayed/tasks.rb
 - lib/delayed/worker.rb
+- lib/delayed/yaml_ext.rb
 - lib/delayed_job.rb
-- generators/delayed_job/delayed_job_generator.rb
-- generators/delayed_job/templates/migration.rb
-- generators/delayed_job/templates/script
+- 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/autoloaded/clazz.rb
+- spec/autoloaded/struct.rb
 - spec/backend/active_record_job_spec.rb
+- spec/backend/couch_rest_job_spec.rb
 - spec/backend/data_mapper_job_spec.rb
 - spec/backend/mongo_mapper_job_spec.rb
 - spec/backend/shared_backend_spec.rb
-- spec/delayed_method_spec.rb
 - spec/message_sending_spec.rb
 - spec/performable_method_spec.rb
 - spec/sample_jobs.rb
 - spec/setup/active_record.rb
+- spec/setup/couch_rest.rb
 - spec/setup/data_mapper.rb
 - spec/setup/mongo_mapper.rb
 - spec/spec_helper.rb
-- spec/story_spec.rb
 - spec/worker_spec.rb
 - tasks/jobs.rake
-- 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
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
       - 0
-      hash: -534603219747213173
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -534603219747213173
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify
-test_files:
-- spec/backend/active_record_job_spec.rb
-- spec/backend/data_mapper_job_spec.rb
-- spec/backend/mongo_mapper_job_spec.rb
-- spec/backend/shared_backend_spec.rb
-- spec/delayed_method_spec.rb
+test_files: 
 - spec/message_sending_spec.rb
 - spec/performable_method_spec.rb
-- spec/sample_jobs.rb
-- spec/setup/active_record.rb
-- spec/setup/data_mapper.rb
-- spec/setup/mongo_mapper.rb
-- spec/spec_helper.rb
-- spec/story_spec.rb
 - spec/worker_spec.rb