inst-jobs 0.11.6 → 0.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e21f31dc7f5360307577a7c3e31d1747f8b7359c
-  data.tar.gz: 2191834aa82cf0a63065b9ac951f9aafbd78d391
+  metadata.gz: a2170987cb69f7ade5944dea6c79874867c04999
+  data.tar.gz: 274b57c924601a2a0e0196c9f72db968e22dc8d2
 SHA512:
-  metadata.gz: 6558c7935c3dc4347a47685527fec8c5529b610649ee4a26ddeb10216ca5e15e8ef154b4b6bb87088a347a7327678b4c19015d68b6e5ae2e799b585802197010
-  data.tar.gz: ea259677667525224c10d0f73ee354b33e4e75b2fa78ae42ed406a42c293540f6cb3183c5a04da2b1ff3694e49f5e8b726132559575e62c8e02d7e1468f57cc7
+  metadata.gz: cf26bfccaa2b532ff7ae14a964d1c7c60ab88a7f30168bc2c503d723cc3bf758610965abc68cc5ae5b915c2c8b519f7794f3bfa0511c08b6d0afdf839de63671
+  data.tar.gz: 9ddc6fa740978e8cb4c323dde2832b957b30a361618776dc2fdb56f696966e31bfe715f64ba51eee065b2952a184c4cabbaf3e967f973119bb789b11f3f2c47b

data/lib/delayed/backend/base.rb

@@ -313,7 +313,7 @@ module Delayed
       rescue TypeError, LoadError, NameError => e
         raise DeserializationError,
           "Job failed to load: #{e.message}. Try to manually require the required file."
-      rescue ArgumentError, Psych::SyntaxError => e
+      rescue Psych::SyntaxError => e
           raise DeserializationError,
             "YAML parsing error: #{e.message}. Probably not recoverable."
       end

data/lib/delayed/message_sending.rb

@@ -98,24 +98,32 @@ module Delayed
       def add_send_later_methods(method, enqueue_args={}, default_async=false)
         aliased_method, punctuation = method.to_s.sub(/([?!=])$/, ''), $1
 
-        with_method, without_method = "#{aliased_method}_with_send_later#{punctuation}", "#{aliased_method}_without_send_later#{punctuation}"
-
-        define_method(with_method) do |*args|
-          send_later_enqueue_args(without_method, enqueue_args, *args)
+        # we still need this for backwards compatibility
+        without_method = "#{aliased_method}_without_send_later#{punctuation}"
+
+        if public_method_defined?(method)
+          visibility = :public
+        elsif private_method_defined?(method)
+          visibility = :private
+        else
+          visibility = :protected
         end
