delayed_job_mongoid 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 824ab3dc83ed1613e9e2ece9ed703a411aba94d3
-  data.tar.gz: 6a286aae4db6c1efbce2fe0449f88fc652ef6f03
+  metadata.gz: 4e1ed70a5ed5d07ef9104c2cb19cf41fc68a0694
+  data.tar.gz: 3793796caa8f4eddfd982441c9a5ddfd71fb2b18
 SHA512:
-  metadata.gz: 8134c2be8e5a26297c7c1713791357ce47bbf3d510362748f6726e122addd90dda2f5619c842dca2c66e7100a4879f0c0924ea0eb9af3796d0905f605df57b65
-  data.tar.gz: 68ef96228c0e632607e623208d0be3b4cbcc090e9107b080ee1a635ef62dc21f38d8b3604ce705db0efdf2278bc22cc5973e3d4113a385102a216883d1a59912
+  metadata.gz: c96d5a0fca52cf64119effbade77ea6c03df555074ed5d677dd58224ff842ed253dc95d819af51d3f7222ecc0cea221ac43e70776ebb4341a52ef13ebc7909e4
+  data.tar.gz: 90ec0f2f1f953ddcc7e56632b7ed36843b921ad1853873daf198c3742a861aef1a642e73b9ca94808849f00e2e282393c6cdf1876fccd67718033dcad24cb3c6

data/CHANGELOG.md

@@ -1,10 +1,18 @@
-Next Release
-============
+Next
+====
+* Your contribution here.
+
+2.2.0 - 2015-09-24
+==================
+* Support Mongoid 5.0
+
+2.1.0 - 2014-05-09
+==================
 * [#38](https://github.com/collectiveidea/delayed_job_mongoid/pull/38): Fix clearing identity map before each job - [@srleo](https://github.com/srleo)
 * [#43](https://github.com/collectiveidea/delayed_job_mongoid/pull/43): Compatibility with Mongoid 4.x and Delayed Job 4.x - [@dblock](https://github.com/dblock)
 
-2.0.0
-=====
+2.0.0 - 2012-08-02
+==================
 * Added code coverage with SimpleCov - [@sferik](https://github.com/sferik)
 * Added Mongoid 3.0 support - [@sferik](https://github.com/sferik), [@asavartsov](https://github.com/asavartsov)
 

data/delayed_job_mongoid.gemspec

@@ -2,17 +2,15 @@
 
 Gem::Specification.new do |spec|
   spec.add_dependency 'delayed_job', ['>= 3.0', '< 5']
-  spec.add_dependency 'mongoid', ['>= 3.0', '< 5']
+  spec.add_dependency 'mongoid', ['>= 3.0', '< 6']
+  spec.add_dependency 'mongoid-compatibility'
   spec.authors         = ['Chris Gaffney', 'Brandon Keepers', 'Erik Michaels-Ober']
   spec.email           = ['chris@collectiveidea.com', 'brandon@opensoul.com', 'sferik@gmail.com']
-  spec.files           = %w[CHANGELOG.md CONTRIBUTING.md LICENSE.md README.md Rakefile delayed_job_mongoid.gemspec]
-  spec.files          += Dir.glob('lib/**/*.rb')
-  spec.files          += Dir.glob('spec/**/*')
+  spec.files           = %w[CHANGELOG.md CONTRIBUTING.md LICENSE.md README.md delayed_job_mongoid.gemspec] + Dir['lib/**/*.rb']
   spec.homepage        = 'http://github.com/collectiveidea/delayed_job_mongoid'
   spec.licenses        = ['MIT']
   spec.name            = 'delayed_job_mongoid'
   spec.require_paths   = ['lib']
   spec.summary         = 'Mongoid backend for delayed_job'
-  spec.test_files      = Dir.glob('spec/**/*')
-  spec.version         = '2.1.0'
+  spec.version         = '2.2.0'
 end

data/lib/delayed/backend/mongoid.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'delayed_job'
 require 'mongoid'
+require 'mongoid/compatibility'
 
 module Delayed
   module Backend
@@ -28,29 +29,48 @@ module Delayed
           Time.now.utc
         end
 
-        # Reserves this job for the worker.
+        # Reserves one job for the worker.
         #
-        # Uses Mongo's findAndModify operation to atomically pick and lock one
-        # job from from the collection.
+        # Atomically picks and locks one job from the collection.
         def self.reserve(worker, max_run_time = Worker.max_run_time)
           right_now = db_time_now
 
+          criteria = reservation_criteria worker, right_now, max_run_time
+
+          if ::Mongoid::Compatibility::Version.mongoid5?
+            criteria.find_one_and_update(
+              {'$set' => {:locked_at => right_now, :locked_by => worker.name}},
+              :return_document => :after
+            )
+          else
+            criteria.find_and_modify(
+              {'$set' => {:locked_at => right_now, :locked_by => worker.name}},
+              :new => true
+            )
+          end
+        end
+
+        # Mongo criteria matching all the jobs the worker can reserver
+        #
+        # Jobs are sorted by priority and run_at.
+        #
+        # @api private
+        def self.reservation_criteria(worker, right_now, max_run_time)
           criteria = 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)}}
+            :locked_at => {'$lt' => (right_now - max_run_time)}
           )
 
           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?
