delayed_job_groups_mongoid 0.2.3 → 0.2.4

data/Gemfile

@@ -15,4 +15,5 @@ group :test do
   gem 'autotest-growl'  
   gem 'database_cleaner'  
   gem 'ruby-debug'
+  gem 'awesome_print'
 end

data/delayed_job_groups_mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{delayed_job_groups_mongoid}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["opsb"]

data/lib/delayed_job_groups/mongoid_groups.rb

@@ -7,7 +7,7 @@ module Delayed
     scope :in_unlocked_group, lambda{ where(:lock_group.nin => self.locked_groups) }
     
     def self.locked_groups
-      Delayed::Job.only(:lock_group).where(:locked_by.ne => nil).map{|grouping| grouping[:lock_group]}
+      Delayed::Job.only(:lock_group).where(:locked_by.ne => nil).group.map{ |grouping| grouping["lock_group"] }
     end
 
     def self.find_available(worker_name, limit = 5, max_run_time = Worker.max_run_time)

data/spec/delayed_job_groups_spec.rb

@@ -52,16 +52,21 @@ 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
-      group_a_job1 = GroupedJob.new(:repository => "repo1")
-      group_a_job2 = GroupedJob.new(:repository => "repo1")
-      @group_b_job1 = GroupedJob.new(:repository => "repo2")
+      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  }
       
-      [group_a_job1, @group_b_job1].each{ |job| Delayed::Job.enqueue job }
-      queued_job = Delayed::Job.enqueue group_a_job2
-      queued_job.lock_exclusively!(MAX_RUN_TIME, WORKER)      
+      2.times do
+        GroupedJob.new(:repository => 'repo1')
+      end
+      1.times{ GroupedJob.new(:repository => 'repo2') }
+      Delayed::Job.where(:lock_group => "repo1").first.lock_exclusively!(MAX_RUN_TIME, WORKER)
+    end
+    
+    it "should have one locked group" do
+      Delayed::Job.locked_groups.should == ['repo1']
     end
     
-    it "should find no unlocked jobs" do
+    it "should find only the job in the different group" do
       Delayed::Job.find_available(WORKER, MAX_RUN_TIME).count.should == 1
     end
   end
@@ -80,13 +85,13 @@ describe Delayed::Job do
       2.times do
         User.create(:role => "admin").send_welcome_email
       end
-      1.times{ Delayed::Job.enqueue GroupedJob.new(:repository => "repo2") }      
-      Delayed::Job.first.lock_exclusively!(MAX_RUN_TIME, WORKER)
-      
+      1.times{ User.create(:role => "PA").send_welcome_email }      
+      Delayed::Job.where(:lock_group => "admin").first.lock_exclusively!(MAX_RUN_TIME, WORKER)
     end
     
-    it "should find no jobs that are ready to run" do
+    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"
     end
   end
   
@@ -96,12 +101,12 @@ describe Delayed::Job do
         User.create(:role => "admin").delay.expensive_operation
       end
       1.times{ Delayed::Job.enqueue GroupedJob.new(:repository => "repo2") }      
-      Delayed::Job.first.lock_exclusively!(MAX_RUN_TIME, WORKER)
-      
+      Delayed::Job.where(:lock_group => "admin").first.lock_exclusively!(MAX_RUN_TIME, WORKER)
     end
     
-    it "should find no jobs that are ready to run" do
+    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"
     end
   end  
 end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'rubygems'
 require 'bundler/setup'
 require 'logger'
 require 'mongoid'
+require 'ap'
 
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: delayed_job_groups_mongoid
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - opsb