-        alias_method without_method, method
-
-        if default_async
-          alias_method method, with_method
-          case
-            when public_method_defined?(without_method)
-              public method
-            when protected_method_defined?(without_method)
-              protected method
-            when private_method_defined?(without_method)
-              private method
+
+        generated_delayed_methods.class_eval(<<-EOF, __FILE__, __LINE__ + 1)
+          def #{without_method}(*args)
+            send(:#{method}, *args, synchronous: true)
           end
-        end
+          #{visibility} :#{without_method}
+
+          def #{method}(*args, synchronous: #{!default_async})
+            if synchronous
+              super(*args)
+            else
+              send_later_enqueue_args(:#{method}, #{enqueue_args.inspect}, *args, synchronous: true)
+            end
+          end
+          #{visibility} :#{method}
+        EOF
       end
 
       def handle_asynchronously(method, enqueue_args={})
@@ -129,6 +137,13 @@ module Delayed
       def handle_asynchronously_if_production(method, enqueue_args={})
         add_send_later_methods(method, enqueue_args, Rails.env.production?)
       end
+
+      private def generated_delayed_methods
+        @generated_delayed_methods ||= Module.new.tap do |mod|
+          const_set(:DelayedMethods, mod)
+          prepend mod
+        end
+      end
     end
   end
 end

data/lib/delayed/periodic.rb

@@ -4,20 +4,10 @@ module Delayed
 class Periodic
   attr_reader :name, :cron
 
-  yaml_as "tag:ruby.yaml.org,2002:Delayed::Periodic"
-
-  def to_yaml(opts = {})
-    YAML.quick_emit(self.object_id, opts) { |out| out.scalar(taguri, @name) }
-  end
-
   def encode_with(coder)
     coder.scalar("!ruby/Delayed::Periodic", @name)
   end
 
-  def self.yaml_new(klass, tag, val)
-    self.scheduled[val] || raise(NameError, "job #{val} is no longer scheduled")
-  end
-
   cattr_accessor :scheduled, :overrides
   self.scheduled = {}
   self.overrides = {}

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.11.6"
+  VERSION = "0.11.7"
 end

data/lib/delayed/worker.rb

@@ -28,6 +28,17 @@ class Worker
     @lifecycle ||= Delayed::Lifecycle.new
   end
 
+  def self.current_job
+    Thread.current[:running_delayed_job]
+  end
+
+  def self.running_job(job)
+    Thread.current[:running_delayed_job] = job
+    yield
+  ensure
+    Thread.current[:running_delayed_job] = nil
+  end
+
   def initialize(options = {})
     @exit = false
     @parent_pid = options[:parent_pid]
@@ -192,22 +203,18 @@ class Worker
   # also set up a unique tmpdir, which will get removed at the end of the job.
   def configure_for_job(job)
     previous_tmpdir = ENV['TMPDIR']
-    Thread.current[:running_delayed_job] = job
 
-    dir = Dir.mktmpdir("job-#{job.id}-#{self.name.gsub(/[^\w\.]/, '.')}-")
-    begin
-      ENV['TMPDIR'] = dir
-      yield
-    ensure
-      FileUtils.remove_entry(dir, true)
+    self.class.running_job(job) do
+      dir = Dir.mktmpdir("job-#{job.id}-#{self.name.gsub(/[^\w\.]/, '.')}-")
+      begin
+        ENV['TMPDIR'] = dir
+        yield
+      ensure
+        FileUtils.remove_entry(dir, true)
+      end
     end
   ensure
     ENV['TMPDIR'] = previous_tmpdir
-    Thread.current[:running_delayed_job] = nil
-  end
-
-  def self.current_job
-    Thread.current[:running_delayed_job]
   end
 
   # `sample` reports KB, not B
@@ -230,6 +237,5 @@ class Worker
       end
     end
   end
-
 end
 end

data/lib/delayed/yaml_extensions.rb

@@ -2,71 +2,28 @@
 
 require 'yaml'
 
-# 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
-
+# These two added domain types are for backwards compatibility with jobs created
+# using the old syck tags, as syck didn't have built-in module/class dumping. We
+# now use Psych's built-in tags, which are `!ruby/module` and `!ruby/class`. At
+# some point we can remove these, once there are no more jobs in any queues with
+# these tags.
 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|
-      out.scalar(taguri, name)
-    end
-  end
-end
-
-# Now we have to do the same for Class.
-YAML.add_ruby_type("object:Class") do |type, val|
-  val.constantize
-end
-
-class Class
-  def to_yaml(opts = {})
-    YAML.quick_emit(self.object_id, opts) do |out|
-      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
+# Tell YAML how to intelligently load ActiveRecord objects, using the
 # database rather than just serializing their attributes to the YAML. This
 # ensures the object is up to date when we use it in the job.
 class ActiveRecord::Base
-  yaml_as "tag:ruby.yaml.org,2002:ActiveRecord"
-
-  def to_yaml(opts = {})
-    if id.nil?
-      raise("Can't serialize unsaved ActiveRecord object for delayed job: #{self.inspect}")
-    end
-    YAML.quick_emit(self.object_id, opts) do |out|
-      out.scalar(taguri, id.to_s)
-    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
-    raise Delayed::Backend::RecordNotFound, "Couldn't find #{klass} with id #{val.inspect}"
-  end
 end
 
 module Delayed
@@ -81,7 +38,9 @@ module Delayed
           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", "!ruby/Delayed::Periodic", "!ruby/object:Delayed::Periodic"
+        when "!ruby/Delayed::Periodic", "!ruby/object:Delayed::Periodic"
+          # The 2nd ruby/object tag is no longer generated, but some existing
+          # jobs use that tag. We can remove it later once those are all gone.
           Delayed::Periodic.scheduled[object.value] || raise(NameError, "job #{object.value} is no longer scheduled")
         else
           super
@@ -99,11 +58,3 @@ module Delayed
 end
 
 Psych::Visitors::ToRuby.prepend(Delayed::PsychExt::ToRuby)
-
-# Load Module/Class from yaml tag.
-class Module
-  def yaml_tag_read_class(name)
-    name.constantize
-    name
-  end
-end

data/spec/gemfiles/32.gemfile.lock

@@ -0,0 +1,160 @@
+PATH
+  remote: ../../
+  specs:
+    inst-jobs (0.11.3)
+      after_transaction_commit (= 1.0.1)
+      rails (>= 3.2)
+      redis (> 3.0)
+      redis-scripting (~> 1.0.1)
+      rufus-scheduler (~> 3.1.2)
+      thor (>= 0.14.6, < 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.22.2)
+      actionpack (= 3.2.22.2)
+      mail (~> 2.5.4)
+    actionpack (3.2.22.2)
+      activemodel (= 3.2.22.2)
+      activesupport (= 3.2.22.2)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.22.2)
+      activesupport (= 3.2.22.2)
+      builder (~> 3.0.0)
+    activerecord (3.2.22.2)
+      activemodel (= 3.2.22.2)
+      activesupport (= 3.2.22.2)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.22.2)
+      activemodel (= 3.2.22.2)
+      activesupport (= 3.2.22.2)
+    activesupport (3.2.22.2)
+      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.8)
+    builder (3.0.4)
+    bump (0.5.3)
+    coderay (1.1.1)
+    database_cleaner (1.3.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.7.0)
+    journey (1.0.4)
+    json (1.8.3)
+    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.12.1)
+    pg (0.18.4)
+    polyglot (0.3.5)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.4.7)
+    rack-cache (1.6.1)
+      rack (>= 0.4)
+    rack-protection (1.5.3)
+      rack
+    rack-ssl (1.3.4)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (3.2.22.2)
+      actionmailer (= 3.2.22.2)
+      actionpack (= 3.2.22.2)
+      activerecord (= 3.2.22.2)
+      activeresource (= 3.2.22.2)
+      activesupport (= 3.2.22.2)
+      bundler (~> 1.0)
+      railties (= 3.2.22.2)
+    railties (3.2.22.2)
+      actionpack (= 3.2.22.2)
+      activesupport (= 3.2.22.2)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (11.2.2)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    redis (3.3.1)
+    redis-scripting (1.0.1)
+      redis (>= 3.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rufus-scheduler (3.1.10)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.7)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
+    sprockets (2.2.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    test_after_commit (0.4.1)
+      activerecord (>= 3.2)
+    thor (0.19.1)
+    tilt (1.4.1)
+    timecop (0.7.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.51)
+    wwtd (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bump
+  database_cleaner (= 1.3.0)
+  inst-jobs!
+  pg
+  pry
+  rack-test
+  rails (~> 3.2.19)
+  rake
+  rspec (= 3.4.0)
+  sinatra
+  sinatra-contrib
+  test_after_commit (= 0.4.1)
+  timecop (= 0.7.1)
+  wwtd (~> 1.3.0)
+
+BUNDLED WITH
+   1.12.5

data/spec/gemfiles/40.gemfile.lock

@@ -0,0 +1,148 @@
+PATH
+  remote: ../../
+  specs:
+    inst-jobs (0.11.3)
+      after_transaction_commit (= 1.0.1)
+      rails (>= 3.2)
+      redis (> 3.0)
+      redis-scripting (~> 1.0.1)
+      rufus-scheduler (~> 3.1.2)
+      thor (>= 0.14.6, < 2.0)
+
+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.8)
+    builder (3.1.4)
+    bump (0.5.3)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.2)
+    database_cleaner (1.3.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    i18n (0.7.0)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    minitest (4.7.5)
+    multi_json (1.12.1)
+    pg (0.18.4)
+    pry (0.10.4)
+      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 (11.2.2)
+    redis (3.3.1)
+    redis-scripting (1.0.1)
+      redis (>= 3.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rufus-scheduler (3.1.10)
+    sinatra (1.4.7)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.7)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
+    sprockets (3.6.3)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    test_after_commit (0.4.1)
+      activerecord (>= 3.2)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (2.0.5)
+    timecop (0.7.1)
+    tzinfo (0.3.51)
+    wwtd (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bump
+  database_cleaner (= 1.3.0)
+  inst-jobs!
+  pg
+  pry
+  rack-test
+  rails (~> 4.0.10)
+  rake
+  rspec (= 3.4.0)
+  sinatra
+  sinatra-contrib
+  test_after_commit (= 0.4.1)
+  timecop (= 0.7.1)
+  wwtd (~> 1.3.0)
+
+BUNDLED WITH
+   1.12.5

data/spec/gemfiles/41.gemfile.lock

@@ -0,0 +1,154 @@
+PATH
+  remote: ../../
+  specs:
+    inst-jobs (0.11.3)
+      after_transaction_commit (= 1.0.1)
+      rails (>= 3.2)
+      redis (> 3.0)
+      redis-scripting (~> 1.0.1)
+      rufus-scheduler (~> 3.1.2)
+      thor (>= 0.14.6, < 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.1.16)
+      actionpack (= 4.1.16)
+      actionview (= 4.1.16)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.16)
+      actionview (= 4.1.16)
+      activesupport (= 4.1.16)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.16)
+      activesupport (= 4.1.16)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.16)
+      activesupport (= 4.1.16)
+      builder (~> 3.1)
+    activerecord (4.1.16)
+      activemodel (= 4.1.16)
+      activesupport (= 4.1.16)
+      arel (~> 5.0.0)
+    activesupport (4.1.16)
+      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.8)
+    builder (3.2.2)
+    bump (0.5.3)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.2)
+    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.4)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    minitest (5.9.0)
+    multi_json (1.12.1)
+    pg (0.18.4)
+    pry (0.10.4)
+      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.16)
+      actionmailer (= 4.1.16)
+      actionpack (= 4.1.16)
+      actionview (= 4.1.16)
+      activemodel (= 4.1.16)
+      activerecord (= 4.1.16)
+      activesupport (= 4.1.16)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.16)
+      sprockets-rails (~> 2.0)
+    railties (4.1.16)
+      actionpack (= 4.1.16)
+      activesupport (= 4.1.16)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.2.2)
+    redis (3.3.1)
+    redis-scripting (1.0.1)
+      redis (>= 3.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rufus-scheduler (3.1.10)
+    sinatra (1.4.7)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.7)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    test_after_commit (0.4.1)
+      activerecord (>= 3.2)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (2.0.5)
+    timecop (0.7.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    wwtd (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bump
+  database_cleaner (= 1.3.0)
+  inst-jobs!
+  pg
+  pry
+  rack-test
+  rails (~> 4.1.6)
+  rake
+  rspec (= 3.4.0)
+  sinatra
+  sinatra-contrib
+  test_after_commit (= 0.4.1)
+  timecop (= 0.7.1)
+  wwtd (~> 1.3.0)
+
+BUNDLED WITH
+   1.12.5

data/spec/gemfiles/42.gemfile.lock

@@ -0,0 +1,181 @@
+PATH
+  remote: ../../
+  specs:
+    inst-jobs (0.11.3)
+      after_transaction_commit (= 1.0.1)
+      rails (>= 3.2)
+      redis (> 3.0)
+      redis-scripting (~> 1.0.1)
+      rufus-scheduler (~> 3.1.2)
+      thor (>= 0.14.6, < 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.7)
+      actionpack (= 4.2.7)
+      actionview (= 4.2.7)
+      activejob (= 4.2.7)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.7)
+      actionview (= 4.2.7)
+      activesupport (= 4.2.7)
+      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.7)
+      activesupport (= 4.2.7)
+      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.7)
+      activesupport (= 4.2.7)
+      globalid (>= 0.3.0)
+    activemodel (4.2.7)
+      activesupport (= 4.2.7)
+      builder (~> 3.1)
+    activerecord (4.2.7)
+      activemodel (= 4.2.7)
+      activesupport (= 4.2.7)
+      arel (~> 6.0)
+    activesupport (4.2.7)
+      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.8)
+    builder (3.2.2)
+    bump (0.5.3)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.2)
+    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.4)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    multi_json (1.12.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pg (0.18.4)
+    pkg-config (1.1.7)
+    pry (0.10.4)
+      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.7)
+      actionmailer (= 4.2.7)
+      actionpack (= 4.2.7)
+      actionview (= 4.2.7)
+      activejob (= 4.2.7)
+      activemodel (= 4.2.7)
+      activerecord (= 4.2.7)
+      activesupport (= 4.2.7)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.7)
+      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.3)
+      loofah (~> 2.0)
+    railties (4.2.7)
+      actionpack (= 4.2.7)
+      activesupport (= 4.2.7)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.2.2)
+    redis (3.3.1)
+    redis-scripting (1.0.1)
+      redis (>= 3.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rufus-scheduler (3.1.10)
+    sinatra (1.4.7)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.7)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.1.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    test_after_commit (0.4.1)
+      activerecord (>= 3.2)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (2.0.5)
+    timecop (0.7.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    wwtd (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bump
+  database_cleaner (= 1.3.0)
+  inst-jobs!
+  pg
+  pry
+  rack-test
+  rails (~> 4.2.5)
+  rake
+  rspec (= 3.4.0)
+  sinatra
+  sinatra-contrib
+  test_after_commit (= 0.4.1)
+  timecop (= 0.7.1)
+  wwtd (~> 1.3.0)
+
+BUNDLED WITH
+   1.12.5

data/spec/gemfiles/50.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gemspec :path=>"../../"
+
+gem "rails", "~> 5.0.0"
+gem 'sinatra', "2.0.0.beta2"
+gem 'sinatra-contrib', "2.0.0.beta2"

data/spec/shared/delayed_method.rb

@@ -33,28 +33,25 @@ shared_examples_for 'random ruby objects' do
   context "class methods" do
     context "add_send_later_methods" do
       it "should work with default_async" do
-        class TestObject
+        klass = Class.new do
           attr_reader :ran
           def test_method; @ran = true; end
           add_send_later_methods :test_method, {}, true
         end
-        obj = TestObject.new
+        obj = klass.new
         lambda { obj.test_method }.should change { Delayed::Job.jobs_count(:current) }.by(1)
-        lambda { obj.test_method_with_send_later }.should change { Delayed::Job.jobs_count(:current) }.by(1)
         obj.ran.should be_falsey
         lambda { obj.test_method_without_send_later }.should_not change { Delayed::Job.jobs_count(:current) }
         obj.ran.should be true
       end
 
       it "should work without default_async" do
-        class TestObject
+        klass = Class.new do
           attr_accessor :ran
           def test_method; @ran = true; end
           add_send_later_methods :test_method, {}, false
         end
-        obj = TestObject.new
-        lambda { obj.test_method_with_send_later }.should change { Delayed::Job.jobs_count(:current) }.by(1)
-        obj.ran.should be_falsey
+        obj = klass.new
         lambda { obj.test_method }.should_not change { Delayed::Job.jobs_count(:current) }
         obj.ran.should be true
         obj.ran = false
@@ -64,57 +61,23 @@ shared_examples_for 'random ruby objects' do
       end
 
       it "should send along enqueue args and args default async" do
-        class TestObject
-          attr_reader :ran
+        klass = Class.new do
+          attr_accessor :ran
           def test_method(*args); @ran = args; end
           add_send_later_methods(:test_method, {:enqueue_arg_1 => :thing}, true)
         end
-        obj = TestObject.new
+        obj = klass.new
         method = double()
-        expect(Delayed::PerformableMethod).to receive(:new).with(obj, :test_method_without_send_later, [1,2,3], nil, nil).and_return(method)
+
+        expect(Delayed::PerformableMethod).to receive(:new).with(obj, :test_method, [1,2,3, {synchronous: true}], nil, nil).and_return(method)
         expect(Delayed::Job).to receive(:enqueue).with(method, :enqueue_arg_1 => :thing)
         obj.test_method(1,2,3)
-        expect(Delayed::PerformableMethod).to receive(:new).with(obj, :test_method_without_send_later, [4], nil, nil).and_return(method)
+
+        expect(Delayed::PerformableMethod).to receive(:new).with(obj, :test_method, [4, {:synchronous=>true}], nil, nil).and_return(method)
         expect(Delayed::Job).to receive(:enqueue).with(method, :enqueue_arg_1 => :thing)
         obj.test_method(4)
-        expect(Delayed::PerformableMethod).to receive(:new).with(obj, :test_method_without_send_later, [6], nil, nil).and_return(method)
-        expect(Delayed::Job).to receive(:enqueue).with(method, :enqueue_arg_1 => :thing)
-        obj.test_method_with_send_later(6)
-        expect(Delayed::PerformableMethod).to receive(:new).with(obj, :test_method_without_send_later, [5,6], nil, nil).and_return(method)
-        expect(Delayed::Job).to receive(:enqueue).with(method, :enqueue_arg_1 => :thing)
-        obj.test_method_with_send_later(5,6)
-        obj.ran.should be_nil
-        obj.test_method_without_send_later(7)
-        obj.ran.should == [7]
-        obj.ran = nil
-        obj.ran.should == nil
-        obj.test_method_without_send_later(8,9)
-        obj.ran.should == [8,9]
-      end
 
-      it "should send along enqueue args and args without default async" do
-        class TestObject
-          attr_reader :ran
-          def test_method(*args); @ran = args; end
-          add_send_later_methods(:test_method, {:enqueue_arg_2 => :thing2, :on_failure => :fail, :on_permanent_failure => :fail_frd}, false)
-        end
-        obj = TestObject.new
-        method = double()
-        expect(Delayed::PerformableMethod).to receive(:new).with(obj, :test_method_without_send_later, [6], :fail, :fail_frd).and_return(method)
-        expect(Delayed::Job).to receive(:enqueue).with(method, :enqueue_arg_2 => :thing2)
-        obj.test_method_with_send_later(6)
-        expect(Delayed::PerformableMethod).to receive(:new).with(obj, :test_method_without_send_later, [5,6], :fail, :fail_frd).and_return(method)
-        expect(Delayed::Job).to receive(:enqueue).with(method, :enqueue_arg_2 => :thing2)
-        obj.test_method_with_send_later(5,6)
         obj.ran.should be_nil
-        obj.test_method(1,2,3)
-        obj.ran.should == [1,2,3]
-        obj.ran = nil
-        obj.ran.should == nil
-        obj.test_method(4)
-        obj.ran.should == [4]
-        obj.ran = nil
-        obj.ran.should == nil
         obj.test_method_without_send_later(7)
         obj.ran.should == [7]
         obj.ran = nil
@@ -124,28 +87,25 @@ shared_examples_for 'random ruby objects' do
       end
 
       it "should handle punctuation correctly with default_async" do
-        class TestObject
+        klass = Class.new do
           attr_reader :ran
           def test_method?; @ran = true; end
           add_send_later_methods :test_method?, {}, true
         end
-        obj = TestObject.new
+        obj = klass.new
         lambda { obj.test_method? }.should change { Delayed::Job.jobs_count(:current) }.by(1)
-        lambda { obj.test_method_with_send_later? }.should change { Delayed::Job.jobs_count(:current) }.by(1)
         obj.ran.should be_falsey
         lambda { obj.test_method_without_send_later? }.should_not change { Delayed::Job.jobs_count(:current) }
         obj.ran.should be true
       end
 
       it "should handle punctuation correctly without default_async" do
-        class TestObject
+        klass = Class.new do
           attr_accessor :ran
           def test_method?; @ran = true; end
           add_send_later_methods :test_method?, {}, false
         end
-        obj = TestObject.new
-        lambda { obj.test_method_with_send_later? }.should change { Delayed::Job.jobs_count(:current) }.by(1)
-        obj.ran.should be_falsey
+        obj = klass.new
         lambda { obj.test_method? }.should_not change { Delayed::Job.jobs_count(:current) }
         obj.ran.should be true
         obj.ran = false
@@ -155,28 +115,25 @@ shared_examples_for 'random ruby objects' do
       end
 
       it "should handle assignment punctuation correctly with default_async" do
-        class TestObject
+        klass = Class.new do
           attr_reader :ran
           def test_method=(val); @ran = val; end
           add_send_later_methods :test_method=, {}, true
         end
-        obj = TestObject.new
+        obj = klass.new
         lambda { obj.test_method = 3 }.should change { Delayed::Job.jobs_count(:current) }.by(1)
-        lambda { obj.test_method_with_send_later = 4 }.should change { Delayed::Job.jobs_count(:current) }.by(1)
         obj.ran.should be_nil
         lambda { obj.test_method_without_send_later = 5 }.should_not change { Delayed::Job.jobs_count(:current) }
         obj.ran.should == 5
       end
 
       it "should handle assignment punctuation correctly without default_async" do
-        class TestObject
+        klass = Class.new do
           attr_accessor :ran
           def test_method=(val); @ran = val; end
           add_send_later_methods :test_method=, {}, false
         end
-        obj = TestObject.new
-        lambda { obj.test_method_with_send_later = 1 }.should change { Delayed::Job.jobs_count(:current) }.by(1)
-        obj.ran.should be_nil
+        obj = klass.new
         lambda { obj.test_method = 2 }.should_not change { Delayed::Job.jobs_count(:current) }
         obj.ran.should == 2
         lambda { obj.test_method_without_send_later = 3 }.should_not change { Delayed::Job.jobs_count(:current) }
@@ -184,26 +141,26 @@ shared_examples_for 'random ruby objects' do
       end
 
       it "should correctly sort out method accessibility with default async" do
-        class TestObject1
+        klass1 = Class.new do
           def test_method; end
           add_send_later_methods :test_method, {}, true
         end
-        class TestObject2
+
+        klass2 = Class.new do
           protected
           def test_method; end
           add_send_later_methods :test_method, {}, true
         end
-        class TestObject3
+
+        klass3 = Class.new do
           private
           def test_method; end
           add_send_later_methods :test_method, {}, true
         end
-        TestObject1.public_method_defined?(:test_method).should be true
-        TestObject2.public_method_defined?(:test_method).should be false
-        TestObject3.public_method_defined?(:test_method).should be false
-        TestObject2.protected_method_defined?(:test_method).should be true
-        TestObject3.protected_method_defined?(:test_method).should be false
-        TestObject3.private_method_defined?(:test_method).should be true
+
+        klass1.public_method_defined?(:test_method).should be true
+        klass2.protected_method_defined?(:test_method).should be true
+        klass3.private_method_defined?(:test_method).should be true
       end
     end
 
@@ -286,8 +243,8 @@ shared_examples_for 'random ruby objects' do
 
     job = Delayed::Job.list_jobs(:current, 1).first
     job.payload_object.class.should   == Delayed::PerformableMethod
-    job.payload_object.method.should  == :whatever_without_send_later
-    job.payload_object.args.should    == [1, 5]
+    job.payload_object.method.should  == :whatever
+    job.payload_object.args.should    == [1, 5, {:synchronous=>true}]
     job.payload_object.perform.should == 'Once upon...'
   end
 
@@ -298,8 +255,8 @@ shared_examples_for 'random ruby objects' do
 
     job = Delayed::Job.list_jobs(:current, 1, 0, "testqueue").first
     job.payload_object.class.should   == Delayed::PerformableMethod
-    job.payload_object.method.should  == :whatever_else_without_send_later
-    job.payload_object.args.should    == [1, 5]
+    job.payload_object.method.should  == :whatever_else
+    job.payload_object.args.should    == [1, 5, {:synchronous=>true}]
     job.payload_object.perform.should == 'Once upon...'
   end
 
@@ -327,14 +284,14 @@ shared_examples_for 'random ruby objects' do
         "string".send_at(1.hour.from_now, :length)
       end.should change { Delayed::Job.jobs_count(:future) }.by(1)
     end
-    
+
     it "should schedule the job in the future" do
       time = 1.hour.from_now
       "string".send_at(time, :length)
       job = Delayed::Job.list_jobs(:future, 1).first
       job.run_at.to_i.should == time.to_i
     end
-    
+
     it "should store payload as PerformableMethod" do
       "string".send_at(1.hour.from_now, :count, 'r')
       job = Delayed::Job.list_jobs(:future, 1).first
@@ -343,7 +300,7 @@ shared_examples_for 'random ruby objects' do
       job.payload_object.args.should    == ['r']
       job.payload_object.perform.should == 1
     end
-    
+
     it "should use the default queue if there is one" do
       set_queue("testqueue") do
         "string".send_at 1.hour.from_now, :reverse
@@ -359,14 +316,14 @@ shared_examples_for 'random ruby objects' do
         "string".send_at_with_queue(1.hour.from_now, :length, "testqueue")
       end.should change { Delayed::Job.jobs_count(:future, "testqueue") }.by(1)
     end
-    
+
     it "should schedule the job in the future" do
       time = 1.hour.from_now
       "string".send_at_with_queue(time, :length, "testqueue")
       job = Delayed::Job.list_jobs(:future, 1, 0, "testqueue").first
       job.run_at.to_i.should == time.to_i
     end
-    
+
     it "should override the default queue" do
       set_queue("default_queue") do
         "string".send_at_with_queue(1.hour.from_now, :length, "testqueue")
@@ -374,7 +331,7 @@ shared_examples_for 'random ruby objects' do
         job.queue.should == "testqueue"
       end
     end
-    
+
     it "should store payload as PerformableMethod" do
       "string".send_at_with_queue(1.hour.from_now, :count, "testqueue", 'r')
       job = Delayed::Job.list_jobs(:future, 1, 0, "testqueue").first
@@ -415,5 +372,4 @@ shared_examples_for 'random ruby objects' do
       UnlessInJob.runs.should == 0
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -37,14 +37,22 @@ ENV['TEST_DB_DATABASE'] ||= "inst-jobs-test-#{ENV['TEST_ENV_NUMBER']}"
 ENV['TEST_REDIS_CONNECTION'] ||= 'redis://localhost:6379/'
 
 Delayed::Backend::Redis::Job.redis = Redis.new(url: ENV['TEST_REDIS_CONNECTION'])
+Delayed::Backend::Redis::Job.redis.select ENV['TEST_ENV_NUMBER']
 
-ActiveRecord::Base.establish_connection({
+connection_config = {
   adapter: :postgresql,
   host: ENV['TEST_DB_HOST'],
   encoding: 'utf8',
   username: ENV['TEST_DB_USERNAME'],
   database: ENV['TEST_DB_DATABASE'],
-})
+}
+# create the test db if it does not exist, to help out wwtd
+ActiveRecord::Base.establish_connection(connection_config.merge(database: 'postgres'))
+begin
+  ActiveRecord::Base.connection.create_database(connection_config[:database])
+rescue ActiveRecord::StatementInvalid
+end
+ActiveRecord::Base.establish_connection(connection_config)
 # TODO reset db and migrate again, to test migrations
 
 ActiveRecord::Migrator.migrate("db/migrate")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.11.7
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_transaction_commit
@@ -328,9 +328,14 @@ files:
 - spec/delayed/work_queue/parent_process_spec.rb
 - spec/delayed/worker_spec.rb
 - 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/gemfiles/50.gemfile
 - spec/migrate/20140924140513_add_story_table.rb
 - spec/redis_job_spec.rb
 - spec/sample_jobs.rb
@@ -361,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
@@ -375,9 +380,14 @@ test_files:
 - spec/delayed/work_queue/parent_process_spec.rb
 - spec/delayed/worker_spec.rb
 - 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/gemfiles/50.gemfile
 - spec/migrate/20140924140513_add_story_table.rb
 - spec/redis_job_spec.rb
 - spec/sample_jobs.rb
@@ -389,4 +399,3 @@ test_files:
 - spec/shared/worker.rb
 - spec/shared_jobs_specs.rb
 - spec/spec_helper.rb
-has_rdoc: