delayed_job_groups_mongoid 0.2.4 → 0.3.1

data/Gemfile

@@ -2,7 +2,7 @@ source :rubygems
 
 gem 'rails'
 gem 'delayed_job', '2.1.1'
-gem 'delayed_job_mongoid', '1.0.0'
+gem 'delayed_job_mongoid', '1.0.1'
 gem 'mongoid', '2.0.0.beta.20'
 gem 'bson_ext'
 
@@ -10,10 +10,14 @@ gem 'bson_ext'
 group :test do
   gem 'rspec-rails'
   gem 'sqlite3-ruby'  
-  gem 'autotest'
-  gem 'autotest-fsevent'
-  gem 'autotest-growl'  
   gem 'database_cleaner'  
   gem 'ruby-debug'
   gem 'awesome_print'
-end
+  gem 'timecop'
+end
+
+group :local do
+  gem 'autotest'
+  gem 'autotest-fsevent'
+  gem 'autotest-growl'  
+end

data/Gemfile.lock

@@ -0,0 +1,131 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.1)
+      actionpack (= 3.0.1)
+      mail (~> 2.2.5)
+    actionpack (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.12)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+    activesupport (3.0.1)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
+    autotest (4.4.1)
+    autotest-fsevent (0.2.3)
+      sys-uname
+    autotest-growl (0.2.6)
+    awesome_print (0.3.1)
+    bson (1.1.2)
+    bson_ext (1.1.2)
+    builder (2.1.2)
+    columnize (0.3.2)
+    daemons (1.1.0)
+    database_cleaner (0.6.0)
+    delayed_job (2.1.1)
+      activesupport (~> 3.0)
+      daemons
+    delayed_job_mongoid (1.0.1)
+      delayed_job (~> 2.1.1)
+      mongoid (~> 2.0)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.4.2)
+    linecache (0.43)
+    mail (2.2.9)
+      activesupport (>= 2.3.6)
+      i18n (~> 0.4.1)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    mongo (1.1.2)
+      bson (>= 1.1.1)
+    mongoid (2.0.0.beta.20)
+      activemodel (~> 3.0)
+      mongo (~> 1.1)
+      tzinfo (~> 0.3.22)
+      will_paginate (~> 3.0.pre)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rails (3.0.1)
+      actionmailer (= 3.0.1)
+      actionpack (= 3.0.1)
+      activerecord (= 3.0.1)
+      activeresource (= 3.0.1)
+      activesupport (= 3.0.1)
+      bundler (~> 1.0.0)
+      railties (= 3.0.1)
+    railties (3.0.1)
+      actionpack (= 3.0.1)
+      activesupport (= 3.0.1)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
+    rake (0.8.7)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+    rspec-rails (2.0.1)
+      rspec (~> 2.0.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    sqlite3-ruby (1.3.1)
+    sys-uname (0.8.4)
+    thor (0.14.3)
+    timecop (0.3.5)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.23)
+    will_paginate (3.0.pre2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  autotest
+  autotest-fsevent
+  autotest-growl
+  awesome_print
+  bson_ext
+  database_cleaner
+  delayed_job (= 2.1.1)
+  delayed_job_mongoid (= 1.0.1)
+  mongoid (= 2.0.0.beta.20)
+  rails
+  rspec-rails
+  ruby-debug
+  sqlite3-ruby
+  timecop

data/Rakefile.rb

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'rake'
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "delayed_job_groups_mongoid"
+    gem.summary = %Q{Adds job groups to delayed_job_mongoid}
+    gem.description = %Q{Adds job groups to delayed_job_mongoid}
+    gem.email = "oliver@opsb.co.uk"
+    gem.homepage = "http://github.com/opsb/delayed_job_groups_mongoid"
+    gem.authors = ["opsb"]
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+desc "run rspec scenarios"
+task :spec do
+  RSpec::Core::RakeTask.new do |t|
+    t.pattern = "./spec/**/*_spec.rb"
+  end
+end

data/VERSION

@@ -0,0 +1 @@
+0.3.1

data/delayed_job_groups_mongoid.gemspec

@@ -1,29 +1,43 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile.rb, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile.rb, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{delayed_job_groups_mongoid}
-  s.version = "0.2.4"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["opsb"]
-  s.date = %q{2010-11-04}
-  s.description = %q{Adds job groups to delayed_job}
+  s.date = %q{2010-12-07}
+  s.description = %q{Adds job groups to delayed_job_mongoid}
   s.email = %q{oliver@opsb.co.uk}
   s.extra_rdoc_files = [
     "README.markdown"
   ]
-  s.files = Dir.glob("lib/**/*") + %w(Gemfile delayed_job_groups_mongoid.gemspec README.markdown)  
-  s.homepage = %q{http://github.com/opsb/delayed_job_groups}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "README.markdown",
+    "Rakefile.rb",
+    "VERSION",
+    "config.ru",
+    "delayed_job_groups_mongoid.gemspec",
+    "lib/delayed_job_groups/init.rb",
+    "lib/delayed_job_groups/job_groups.rb",
+    "lib/delayed_job_groups/mongoid_groups.rb",
+    "lib/delayed_job_groups_mongoid.rb",
+    "spec/database.yml",
+    "spec/delayed_job_groups_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/opsb/delayed_job_groups_mongoid}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Adds job groups to delayed_job}
+  s.summary = %q{Adds job groups to delayed_job_mongoid}
   s.test_files = [
     "spec/delayed_job_groups_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -31,9 +45,24 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rails>, [">= 0"])
+      s.add_runtime_dependency(%q<delayed_job>, ["= 2.1.1"])
+      s.add_runtime_dependency(%q<delayed_job_mongoid>, ["= 1.0.1"])
+      s.add_runtime_dependency(%q<mongoid>, ["= 2.0.0.beta.20"])
+      s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
     else
+      s.add_dependency(%q<rails>, [">= 0"])
+      s.add_dependency(%q<delayed_job>, ["= 2.1.1"])
+      s.add_dependency(%q<delayed_job_mongoid>, ["= 1.0.1"])
+      s.add_dependency(%q<mongoid>, ["= 2.0.0.beta.20"])
+      s.add_dependency(%q<bson_ext>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rails>, [">= 0"])
+    s.add_dependency(%q<delayed_job>, ["= 2.1.1"])
+    s.add_dependency(%q<delayed_job_mongoid>, ["= 1.0.1"])
+    s.add_dependency(%q<mongoid>, ["= 2.0.0.beta.20"])
+    s.add_dependency(%q<bson_ext>, [">= 0"])
   end
 end
 

data/lib/delayed_job_groups/mongoid_groups.rb

@@ -5,37 +5,34 @@ module Delayed
   class Backend::Mongoid::Job
     field :lock_group
     scope :in_unlocked_group, lambda{ where(:lock_group.nin => self.locked_groups) }
+    scope :locked_jobs, lambda{ where(:locked_at.gt => time_out_threshold ) }
     
+    def self.time_out_threshold
+      db_time_now - Delayed::Worker.max_run_time
+    end
+
     def self.locked_groups
-      Delayed::Job.only(:lock_group).where(:locked_by.ne => nil).group.map{ |grouping| grouping["lock_group"] }
+      Delayed::Job.locked_jobs.only(:lock_group).group.map{ |grouping| grouping["lock_group"] }
     end
 
-    def self.find_available(worker_name, limit = 5, max_run_time = Worker.max_run_time)
+    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 = {:run_at  => {"$lte" => right_now}, :failed_at => nil, :lock_group => { "$nin" => self.locked_groups } }
       (conditions[:priority] ||= {})['$gte'] = Worker.min_priority.to_i if Worker.min_priority
       (conditions[:priority] ||= {})['$lte'] = Worker.max_priority.to_i if Worker.max_priority
 
-
-      where = "this.locked_at == null || this.locked_at < #{make_date(right_now - max_run_time)}"
-      results = self.in_unlocked_group.where(conditions.merge(:locked_by => worker_name)).limit(-limit).order_by([['priority', 1], ['run_at', 1]]).to_a
-      results += self.in_unlocked_group.where(conditions.merge('$where' => where)).limit(-limit+results.size).order_by([['priority', 1], ['run_at', 1]]).to_a if results.size < limit
-      results
-    end
-
+      where = "this.locked_by == '#{worker.name}' || this.locked_at == null || this.locked_at < #{make_date(right_now - max_run_time)}"
+      conditions.merge!('$where' => where)
+
+      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}})
+        # 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"]})
+      rescue Mongo::OperationFailure
+        nil # no jobs available
+      end
+    end    
   end
