canvas-jobs 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f0f7a704ab25af4fe3265b40f88d83915892cdf
-  data.tar.gz: 2d7d88d8ace4f4b37bb5e89b8c0974fe21c592d0
+  metadata.gz: aeda81334fe194eb27996d982198016d7c4dd9a1
+  data.tar.gz: c4698165803dc0ca24530a335e031d2f71725e69
 SHA512:
-  metadata.gz: d0c954cee81c2f914c820599e592e8357990077d8056bf9e4abff12f352d8f97842c55ac33ef88c85f3fac11162603ef9191d6c8096e1861f5eec9fd62f09175
-  data.tar.gz: d0962185edbdebcb17926563d2cf335107ed2fb72553fa581f6fe2fa75ea9251b8adf3b321f8ecd11c476bb612d3416dc987044386cfdcbba0f41c6483fdf681
+  metadata.gz: d543d4c884dd14f0084091d6942247d4e6816a5f6d3e31d8ac2c1bb612aecc7402ff1759136dd70eb0e874120b3539218de3e6fbf8c82ba5210a9c613f388e95
+  data.tar.gz: 0299d21693a0e48dfba4f56d7ca93d79c2355880637608650776012aa1a34047a322d0b47e8cd84e16afcb385ed39fa0c5b8a890f27535f803a1fe0848239b5d

data/db/migrate/20151210162949_improve_max_concurrent.rb

@@ -0,0 +1,50 @@
+class ImproveMaxConcurrent < ActiveRecord::Migration
+  def connection
+    Delayed::Job.connection
+  end
+
+  def up
+    if connection.adapter_name == 'PostgreSQL'
+      execute(<<-CODE)
+      CREATE OR REPLACE FUNCTION delayed_jobs_after_delete_row_tr_fn () RETURNS trigger AS $$
+      DECLARE
+        running_count integer;
+      BEGIN
+        IF OLD.strand IS NOT NULL THEN
+          PERFORM pg_advisory_xact_lock(half_md5_as_bigint(OLD.strand));
+          running_count := (SELECT COUNT(*) FROM delayed_jobs WHERE strand = OLD.strand AND next_in_strand = 't');
+          IF running_count < OLD.max_concurrent THEN
+            UPDATE delayed_jobs SET next_in_strand = 't' WHERE id IN (
+              SELECT id FROM delayed_jobs j2 WHERE next_in_strand = 'f' AND
+              j2.strand = OLD.strand ORDER BY j2.id ASC LIMIT (OLD.max_concurrent - running_count) FOR UPDATE
+            );
+          END IF;
+        END IF;
+        RETURN OLD;
+      END;
+      $$ LANGUAGE plpgsql;
+      CODE
+    end
+  end
+
+  def down
+    if connection.adapter_name == 'PostgreSQL'
+      execute(<<-CODE)
+      CREATE OR REPLACE FUNCTION delayed_jobs_after_delete_row_tr_fn () RETURNS trigger AS $$
+      BEGIN
+        IF OLD.strand IS NOT NULL THEN
+          PERFORM pg_advisory_xact_lock(half_md5_as_bigint(OLD.strand));
+          IF (SELECT COUNT(*) FROM delayed_jobs WHERE strand = OLD.strand AND next_in_strand = 't') < OLD.max_concurrent THEN
+            UPDATE delayed_jobs SET next_in_strand = 't' WHERE id = (
+              SELECT id FROM delayed_jobs j2 WHERE next_in_strand = 'f' AND
+              j2.strand = OLD.strand ORDER BY j2.id ASC LIMIT 1 FOR UPDATE
+            );
+          END IF;
+        END IF;
+        RETURN OLD;
+      END;
+      $$ LANGUAGE plpgsql;
+      CODE
+    end
+  end
+end

data/lib/delayed/backend/base.rb

@@ -301,7 +301,7 @@ module Delayed
         handler = nil
         begin
           handler = _yaml_deserialize(source)
-        rescue TypeError
+        rescue TypeError, ArgumentError
           attempt_to_load_from_source(source)
           handler = _yaml_deserialize(source)
         end

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.10.2"
+  VERSION = "0.10.3"
 end

data/lib/delayed/yaml_extensions.rb

@@ -1,16 +1,20 @@
 # New definitions for YAML to aid in serialization and deserialization of delayed jobs.
 
 require 'yaml'
