delayed_job_mongoid 2.0.0 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 824ab3dc83ed1613e9e2ece9ed703a411aba94d3
+  data.tar.gz: 6a286aae4db6c1efbce2fe0449f88fc652ef6f03
+SHA512:
+  metadata.gz: 8134c2be8e5a26297c7c1713791357ce47bbf3d510362748f6726e122addd90dda2f5619c842dca2c66e7100a4879f0c0924ea0eb9af3796d0905f605df57b65
+  data.tar.gz: 68ef96228c0e632607e623208d0be3b4cbcc090e9107b080ee1a635ef62dc21f38d8b3604ce705db0efdf2278bc22cc5973e3d4113a385102a216883d1a59912

data/CHANGELOG.md

@@ -0,0 +1,19 @@
+Next Release
+============
+* [#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
+=====
+* 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)
+
+1.0.2 - 2010-01-12
+==================
+* Fix a potential memory leak inside mongo when reserving jobs on mongo 1.6+
+* Fixed gemspec to work with Mongoid 2.0 RC and Rubygems 1.4
+
+1.0.1 - 2010-12-01
+==================
+* Use MongoDB's findAndModify to reserve the next available job in one atomic operation
+* Better index

data/CONTRIBUTING.md

@@ -0,0 +1,14 @@
+## How to contribute
+
+If you find what looks like a bug:
+
+* Search the [mailing list](http://groups.google.com/group/delayed_job) to see if anyone else had the same issue.
+* Check the [GitHub issue tracker](http://github.com/collectiveidea/delayed_job_mongoid/issues/) to see if anyone else has reported issue.
+* If you don't see anything, create an issue with information on how to reproduce it.
+
+If you want to contribute an enhancement or a fix:
+
+* Fork the project on github.
+* Make your changes with tests.
+* Commit the changes without making changes to the Rakefile or any other files that aren't related to your enhancement or fix
+* Send a pull request.

data/README.md

@@ -1,13 +1,21 @@
-# delayed_job Mongoid backend [![Build Status](https://secure.travis-ci.org/collectiveidea/delayed_job_mongoid.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/collectiveidea/delayed_job_mongoid.png?travis)][gemnasium] [![Code Climate](https://codeclimate.com/badge.png)][codeclimate]
+# DelayedJob Mongoid backend
 
+[![Gem Version](http://img.shields.io/gem/v/delayed_job_mongoid.svg)][gem]
+[![Build Status](http://img.shields.io/travis/collectiveidea/delayed_job_mongoid.svg)][travis]
+[![Dependency Status](http://img.shields.io/gemnasium/collectiveidea/delayed_job_mongoid.svg)][gemnasium]
+[![Code Climate](http://img.shields.io/codeclimate/github/collectiveidea/delayed_job_mongoid.svg)][codeclimate]
+[![Coverage Status](http://img.shields.io/coveralls/collectiveidea/delayed_job_mongoid.svg)][coveralls]
+
+[gem]: https://rubygems.org/gems/delayed_job_mongoid
 [travis]: http://travis-ci.org/collectiveidea/delayed_job_mongoid
 [gemnasium]: https://gemnasium.com/collectiveidea/delayed_job_mongoid
 [codeclimate]: https://codeclimate.com/github/collectiveidea/delayed_job_mongoid
+[coveralls]: https://coveralls.io/r/collectiveidea/delayed_job_mongoid
 
 ## Requirements
 
-Make sure you are using MongoDB version 1.3 or newer. `delayed_job_mongoid` uses the `findandmodify` command which is only available in recent versions.
-
+Make sure you are using MongoDB version 1.3 or newer. `delayed_job_mongoid`
+uses the `findandmodify` command which is only available in recent versions.
 
 ## Installation
 
@@ -15,8 +23,14 @@ Add the gem to your Gemfile:
 
     gem 'delayed_job_mongoid'
 
-After running `bundle install`, create the indexes (and don't forget to do this on your production database):
+After running `bundle install`, create the indexes (and don't forget to do this
+on your production database):
 
     script/rails runner 'Delayed::Backend::Mongoid::Job.create_indexes'
 
-That's it. Use [delayed_job as normal](http://github.com/collectiveidea/delayed_job).
+To generate script/delayed_job:
+
+    rails generate delayed_job
+
+That's it. Use [delayed_job](http://github.com/collectiveidea/delayed_job) as
+normal.

data/Rakefile

@@ -0,0 +1,34 @@
+# 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/delayed_job_mongoid.gemspec

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+Gem::Specification.new do |spec|
+  spec.add_dependency 'delayed_job', ['>= 3.0', '< 5']
+  spec.add_dependency 'mongoid', ['>= 3.0', '< 5']
+  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.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'
+end

data/lib/delayed/backend/mongoid.rb

@@ -35,13 +35,13 @@ module Delayed
         def self.reserve(worker, max_run_time = Worker.max_run_time)
           right_now = db_time_now
 
-          criteria = self.where(
-            :run_at => {"$lte" => right_now},
+          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_by => worker.name},
+            {:locked_at => nil},
+            {:locked_at => {'$lt' => (right_now - max_run_time)}}
           )
 
           criteria = criteria.gte(:priority => Worker.min_priority.to_i) if Worker.min_priority
@@ -49,19 +49,28 @@ module Delayed
           criteria = criteria.any_in(:queue => Worker.queues) if Worker.queues.any?
 
           criteria.desc(:locked_by).asc(:priority).asc(:run_at).find_and_modify(
-            {"$set" => {:locked_at => right_now, :locked_by => worker.name}}, :new => true
+            {'$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.where(:locked_by => worker_name).update_all({:locked_at => nil, :locked_by => nil})
+          where(:locked_by => worker_name).update_all(:locked_at => nil, :locked_by => nil)
         end
 
         def reload(*args)
           reset
           super
         end
+
+        # 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
+        end
+      end
+      def self.mongoid3?
+        ::Mongoid.const_defined? :Observer # deprecated in Mongoid 4.x
       end
     end
   end

data/lib/delayed/plugins.rb

@@ -0,0 +1,19 @@
+#
+# clear Mongoid::IdentityMap before each job
+#
+
+if Delayed::Backend::Mongoid.mongoid3?
+  module Delayed
+    module Plugins
+      class ClearIdentityMap < Plugin
+        callbacks do |lifecycle|
+          lifecycle.before(:invoke_job) do
+            Mongoid::IdentityMap.clear
+          end
+        end
+      end
+    end
+  end
+
+  Delayed::Worker.plugins << Delayed::Plugins::ClearIdentityMap
+end

data/lib/delayed/serialization/mongoid.rb

@@ -4,14 +4,12 @@ require 'mongoid'
 
 if YAML.parser.class.name =~ /syck/i
   Mongoid::Document.class_eval do
-    yaml_as "tag:ruby.yaml.org,2002:Mongoid"
+    yaml_as 'tag:ruby.yaml.org,2002:Mongoid'
 
-    def self.yaml_new(klass, tag, val)
-      begin
-        klass.find(val['attributes']['_id'])
-      rescue Mongoid::Errors::DocumentNotFound
-        raise Delayed::DeserializationError
-      end
+    def self.yaml_new(klass, _, val)
+      klass.find(val['attributes']['_id'])
+    rescue Mongoid::Errors::DocumentNotFound
+      raise Delayed::DeserializationError
     end
 
     def to_yaml_properties
@@ -21,7 +19,7 @@ if YAML.parser.class.name =~ /syck/i
 else
   Mongoid::Document.class_eval do
     def encode_with(coder)
-      coder["attributes"] = @attributes
+      coder['attributes'] = @attributes
       coder.tag = ['!ruby/Mongoid', self.class.name].join(':')
     end
   end

data/lib/delayed_job_mongoid.rb

@@ -2,5 +2,6 @@
 require 'delayed/backend/mongoid'
 require 'delayed/serialization/mongoid'
 require 'delayed_job'
+require 'delayed/plugins'
 
 Delayed::Worker.backend = :mongoid

data/spec/delayed_job_mongoid_spec.rb

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

data/spec/helper.rb

@@ -0,0 +1,42 @@
+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

@@ -0,0 +1,23 @@
+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

metadata

@@ -1,145 +1,105 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_mongoid
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - Chris Gaffney
 - Brandon Keepers
+- Erik Michaels-Ober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: delayed_job
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: delayed_job
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   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: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '5'
 description: 
 email:
 - chris@collectiveidea.com
 - brandon@opensoul.com
+- sferik@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.md
+extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- 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/spec_helper.rb
-- LICENSE
-- README.md
+- spec/helper.rb
+- spec/plugins_spec.rb
 homepage: http://github.com/collectiveidea/delayed_job_mongoid
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options:
-- --charset=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -913743688657912921
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -913743688657912921
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Mongoid backend for delayed_job
 test_files:
 - spec/delayed_job_mongoid_spec.rb
-- spec/spec_helper.rb
+- spec/helper.rb
+- spec/plugins_spec.rb
+has_rdoc: 

data/spec/spec_helper.rb

@@ -1,23 +0,0 @@
-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.connect_to("dl_spec")
-end
-
-class Story
-  include ::Mongoid::Document
-  def tell; text; end
-  def whatever(n, _); tell*n; end
-  def self.count; end
-
-  handle_asynchronously :whatever
-end