-end
-
-__END__
-
-scope :in_unlocked_group, lambda{
-  delayed_jobs = self.table_name
-  unlocked_groups_select = "select distinct #{delayed_jobs}.lock_group from #{delayed_jobs} where #{delayed_jobs}.locked_by is not null"
-  where("#{delayed_jobs}.lock_group not in (#{unlocked_groups_select}) or #{delayed_jobs}.lock_group is null")
-}
-scope :orig_ready_to_run, scopes[:ready_to_run]
-scope :ready_to_run, lambda{ |*args|
-  orig_ready_to_run(*args).
-  in_unlocked_group
-}
+end

data/spec/database.yml

@@ -0,0 +1,3 @@
+sqlite:
+  adapter: sqlite3
+  database: delayed_job.sqlite3

data/spec/delayed_job_groups_spec.rb

@@ -1,6 +1,5 @@
 require 'spec/spec_helper'
 
-
 class GroupedJob
   include Mongoid::Document  
   include JobGroups
@@ -36,9 +35,19 @@ class User
   end
 end
 
+module Delayed
+  class Backend::Mongoid::Job
+    def lock!(worker, time = Time.now.utc)
+      self.locked_by = worker.name
+      self.locked_at = time
+      save!
+    end
+  end
+end
+
 describe Delayed::Job do