-require 'syck'
-# this code needs to be updated to work with the new Psych YAML engine in ruby 1.9.x
-# for now we force Syck
-YAML::ENGINE.yamler = 'syck' if defined?(YAML::ENGINE) && YAML::ENGINE.yamler != 'syck'
 
 # First, tell YAML how to load a Module. This depends on Rails .constantize and autoloading.
 YAML.add_ruby_type("object:Module") do |type, val|
   val.constantize
 end
 
+Psych.add_domain_type("ruby/object", "Module") do |type, val|
+  val.constantize
+end
+
+Psych.add_domain_type("ruby/object", "Class") do |type, val|
+  val.constantize
+end
+
 class Module
   def to_yaml(opts = {})
     YAML.quick_emit(self.object_id, opts) do |out|
@@ -30,6 +34,10 @@ class Class
       out.scalar(taguri, name)
     end
   end
+
+  def encode_with(coder)
+    coder.scalar("!ruby/object:Class", name)
+  end
 end
 
 # Now, tell YAML how to intelligently load ActiveRecord objects, using the
@@ -47,6 +55,13 @@ class ActiveRecord::Base
     end
   end
 
+  def encode_with(coder)
+    if id.nil?
+      raise("Can't serialize unsaved ActiveRecord object for delayed job: #{self.inspect}")
+    end
+    coder.scalar("!ruby/ActiveRecord:#{self.class.name}", id.to_s)
+  end
+
   def self.yaml_new(klass, tag, val)
     klass.find(val)
   rescue ActiveRecord::RecordNotFound
@@ -54,6 +69,37 @@ class ActiveRecord::Base
   end
 end
 
+module Delayed
+  module PsychExt
+    module ToRuby
+      def visit_Psych_Nodes_Scalar(object)
+        case object.tag
+        when %r{^!ruby/ActiveRecord:(.+)$}
+          begin
+            klass = resolve_class(Regexp.last_match[1])
+            klass.unscoped.find(object.value)
+          rescue ActiveRecord::RecordNotFound
+            raise Delayed::Backend::RecordNotFound, "Couldn't find #{klass} with id #{object.value.inspect}"
+          end
+        when "tag:ruby.yaml.org,2002:Delayed::Periodic"
+          Delayed::Periodic.scheduled[object.value] || raise(NameError, "job #{object.value} is no longer scheduled")
+        else
+          super
+        end
+      end
+
+      def resolve_class(klass_name)
+        return nil if !klass_name || klass_name.empty?
+        klass_name.constantize
+      rescue
+        super
+      end
+    end
+  end
+end
+
+Psych::Visitors::ToRuby.prepend(Delayed::PsychExt::ToRuby)
+
 # Load Module/Class from yaml tag.
 class Module
   def yaml_tag_read_class(name)

data/spec/active_record_job_spec.rb

@@ -180,7 +180,7 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
         job2.next_in_strand.should == true
       end
 
-      it "should run set multiple jobs as next_in_strand at a time based on max_concurrent" do
+      it "should set multiple jobs as next_in_strand at a time based on max_concurrent" do
         change_setting(Delayed::Settings, :num_strands, ->(strand_name) {
           case strand_name
           when "njobs"; 2
@@ -201,6 +201,40 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
           job3.next_in_strand.should == true
         end
       end
+
+      it "should set multiple jobs as next_in_strand at once if needed" do
+        change_setting(Delayed::Settings, :num_strands, ->(strand_name) {
+          case strand_name
+          when "njobs"; 2
+          else nil
+          end
+        }) do
+          job1 = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs"])
+          job1.reload
+          job1.next_in_strand.should == true
+          job2 = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs"])
+          job2.reload
+          job2.next_in_strand.should == true
+
+          job3 = Delayed::Job.enqueue(SimpleJob.new, n_strand: ["njobs"])
+          job3.reload
+          job3.next_in_strand.should == false
+
+          # manually unset next_in_strand
+          Delayed::Job.where(:id => job2).update_all(:next_in_strand => false)
+          job2.reload
+          job2.next_in_strand.should == false
+
+          run_job(job1) # should update both jobs
+
+          job3.reload
+          job3.next_in_strand.should == true
+
+          job2.reload
+          job2.next_in_strand.should == true
+
+        end
+      end
     end
   end
 end

data/spec/gemfiles/32.gemfile

@@ -4,6 +4,3 @@ gemspec :path=>"../../"
 
 gem "rails", "~> 3.2.19"
 
-platforms :ruby_20, :ruby_21, :ruby_22 do
-  gem 'syck', '>= 1.0.4'
-end

data/spec/gemfiles/32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.14)
+    canvas-jobs (0.10.1)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)
@@ -11,12 +11,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.22)
-      actionpack (= 3.2.22)
+    actionmailer (3.2.19)
+      actionpack (= 3.2.19)
       mail (~> 2.5.4)