+          criteria = criteria.desc(:locked_by).asc(:priority).asc(:run_at)
 
-          criteria.desc(:locked_by).asc(:priority).asc(:run_at).find_and_modify(
-            {'$set' => {:locked_at => right_now, :locked_by => worker.name}}, :new => true
-          )
+          criteria
         end
 
         # When a worker is exiting, make sure we don't have any locked jobs.
@@ -65,13 +85,12 @@ module Delayed
 
         # Hook method that is called after a new worker is forked
         def self.after_fork
-          # to avoid `failed with error "unauthorized"` errors in Mongoid 4.0.alpha2
-          ::Mongoid.default_session.disconnect
+          if ::Mongoid::Compatibility::Version.mongoid4?
+            # to avoid `failed with error "unauthorized"` errors in Mongoid 4.0.alpha2
+            ::Mongoid.default_session.disconnect
+          end
         end
       end
-      def self.mongoid3?
-        ::Mongoid.const_defined? :Observer # deprecated in Mongoid 4.x
-      end
     end
   end
 end

data/lib/delayed/plugins.rb

@@ -2,7 +2,7 @@
 # clear Mongoid::IdentityMap before each job
 #
 
-if Delayed::Backend::Mongoid.mongoid3?
+if ::Mongoid::Compatibility::Version.mongoid3?
   module Delayed
     module Plugins
       class ClearIdentityMap < Plugin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_mongoid
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Chris Gaffney
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -41,7 +41,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,21 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
+- !ruby/object:Gem::Dependency
+  name: mongoid-compatibility
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - chris@collectiveidea.com
@@ -65,15 +79,11 @@ files:
 - CONTRIBUTING.md
 - LICENSE.md
 - README.md
-- Rakefile
 - delayed_job_mongoid.gemspec
 - lib/delayed/backend/mongoid.rb
 - lib/delayed/plugins.rb
 - lib/delayed/serialization/mongoid.rb
 - lib/delayed_job_mongoid.rb
-- spec/delayed_job_mongoid_spec.rb
-- spec/helper.rb
-- spec/plugins_spec.rb
 homepage: http://github.com/collectiveidea/delayed_job_mongoid
 licenses:
 - MIT
@@ -94,12 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Mongoid backend for delayed_job
-test_files:
-- spec/delayed_job_mongoid_spec.rb
-- spec/helper.rb
-- spec/plugins_spec.rb
+test_files: []
 has_rdoc: 

data/Rakefile

@@ -1,34 +0,0 @@
-# encoding: utf-8
-require 'rubygems'
-require 'bundler/setup'
-Bundler::GemHelper.install_tasks
-
-require 'rspec/core/rake_task'
-desc 'Run the specs'
-RSpec::Core::RakeTask.new do |r|
-  r.verbose = false
-end
-
-task :test => :spec
-
-begin
-  require 'rubocop/rake_task'
-  Rubocop::RakeTask.new
-rescue LoadError
-  task :rubocop do
-    $stderr.puts 'Rubocop is disabled'
-  end
-end
-
-require 'yardstick/rake/measurement'
-Yardstick::Rake::Measurement.new do |measurement|
-  measurement.output = 'measurement/report.txt'
-end
-
-require 'yardstick/rake/verify'
-Yardstick::Rake::Verify.new do |verify|
-  verify.require_exact_threshold = false
-  verify.threshold = 53.3
-end
-
-task :default => [:spec, :rubocop, :verify_measurements]

data/spec/delayed_job_mongoid_spec.rb

@@ -1,5 +0,0 @@
-require 'helper'
-
-describe Delayed::Backend::Mongoid::Job do
-  it_behaves_like 'a delayed_job backend'
-end

data/spec/helper.rb

@@ -1,42 +0,0 @@
-require 'simplecov'
-require 'coveralls'
-
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-
-SimpleCov.start do
-  add_filter '/spec/'
-  minimum_coverage(77.27)
-end
-
-require 'rspec'
-require 'delayed_job_mongoid'
-require 'delayed/backend/shared_spec'
-
-RSpec.configure do |config|
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-end
-
-Mongoid.configure do |config|
-  config.connect_to('dl_spec')
-end
-
-class Story
-  include ::Mongoid::Document
-  field :text
-
-  def tell
-    text
-  end
-
-  def whatever(n, _)
-    tell * n
-  end
-  def self.count; end
-
-  handle_asynchronously :whatever
-end

data/spec/plugins_spec.rb

@@ -1,23 +0,0 @@
-require 'helper'
-
-if Delayed::Backend::Mongoid.mongoid3?
-  describe Delayed::Backend::Mongoid::Job do
-    let(:worker) { Delayed::Worker.new }
-    before do
-      Delayed::Worker.max_priority = nil
-      Delayed::Worker.min_priority = nil
-      Delayed::Worker.default_priority = 99
-      Delayed::Worker.delay_jobs = true
-      SimpleJob.runs = 0
-      described_class.delete_all
-    end
-    after do
-      Delayed::Worker.reset
-    end
-    it 'clears mongoid identity map' do
-      expect(Mongoid::IdentityMap).to receive(:clear).once
-      described_class.enqueue SimpleJob.new, :priority => 5
-      worker.work_off
-    end
-  end
-end