Extract Mongoid backend into its own gem. See http://github.com/colle…

…ctiveidea/delayed_job_data_mapper

README.textile

@@ -51,14 +51,6 @@ $ script/generate delayed_job
 $ rake db:migrate
 </pre>
 
-h3. DataMapper
-
-<pre>
-# config/initializers/delayed_job.rb
-Delayed::Worker.backend = :data_mapper
-Delayed::Worker.backend.auto_upgrade!
-</pre>
-
 h2. Queuing Jobs
 
 Call @.delay.method(params)@ on any object and it will be processed in the background.

Rakefile

@@ -21,14 +21,10 @@ Jeweler::Tasks.new do |s|
   s.test_files = Dir['spec/*_spec.rb']
 
   s.add_dependency "daemons"
+  s.add_dependency "activesupport"
   s.add_development_dependency "rspec"
   s.add_development_dependency "sqlite3-ruby"
   s.add_development_dependency "activerecord"
-  s.add_development_dependency "dm-core"
-  s.add_development_dependency "dm-observer"
-  s.add_development_dependency "dm-aggregates"
-  s.add_development_dependency "dm-validations"
-  s.add_development_dependency "do_sqlite3"
   s.add_development_dependency "couchrest"
 end
 

delayed_job.gemspec

@@ -34,7 +34,6 @@ This gem is collectiveidea's fork (http://github.com/collectiveidea/delayed_job)
      "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/shared_spec.rb",
      "lib/delayed/command.rb",
      "lib/delayed/message_sending.rb",
@@ -54,13 +53,11 @@ This gem is collectiveidea's fork (http://github.com/collectiveidea/delayed_job)
      "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/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/spec_helper.rb",
      "spec/worker_spec.rb",
      "spec/yaml_ext_spec.rb",
@@ -84,37 +81,25 @@ This gem is collectiveidea's fork (http://github.com/collectiveidea/delayed_job)
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<daemons>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_development_dependency(%q<activerecord>, [">= 0"])
-      s.add_development_dependency(%q<dm-core>, [">= 0"])
-      s.add_development_dependency(%q<dm-observer>, [">= 0"])
-      s.add_development_dependency(%q<dm-aggregates>, [">= 0"])
-      s.add_development_dependency(%q<dm-validations>, [">= 0"])
-      s.add_development_dependency(%q<do_sqlite3>, [">= 0"])
       s.add_development_dependency(%q<couchrest>, [">= 0"])
     else
       s.add_dependency(%q<daemons>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_dependency(%q<activerecord>, [">= 0"])
-      s.add_dependency(%q<dm-core>, [">= 0"])
-      s.add_dependency(%q<dm-observer>, [">= 0"])
-      s.add_dependency(%q<dm-aggregates>, [">= 0"])
-      s.add_dependency(%q<dm-validations>, [">= 0"])
-      s.add_dependency(%q<do_sqlite3>, [">= 0"])
       s.add_dependency(%q<couchrest>, [">= 0"])
     end
   else
     s.add_dependency(%q<daemons>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<dm-core>, [">= 0"])
-    s.add_dependency(%q<dm-observer>, [">= 0"])
-    s.add_dependency(%q<dm-aggregates>, [">= 0"])
-    s.add_dependency(%q<dm-validations>, [">= 0"])
-    s.add_dependency(%q<do_sqlite3>, [">= 0"])
     s.add_dependency(%q<couchrest>, [">= 0"])
   end
 end

lib/delayed/backend/shared_spec.rb

@@ -189,13 +189,13 @@ def create_job(opts = {})
     end      
 
     it "should be able to get access to the task if it was started more then max_age ago" do
-      @job.locked_at = 5.hours.ago
+      @job.locked_at = @backend.db_time_now - 5.hours
       @job.save
 
       @job.lock_exclusively! 4.hours, 'worker2'
       @job.reload
       @job.locked_by.should == 'worker2'
-      @job.locked_at.should > 1.minute.ago
+      @job.locked_at.should > (@backend.db_time_now - 1.minute)
     end
 
     it "should not be found by another worker" do
@@ -226,7 +226,7 @@ def create_job(opts = {})
     end
 
     it "should not allow a second worker to get exclusive access if failed to be processed by worker1 and run_at time is now in future (due to backing off behaviour)" do
-      @job.update_attributes(:attempts => 1, :run_at => 1.day.from_now)
+      @job.update_attributes(:attempts => 1, :run_at => @backend.db_time_now + 1.day)
       @job_copy_for_worker_2.lock_exclusively!(4.hours, 'worker2').should == false
     end
   end

lib/delayed/message_sending.rb

@@ -1,4 +1,5 @@
 require 'active_support/basic_object'
+require 'active_support/core_ext/module/aliasing'
 
 module Delayed
   class DelayProxy < ActiveSupport::BasicObject