talentbox-delayed_job_sequel 0.1.1 → 0.1.2

data/lib/delayed/backend/sequel.rb

@@ -120,7 +120,15 @@ module Delayed
 
         def self.count(attrs={})
           if attrs.respond_to?(:has_key?) && attrs.has_key?(:conditions)
-            self.where(attrs[:conditions]).count
+            ds = self.where(attrs[:conditions])
+            if attrs.has_key?(:group)
+              column = attrs[:group]
+              group_and_count(column.to_sym).map do |record|
+                [column, record[:count]]
+              end
+            else
+              ds.count
+            end
           else
             super()
           end

data/spec/delayed/backend/sequel_spec.rb

@@ -9,11 +9,20 @@ describe Delayed::Backend::Sequel::Job do
   it_should_behave_like "a delayed_job backend"
 
   context ".count" do
-    it "allow using ActiveRecord like count for NewRelic sampler" do
-      expect do
-        Delayed::Job.count(:conditions => "failed_at is not NULL")
-        Delayed::Job.count(:conditions => "locked_by is not NULL")
-      end.to_not raise_error
+    context "NewRelic sampler compat" do
+      it "allow count with conditions" do
+        expect do
+          Delayed::Job.count(:conditions => "failed_at is not NULL").should == 1
+          Delayed::Job.count(:conditions => "locked_by is not NULL").should == 0
+        end.to_not raise_error
+      end
+
+      it "allow count with group and conditions" do
+        expect do
+          Delayed::Job.count(:group => "queue", :conditions => ['run_at < ? and failed_at is NULL', Time.now]).should =~ [["queue", 1]]
+          Delayed::Job.count(:group => "priority", :conditions => ['run_at < ? and failed_at is NULL', Time.now]).should =~ [["priority", 1]]
+        end.to_not raise_error
+      end
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: talentbox-delayed_job_sequel
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jonathan Tron
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 906385450237190959
+      hash: 1583338294778399051
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 906385450237190959
+      hash: 1583338294778399051
   none: false
 requirements: []
 rubyforge_project: