talentbox-delayed_job_sequel 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9df707759cfb493fe5e571ad10821e3506a8462
-  data.tar.gz: cfede796ece37d2adc97ea8b3f7ac3bb084d1750
+  metadata.gz: 4302cd23662982c235f239ad688b7e625590bef5
+  data.tar.gz: 216726ccad71885a93664e0478d2f2719d0ae4f0
 SHA512:
-  metadata.gz: c20129c55cbc45d31ea37322378957dff34f355d2258bf08c9510e0e648b120cb53b3d1af12a90f321e671ed2a216fdef9e211e38ff1650e2b08680bf8fed815
-  data.tar.gz: be4523110985804fd3a8ef06746f5a6d43d70f77db5a059c2ebd47436fb5d84a9f537170e1a4627b0304a4d1940fb639c8147b802e9866965206e72cbb7a7e90
+  metadata.gz: f124eca09c6ed6276f61c89223cda8509fff8d39019b52b1faca646bd1469c4d649282e4de261f530c17f77e515dfbd37e1a48c70d425c30db2675d584f5490a
+  data.tar.gz: 24862b85887f74e7235ae1675f284ea69343840e2634204222c84eba8d9b4d82d677226485cc0eff388ee5b3ec53c8fd67c19689fd642015edf89a10d5caee26

data/lib/delayed/backend/sequel.rb

@@ -13,21 +13,26 @@ module Delayed
           set_default_run_at
         end
 
-        def_dataset_method :ready_to_run do |worker_name, max_run_time|
-          db_time_now = model.db_time_now
-          lock_upper_bound = db_time_now - max_run_time
-          filter do
-            (
-              (run_at <= db_time_now) &
-              ::Sequel.expr(:locked_at => nil) |
-              (::Sequel.expr(:locked_at) < lock_upper_bound) |
-              {:locked_by => worker_name}
-            ) & {:failed_at => nil}
+        dataset_module do
+          def ready_to_run(worker_name, max_run_time)
+            db_time_now = model.db_time_now
+            lock_upper_bound = db_time_now - max_run_time
+            filter do
+              (
+                (run_at <= db_time_now) &
+                ::Sequel.expr(:locked_at => nil) |
+                (::Sequel.expr(:locked_at) < lock_upper_bound) |
+                {:locked_by => worker_name}
+              ) & {:failed_at => nil}
+            end
           end
-        end
 
-        def_dataset_method :by_priority do
-          order(::Sequel.expr(:priority).asc, ::Sequel.expr(:run_at).asc)
+          def by_priority
+            order(
+              ::Sequel.expr(:priority).asc,
+              ::Sequel.expr(:run_at).asc
+            )
+          end
         end
 
         def self.before_fork
@@ -41,8 +46,8 @@ module Delayed
 
         def self.reserve(worker, max_run_time = Worker.max_run_time)
           ds = ready_to_run(worker.name, max_run_time)
-          ds = ds.filter("priority >= ?", Worker.min_priority) if Worker.min_priority
-          ds = ds.filter("priority <= ?", Worker.max_priority) if Worker.max_priority
+          ds = ds.filter(::Sequel.lit("priority >= ?", Worker.min_priority)) if Worker.min_priority
+          ds = ds.filter(::Sequel.lit("priority <= ?", Worker.max_priority)) if Worker.max_priority
           ds = ds.filter(:queue => Worker.queues) if Worker.queues.any?
           ds = ds.by_priority
           ds = ds.for_update
@@ -101,7 +106,13 @@ module Delayed
 
         def self.count(attrs={})
           if attrs.respond_to?(:has_key?) && attrs.has_key?(:conditions)
-            ds = self.where(attrs[:conditions])
+            conditions = case attrs[:conditions]
+            when Array
+              ::Sequel.lit(*attrs[:conditions])
+            else
+              ::Sequel.lit(attrs[:conditions])
+            end
+            ds = self.where conditions
             if attrs.has_key?(:group)
               column = attrs[:group]
               group_and_count(column.to_sym).map do |record|

data/lib/delayed/serialization/sequel.rb

@@ -33,7 +33,7 @@ module Delayed
           def init_with(coder)
             @values = coder["values"]
             reload
-          rescue Sequel::Error
+          rescue ::Sequel::Error
             raise Delayed::DeserializationError, "Sequel Record not found, class: #{self.class.name} , primary key: #{pk}"
           end
         end

data/spec/delayed/backend/sequel_spec.rb

@@ -13,7 +13,7 @@ describe Delayed::Backend::Sequel::Job do
   it_should_behave_like "a delayed_job backend"
 
   it "does not allow more than 1 worker to grab the same job" do
-    expect {
+    expect do
       10.times do
         described_class.create(payload_object: SimpleJob.new)
       end
@@ -25,7 +25,7 @@ describe Delayed::Backend::Sequel::Job do
           worker.work_off(4)
         end
       end.map(&:join)
-    }.not_to raise_error
+    end.not_to raise_error
 
     expect(Delayed::Job.count).to be < 10
   end