-  MAX_RUN_TIME = 4000 # seconds? TBC
-  WORKER = 'name_of_worker'
+  Delayed::Worker.max_run_time = MAX_RUN_TIME = 5.hours
+  WORKER = OpenStruct.new.tap{|worker| worker.name = "name_of_worker"}
   
   context "a job" do
     before do
@@ -52,22 +61,23 @@ describe Delayed::Job do
   
   context "with 2 jobs in the same group, one locked, one unlocked and 1 job in a different group" do
     before do
-      a, b, c = ['repo1', 'repo1', 'repo2'].map{ |repo| GroupedJob.new(:repository => repo) }
-      job_a, job_b, job_c = [a, b, c].map{ |group_job| Delayed::Job.enqueue group_job  }
-      
-      2.times do
-        GroupedJob.new(:repository => 'repo1')
+      2.times do |n|
+        Delayed::Job.enqueue GroupedJob.new(:repository => 'repo1', :priority => n)
       end
-      1.times{ GroupedJob.new(:repository => 'repo2') }
-      Delayed::Job.where(:lock_group => "repo1").first.lock_exclusively!(MAX_RUN_TIME, WORKER)
+      1.times{ Delayed::Job.enqueue GroupedJob.new(:repository => 'repo2', :priority => 3) }
+      Delayed::Job.where(:lock_group => "repo1").first.lock!(WORKER)
+    end
+    
+    it "should have one locked job" do
+      Delayed::Job.locked_jobs.count.should == 1
     end
     
     it "should have one locked group" do
       Delayed::Job.locked_groups.should == ['repo1']
     end
     
-    it "should find only the job in the different group" do
-      Delayed::Job.find_available(WORKER, MAX_RUN_TIME).count.should == 1
+    it "should not reserve job from same group" do
+      Delayed::Job.reserve(WORKER).lock_group.should_not == "repo1"
     end
   end
   
@@ -76,7 +86,7 @@ describe Delayed::Job do
       Delayed::Job.enqueue SimpleJob.new
     end
     it "should still be queuable" do
-      Delayed::Job.find_available(WORKER, MAX_RUN_TIME).count.should == 1
+      Delayed::Job.reserve(WORKER).should_not be_nil
     end
   end
   
@@ -85,13 +95,12 @@ describe Delayed::Job do
       2.times do
         User.create(:role => "admin").send_welcome_email
       end
-      1.times{ User.create(:role => "PA").send_welcome_email }      
-      Delayed::Job.where(:lock_group => "admin").first.lock_exclusively!(MAX_RUN_TIME, WORKER)
+      1.times{ User.create(:role => "PA").send_welcome_email }   
+      Delayed::Job.where(:lock_group => "admin").first.lock!(WORKER)
     end
     
     it "should only find the job in the different group" do
-      Delayed::Job.find_available(WORKER, MAX_RUN_TIME).count.should == 1
-      Delayed::Job.find_available(WORKER, MAX_RUN_TIME).first.lock_group.should == "PA"
+      Delayed::Job.reserve(WORKER).lock_group.should == "PA"
     end
   end
   
@@ -100,13 +109,30 @@ describe Delayed::Job do
       2.times do
         User.create(:role => "admin").delay.expensive_operation
       end
