delayed_job_mongoid 1.1.0 → 2.0.0

data/lib/delayed/backend/mongoid.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'delayed_job'
-require 'mongo'
 require 'mongoid'
 
 module Delayed
@@ -10,6 +9,7 @@ module Delayed
         include ::Mongoid::Document
         include ::Mongoid::Timestamps
         include Delayed::Backend::Base
+
         field :priority,    :type => Integer, :default => 0
         field :attempts,    :type => Integer, :default => 0
         field :handler,     :type => String
@@ -20,22 +20,10 @@ module Delayed
         field :last_error,  :type => String
         field :queue,       :type => String
 
-        if ::Mongoid::VERSION.to_f >= 3
-          index({:locked_by => -1, :priority => 1, :run_at => 1})
-        else
-          index([[:locked_by, -1], [:priority, 1], [:run_at, 1]])
-        end
+        index :locked_by => -1, :priority => 1, :run_at => 1
 
         before_save :set_default_run_at
 
-        def self.before_fork
-          ::Mongoid.master.connection.close
-        end
-
-        def self.after_fork
-          ::Mongoid.master.connection.connect
-        end
-
         def self.db_time_now
           Time.now.utc
         end
@@ -43,40 +31,31 @@ module Delayed
         # Reserves this job for the worker.
         #
         # Uses Mongo's findAndModify operation to atomically pick and lock one
-        # job from from the collection. findAndModify is not yet available
-        # directly thru Mongoid so go down to the Mongo Ruby driver instead.
+        # job from from the collection.
         def self.reserve(worker, max_run_time = Worker.max_run_time)
           right_now = db_time_now
 
-          conditions = {:run_at  => {"$lte" => right_now}, :failed_at => nil}
-          (conditions[:priority] ||= {})['$gte'] = Worker.min_priority.to_i if Worker.min_priority
-          (conditions[:priority] ||= {})['$lte'] = Worker.max_priority.to_i if Worker.max_priority
-          (conditions[:queue] ||= {})['$in'] = Worker.queues if Worker.queues.any?
-
-          conditions['$or'] = [
+          criteria = self.where(
+            :run_at => {"$lte" => right_now},
+            :failed_at => nil
+          ).any_of(
             { :locked_by => worker.name },
             { :locked_at => nil },
             { :locked_at => { '$lt' => (right_now - max_run_time) }}
-          ]
+          )
 
-          begin
-            result = self.db.collection(self.collection.name).find_and_modify(
-              :query  => conditions,
-              :sort   => [['locked_by', -1], ['priority', 1], ['run_at', 1]],
-              :update => {"$set" => {:locked_at => right_now, :locked_by => worker.name}}
-            )
+          criteria = criteria.gte(:priority => Worker.min_priority.to_i) if Worker.min_priority
+          criteria = criteria.lte(:priority => Worker.max_priority.to_i) if Worker.max_priority
+          criteria = criteria.any_in(:queue => Worker.queues) if Worker.queues.any?
 
-            # Return result as a Mongoid document.
-            # When Mongoid starts supporting findAndModify, this extra step should no longer be necessary.
-            self.find(:first, :conditions => {:_id => result["_id"]}) unless result.nil?
-          rescue Mongo::OperationFailure
-            nil # no jobs available
-          end
+          criteria.desc(:locked_by).asc(:priority).asc(:run_at).find_and_modify(
+            {"$set" => {:locked_at => right_now, :locked_by => worker.name}}, :new => true
+          )
         end
 
         # When a worker is exiting, make sure we don't have any locked jobs.
         def self.clear_locks!(worker_name)
-          self.collection.update({:locked_by => worker_name}, {"$set" => {:locked_at => nil, :locked_by => nil}}, :multi => true)
+          self.where(:locked_by => worker_name).update_all({:locked_at => nil, :locked_by => nil})
         end
 
         def reload(*args)

data/spec/delayed_job_mongoid_spec.rb

@@ -2,28 +2,4 @@ require 'spec_helper'
 
 describe Delayed::Backend::Mongoid::Job do
   it_should_behave_like 'a delayed_job backend'
-  
-  describe "before_fork" do
-    after do
-      ::Mongoid.master.connection.close
-    end
-    
-    it "should disconnect" do
-      lambda do
-        Delayed::Backend::Mongoid::Job.before_fork
-      end.should change { !!Mongoid.master.connection.connected? }.from(true).to(false)
-    end
-  end
-
-  describe "after_fork" do
-    before do
-      ::Mongoid.master.connection.close
-    end
-    
-    it "should call reconnect" do
-      lambda do
-        Delayed::Backend::Mongoid::Job.after_fork
-      end.should change { !!Mongoid.master.connection.connected? }.from(false).to(true)
-    end
-  end
-end
+end

data/spec/spec_helper.rb

@@ -1,13 +1,16 @@
-require 'rubygems'
-require 'bundler/setup'
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+unless ENV['CI']
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter 'spec'
+  end
+end
+
 require 'rspec'
 require 'delayed_job_mongoid'
 require 'delayed/backend/shared_spec'
 
 Mongoid.configure do |config|
-  config.master = config.master = Mongo::Connection.new.db('dl_spec')
+  config.connect_to("dl_spec")
 end
 
 class Story
@@ -18,4 +21,3 @@ class Story
 
   handle_asynchronously :whatever
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_mongoid
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,16 +10,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mongo
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,16 +27,32 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: delayed_job
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -45,29 +61,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: delayed_job
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: '0.9'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +91,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.6'
 description: 
 email:
 - chris@collectiveidea.com
@@ -108,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4375365577565581306
+      hash: -913743688657912921
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4375365577565581306
+      hash: -913743688657912921
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23