@@ -35,8 +35,12 @@ describe Delayed::Backend::Sequel::Job do
       it "allow count with conditions" do
         described_class.create(failed_at: Time.now)
         expect do
-          Delayed::Job.count(:conditions => "failed_at is not NULL").should eq 1
-          Delayed::Job.count(:conditions => "locked_by is not NULL").should eq 0
+          expect(
+            Delayed::Job.count(:conditions => "failed_at is not NULL")
+          ).to eq 1
+          expect(
+            Delayed::Job.count(:conditions => "locked_by is not NULL")
+          ).to eq 0
         end.to_not raise_error
       end
 
@@ -44,8 +48,12 @@ describe Delayed::Backend::Sequel::Job do
         described_class.create(queue: "slow", priority: 2)
         described_class.create(queue: "important", priority: 1)
         expect do
-          Delayed::Job.count(:group => "queue", :conditions => ['run_at < ? and failed_at is NULL', Time.now]).should =~ [["slow", 1], ["important", 1]]
-          Delayed::Job.count(:group => "priority", :conditions => ['run_at < ? and failed_at is NULL', Time.now]).should =~ [[1, 1], [2, 1]]
+          expect(
+            Delayed::Job.count(:group => "queue", :conditions => ['run_at < ? and failed_at is NULL', Time.now])
+          ).to match_array [["slow", 1], ["important", 1]]
+          expect(
+            Delayed::Job.count(:group => "priority", :conditions => ['run_at < ? and failed_at is NULL', Time.now])
+          ).to match_array [[1, 1], [2, 1]]
         end.to_not raise_error
       end
     end
@@ -54,25 +62,31 @@ describe Delayed::Backend::Sequel::Job do
   context "db_time_now" do
     it "should return time in current time zone if set" do
       Time.zone = "Eastern Time (US & Canada)"
-      %w(EST EDT).should include(Delayed::Job.db_time_now.zone)
+      expect(
+        %w(EST EDT)
+      ).to include(Delayed::Job.db_time_now.zone)
     end
 
     it "should return UTC time if that is the Sequel.database_timezone default" do
       Time.zone = nil
       Sequel.database_timezone = :utc
-      Delayed::Backend::Sequel::Job.db_time_now.zone.should == "UTC"
+      expect(
+        Delayed::Backend::Sequel::Job.db_time_now.zone
+      ).to eql "UTC"
     end
 
     it "should return local time if that is the AR default" do
       Time.zone = "Central Time (US & Canada)"
       Sequel.database_timezone = :local
-      %w(CST CDT).should include(Delayed::Backend::Sequel::Job.db_time_now.zone)
+      expect(
+        %w(CST CDT)
+      ).to include(Delayed::Backend::Sequel::Job.db_time_now.zone)
     end
   end
 
   describe "before_fork" do
     it "should call disconnect on the connection" do
-      Sequel::Model.db.should_receive(:disconnect)
+      expect( Sequel::Model.db ).to receive(:disconnect)
       Delayed::Backend::Sequel::Job.before_fork
     end
   end
@@ -81,10 +95,14 @@ describe Delayed::Backend::Sequel::Job do
     it "should allow enqueue hook to modify job at DB level" do
       later = described_class.db_time_now + 20.minutes
       job = Delayed::Backend::Sequel::Job.enqueue :payload_object => EnqueueJobMod.new
-      Delayed::Backend::Sequel::Job[job.id].run_at.should be_within(1).of(later)
+      expect(
+        Delayed::Backend::Sequel::Job[job.id].run_at
+      ).to be_within(1).of(later)
     end
   end
+end
 
+describe Delayed::Backend::Sequel::Job, "override table name" do
   it "allows to override the table name" do
     ::Sequel::Model.db.transaction :rollback => :always do
       begin
@@ -105,11 +123,11 @@ describe Delayed::Backend::Sequel::Job do
         end
         change_table_name :another_delayed_jobs
 
-        Delayed::Job.table_name.should == :another_delayed_jobs
+        expect( Delayed::Job.table_name ).to eql :another_delayed_jobs
       ensure
         change_table_name nil
         # Replace described_class with reloaded
-        self.class.metadata[:example_group][:described_class] = ::Delayed::Backend::Sequel::Job
+        self.class.metadata[:described_class] = ::Delayed::Backend::Sequel::Job
       end
     end
   end

data/spec/delayed/serialization/sequel_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Sequel::Model do
   it 'should load classes with non-default primary key' do
-    lambda {
+    expect do
       YAML.load(Story.create.to_yaml)
-    }.should_not raise_error
+    end.not_to raise_error
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: talentbox-delayed_job_sequel
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Jonathan Tron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sequel backend for DelayedJob