-    actionpack (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
+    actionpack (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -24,72 +24,72 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.22)
-      activesupport (= 3.2.22)
+    activemodel (3.2.19)
+      activesupport (= 3.2.19)
       builder (~> 3.0.0)
-    activerecord (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
+    activerecord (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
-    activesupport (3.2.22)
+    activeresource (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
+    activesupport (3.2.19)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     after_transaction_commit (1.0.1)
       activerecord (>= 3.2)
     arel (3.0.3)
     backports (3.6.6)
-    builder (3.0.4)
-    bump (0.5.2)
+    builder (3.0.0)
+    bump (0.5.0)
     coderay (1.1.0)
     database_cleaner (1.3.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     hike (1.2.3)
-    i18n (0.7.0)
+    i18n (0.6.11)
     journey (1.0.4)
-    json (1.8.3)
+    json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.8.2)
     mime-types (1.25.1)
-    multi_json (1.11.2)
-    pg (0.18.2)
+    multi_json (1.10.1)
+    pg (0.17.1)
     polyglot (0.3.5)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.4.7)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-protection (1.5.3)
       rack
     rack-ssl (1.3.4)
       rack
-    rack-test (0.6.3)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.22)
-      actionmailer (= 3.2.22)
-      actionpack (= 3.2.22)
-      activerecord (= 3.2.22)
-      activeresource (= 3.2.22)
-      activesupport (= 3.2.22)
+    rails (3.2.19)
+      actionmailer (= 3.2.19)
+      actionpack (= 3.2.19)
+      activerecord (= 3.2.19)
+      activeresource (= 3.2.19)
+      activesupport (= 3.2.19)
       bundler (~> 1.0)
-      railties (= 3.2.22)
-    railties (3.2.22)
-      actionpack (= 3.2.22)
-      activesupport (= 3.2.22)
+      railties (= 3.2.19)
+    railties (3.2.19)
+      actionpack (= 3.2.19)
+      activesupport (= 3.2.19)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.4.2)
-    rdoc (3.12.2)
+    rake (10.3.2)
+    rdoc (3.12)
       json (~> 1.4)
     redis (3.2.1)
     redis-scripting (1.0.1)
@@ -106,7 +106,7 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    rufus-scheduler (3.1.3)
+    rufus-scheduler (3.1.7)
     sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -119,11 +119,12 @@ GEM
       sinatra (~> 1.4.0)
       tilt (>= 1.3, < 3)
     slop (3.6.0)
-    sprockets (2.2.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    syck (1.0.5)
     test_after_commit (0.4.1)
       activerecord (>= 3.2)
     thor (0.19.1)
@@ -132,8 +133,8 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.44)
-    wwtd (0.7.0)
+    tzinfo (0.3.39)
+    wwtd (1.1.1)
 
 PLATFORMS
   ruby
@@ -150,6 +151,7 @@ DEPENDENCIES
   rspec (= 3.1.0)
   sinatra
   sinatra-contrib
+  syck (>= 1.0.4)
   test_after_commit (= 0.4.1)
   timecop (= 0.7.1)
-  wwtd (= 0.7.0)
+  wwtd (~> 1.1.1)

data/spec/gemfiles/40.gemfile

@@ -5,5 +5,5 @@ gemspec :path=>"../../"
 gem "rails", "~> 4.0.10"
 
 platforms :ruby_20, :ruby_21, :ruby_22 do
-  gem 'syck', '>= 1.0.4'
+  gem 'byebug'
 end

data/spec/gemfiles/40.gemfile.lock

@@ -0,0 +1,146 @@
+PATH
+  remote: ../../
+  specs:
+    canvas-jobs (0.10.1)
+      after_transaction_commit (= 1.0.1)
+      rails (>= 3.2)
+      redis (> 3.0)
+      redis-scripting (~> 1.0.1)
+      rufus-scheduler (~> 3.1.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.0.13)
+      actionpack (= 4.0.13)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.13)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.4)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    after_transaction_commit (1.0.1)
+      activerecord (>= 3.2)
+    arel (4.0.2)
+    backports (3.6.6)
+    builder (3.1.4)
+    bump (0.5.2)
+    byebug (8.2.1)
+    coderay (1.1.0)
+    database_cleaner (1.3.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    i18n (0.7.0)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
+    mime-types (2.6.2)
+    minitest (4.7.5)
+    multi_json (1.11.2)
+    pg (0.18.3)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.5.5)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.0.13)
+      actionmailer (= 4.0.13)
+      actionpack (= 4.0.13)
+      activerecord (= 4.0.13)
+      activesupport (= 4.0.13)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.13)
+      sprockets-rails (~> 2.0)
+    railties (4.0.13)
+      actionpack (= 4.0.13)
+      activesupport (= 4.0.13)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    redis (3.2.1)
+    redis-scripting (1.0.1)
+      redis (>= 3.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    rufus-scheduler (3.1.7)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.6)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    syck (1.0.5)
+    test_after_commit (0.4.1)
+      activerecord (>= 3.2)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (2.0.1)
+    timecop (0.7.1)
+    tzinfo (0.3.45)
+    wwtd (1.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bump
+  byebug
+  canvas-jobs!
+  database_cleaner (= 1.3.0)
+  pg
+  pry
+  rack-test
+  rails (~> 4.0.10)
+  rake
+  rspec (= 3.1.0)
+  sinatra
+  sinatra-contrib
+  syck
+  test_after_commit (= 0.4.1)
+  timecop (= 0.7.1)
+  wwtd (~> 1.1.1)
+
+BUNDLED WITH
+   1.10.6

data/spec/gemfiles/41.gemfile

@@ -3,7 +3,3 @@ source "https://rubygems.org"
 gemspec :path=>"../../"
 
 gem "rails", "~> 4.1.6"
-
-platforms :ruby_20, :ruby_21, :ruby_22 do
-  gem 'syck', '>= 1.0.4'
-end

data/spec/gemfiles/41.gemfile.lock

@@ -0,0 +1,147 @@
+PATH
+  remote: ../../
+  specs:
+    canvas-jobs (0.9.15)
+      after_transaction_commit (= 1.0.1)
+      rails (>= 3.2)
+      redis (> 3.0)
+      redis-scripting (~> 1.0.1)
+      rufus-scheduler (~> 3.1.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.1.13)
+      actionpack (= 4.1.13)
+      actionview (= 4.1.13)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.13)
+      actionview (= 4.1.13)
+      activesupport (= 4.1.13)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.13)
+      activesupport (= 4.1.13)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.13)
+      activesupport (= 4.1.13)
+      builder (~> 3.1)
+    activerecord (4.1.13)
+      activemodel (= 4.1.13)
+      activesupport (= 4.1.13)
+      arel (~> 5.0.0)
+    activesupport (4.1.13)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    after_transaction_commit (1.0.1)
+      activerecord (>= 3.2)
+    arel (5.0.1.20140414130214)
+    backports (3.6.6)
+    builder (3.2.2)
+    bump (0.5.2)
+    coderay (1.1.0)
+    database_cleaner (1.3.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    i18n (0.7.0)
+    json (1.8.3)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
+    mime-types (2.6.2)
+    minitest (5.8.1)
+    multi_json (1.11.2)
+    pg (0.18.3)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.5.5)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.1.13)
+      actionmailer (= 4.1.13)
+      actionpack (= 4.1.13)
+      actionview (= 4.1.13)
+      activemodel (= 4.1.13)
+      activerecord (= 4.1.13)
+      activesupport (= 4.1.13)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.13)
+      sprockets-rails (~> 2.0)
+    railties (4.1.13)
+      actionpack (= 4.1.13)
+      activesupport (= 4.1.13)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    redis (3.2.1)
+    redis-scripting (1.0.1)
+      redis (>= 3.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    rufus-scheduler (3.1.7)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.6)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    syck (1.0.5)
+    test_after_commit (0.4.1)
+      activerecord (>= 3.2)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (2.0.1)
+    timecop (0.7.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    wwtd (1.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bump
+  canvas-jobs!
+  database_cleaner (= 1.3.0)
+  pg
+  pry
+  rack-test
+  rails (~> 4.1.6)
+  rake
+  rspec (= 3.1.0)
+  sinatra
+  sinatra-contrib
+  syck (>= 1.0.4)
+  test_after_commit (= 0.4.1)
+  timecop (= 0.7.1)
+  wwtd (~> 1.1.1)

data/spec/gemfiles/42.gemfile

@@ -3,7 +3,3 @@ source "https://rubygems.org"
 gemspec :path=>"../../"
 
 gem "rails", "~> 4.2.0.beta2"
-
-platforms :ruby_20, :ruby_21, :ruby_22 do
-  gem 'syck', '>= 1.0.4'
-end

data/spec/gemfiles/42.gemfile.lock

@@ -0,0 +1,172 @@
+PATH
+  remote: ../../
+  specs:
+    canvas-jobs (0.9.15)
+      after_transaction_commit (= 1.0.1)
+      rails (>= 3.2)
+      redis (> 3.0)
+      redis-scripting (~> 1.0.1)
+      rufus-scheduler (~> 3.1.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.4)
+      actionview (= 4.2.4)
+      activesupport (= 4.2.4)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.4)
+      activesupport (= 4.2.4)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.4)
+      activesupport (= 4.2.4)
+      globalid (>= 0.3.0)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
+      builder (~> 3.1)
+    activerecord (4.2.4)
+      activemodel (= 4.2.4)
+      activesupport (= 4.2.4)
+      arel (~> 6.0)
+    activesupport (4.2.4)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    after_transaction_commit (1.0.1)
+      activerecord (>= 3.2)
+    arel (6.0.3)
+    backports (3.6.6)
+    builder (3.2.2)
+    bump (0.5.2)
+    coderay (1.1.0)
+    database_cleaner (1.3.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
+    mime-types (2.6.2)
+    mini_portile (0.6.2)
+    minitest (5.8.1)
+    multi_json (1.11.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    pg (0.18.3)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.6.4)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.4)
+      actionmailer (= 4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      activemodel (= 4.2.4)
+      activerecord (= 4.2.4)
+      activesupport (= 4.2.4)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.4)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.4)
+      actionpack (= 4.2.4)
+      activesupport (= 4.2.4)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    redis (3.2.1)
+    redis-scripting (1.0.1)
+      redis (>= 3.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    rufus-scheduler (3.1.7)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.6)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    syck (1.0.5)
+    test_after_commit (0.4.1)
+      activerecord (>= 3.2)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (2.0.1)
+    timecop (0.7.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    wwtd (1.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bump
+  canvas-jobs!
+  database_cleaner (= 1.3.0)
+  pg
+  pry
+  rack-test
+  rails (~> 4.2.0.beta2)
+  rake
+  rspec (= 3.1.0)
+  sinatra
+  sinatra-contrib
+  syck (>= 1.0.4)
+  test_after_commit (= 0.4.1)
+  timecop (= 0.7.1)
+  wwtd (~> 1.1.1)

data/spec/shared/testing.rb

@@ -22,6 +22,7 @@ shared_examples_for 'Delayed::Testing' do
   describe '.drain' do
     it 'should run all queued jobs' do
       3.times { TestingWorker.send_later(:run) }
+      YAML.dump(TestingWorker)
       Delayed::Testing.drain
       expect(TestingWorker.runs).to eq 3
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas-jobs
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_transaction_commit
@@ -277,6 +277,7 @@ files:
 - db/migrate/20140512213941_add_source_to_jobs.rb
 - db/migrate/20150807133223_add_max_concurrent_to_jobs.rb
 - db/migrate/20151123210429_add_expires_at_to_jobs.rb
+- db/migrate/20151210162949_improve_max_concurrent.rb
 - lib/canvas-jobs.rb
 - lib/delayed/backend/active_record.rb
 - lib/delayed/backend/base.rb
@@ -319,8 +320,11 @@ files:
 - spec/gemfiles/32.gemfile
 - spec/gemfiles/32.gemfile.lock
 - spec/gemfiles/40.gemfile
+- spec/gemfiles/40.gemfile.lock
 - spec/gemfiles/41.gemfile
+- spec/gemfiles/41.gemfile.lock
 - spec/gemfiles/42.gemfile
+- spec/gemfiles/42.gemfile.lock
 - spec/migrate/20140924140513_add_story_table.rb
 - spec/redis_job_spec.rb
 - spec/sample_jobs.rb
@@ -343,7 +347,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -351,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
@@ -363,8 +367,11 @@ test_files:
 - spec/gemfiles/32.gemfile
 - spec/gemfiles/32.gemfile.lock
 - spec/gemfiles/40.gemfile
+- spec/gemfiles/40.gemfile.lock
 - spec/gemfiles/41.gemfile
+- spec/gemfiles/41.gemfile.lock
 - spec/gemfiles/42.gemfile
+- spec/gemfiles/42.gemfile.lock
 - spec/migrate/20140924140513_add_story_table.rb
 - spec/redis_job_spec.rb
 - spec/sample_jobs.rb