-      1.times{ Delayed::Job.enqueue GroupedJob.new(:repository => "repo2") }      
-      Delayed::Job.where(:lock_group => "admin").first.lock_exclusively!(MAX_RUN_TIME, WORKER)
+      1.times{ Delayed::Job.enqueue GroupedJob.new(:repository => "repo2") }   
+      Delayed::Job.where(:lock_group => "admin").each{ |job| job.update :priority => 1}
+      Delayed::Job.where(:lock_group => "repo2").each{ |job| job.update :priority => 2}
+      Delayed::Job.where(:lock_group => "admin").first.lock!(WORKER)
     end
     
     it "should find only the job in the different group" do
-      Delayed::Job.find_available(WORKER, MAX_RUN_TIME).count.should == 1
-      Delayed::Job.find_available(WORKER, MAX_RUN_TIME).first.lock_group.should == "repo2"
+      Delayed::Job.reserve(WORKER).lock_group.should == "repo2"
     end
   end  
+  
+  context "with 2 jobs in the same group, one timed out" do
+    before do
+      @timed_out, @other = (1..2).map{ Delayed::Job.enqueue GroupedJob.new(:repository => "repo1") }
+      @timed_out.lock!(WORKER)
+      Timecop.freeze(Time.now.utc + MAX_RUN_TIME + 1.minute)
+    end
+    
+    after do
+      Timecop.return
+    end
+
+    it "should find no locked jobs" do
+      Delayed::Job.locked_jobs(MAX_RUN_TIME).count.should == 0
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'bundler/setup'
 require 'logger'
 require 'mongoid'
 require 'ap'
+require 'timecop'
 
 
 
@@ -14,10 +15,15 @@ require 'rails'
 Mongoid.configure do |config|
   name = "delayed_job_groups_mongoid"
   host = "localhost"
-  config.master = Mongo::Connection.new.db(name)
-  config.slaves = [
-    Mongo::Connection.new(host, 27017, :slave_ok => true).db(name)
-  ]
+  
+  if ENV['ZENSLAP_ID']
+    config.from_hash("uri" => ENV['MONGOHQ_URL'])
+  else
+    config.master = Mongo::Connection.new.db(name)
+    config.slaves = [
+      Mongo::Connection.new(host, 27017, :slave_ok => true).db(name)
+    ]
+  end
   config.persist_in_safe_mode = false
 end
 
@@ -29,13 +35,13 @@ Delayed::Worker.logger = Logger.new('/tmp/dj.log')
 
 Delayed::Worker.backend = :mongoid
 
-
 require 'delayed_job_groups/init.rb'
 RSpec.configure do |config|
   require 'database_cleaner'
   DatabaseCleaner.strategy = :truncation
   config.after(:each) do
-    DatabaseCleaner.clean
+    ::Mongoid.database.collections.select{ |c| c.name !~ /^system/ }.each{ |condemned| condemned.remove }    
+    # DatabaseCleaner.clean
   end  
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true  

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: delayed_job_groups_mongoid
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 17
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - opsb
@@ -15,11 +15,88 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 +00:00
+date: 2010-12-07 00:00:00 +00:00
 default_executable: 
-dependencies: []
-
-description: Adds job groups to delayed_job
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: rails
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: delayed_job
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 1
+        - 1
+        version: 2.1.1
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: delayed_job_mongoid
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: mongoid
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 62196427
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 20
+        version: 2.0.0.beta.20
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: bson_ext
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id005
+description: Adds job groups to delayed_job_mongoid
 email: oliver@opsb.co.uk
 executables: []
 
@@ -28,22 +105,27 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
+- Gemfile
+- Gemfile.lock
+- README.markdown
+- Rakefile.rb
+- VERSION
+- config.ru
+- delayed_job_groups_mongoid.gemspec
 - lib/delayed_job_groups/init.rb
 - lib/delayed_job_groups/job_groups.rb
 - lib/delayed_job_groups/mongoid_groups.rb
 - lib/delayed_job_groups_mongoid.rb
-- Gemfile
-- delayed_job_groups_mongoid.gemspec
-- README.markdown
+- spec/database.yml
 - spec/delayed_job_groups_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/opsb/delayed_job_groups
+homepage: http://github.com/opsb/delayed_job_groups_mongoid
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -70,7 +152,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Adds job groups to delayed_job
+summary: Adds job groups to delayed_job_mongoid
 test_files: 
 - spec/delayed_job_groups_spec.rb
 - spec/spec_helper.rb