delayed_job 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f13f44eb18f5903178447ab50ddd453895632b3
-  data.tar.gz: 20c22a692ca3d8084a85fdb3e401f209d822eb3b
+  metadata.gz: 5e2fe748c9a94faf96700fa8f87466b6fe7fd079
+  data.tar.gz: 21d55a1f49084db05123ad5573711ef7a52f7c29
 SHA512:
-  metadata.gz: a2d9edf1e02e8fd824a5016a7761e049b0b3ae90509231d021858475dbfa7fe5695cf3a150b4564fe998e0d6fa11e39bde9017c0022ae899452a46f52d192c58
-  data.tar.gz: a0a6875d0e951fbd0a3f442e2b699605bb36074b4c38ececaec501b721717ea64800fa191ed1ebae1b528ba7e8f7d8caee1c53115dc741870e7dc034ed916211
+  metadata.gz: cadfae1e2a548b451dc336f033ae671bd005c5b17fa311c5af3a306851b6d5642fcc88bee79ebbc9826032e9dccdf5f58eb0315de63e3357106987f496009f69
+  data.tar.gz: 2a07509ecd676d248ca983a3ba87062cf1b11a8bdc67f0cd63ab91a2c975e8f840b323bba8ae9596aa15db2435702484763acd7688adaf39b492910fffead165

data/CHANGELOG.md

@@ -1,4 +1,14 @@
+4.1.3 - 2017-05-26
+=================
+* Don't mutate the options hash (#877)
+* Log an error message when a deserialization error occurs (#894)
+* Adding the queue name to the log output (#917)
+* Don't include ClassMethods with MessageSending (#924)
+* Fix YAML deserialization error if original object is soft-deleted (#947)
+* Add support for Rails 5.1 (#982)
+
 4.1.2 - 2016-05-16
+==================
 * Added Delayed::Worker.queue_attributes
 * Limit what we require in ActiveSupport
 * Fix pid file creation when there is no tmp directory

data/README.md

@@ -1,7 +1,7 @@
 **If you're viewing this at https://github.com/collectiveidea/delayed_job,
 you're reading the documentation for the master branch.
 [View documentation for the latest release
-(4.1.2).](https://github.com/collectiveidea/delayed_job/tree/v4.1.2)**
+(4.1.3).](https://github.com/collectiveidea/delayed_job/tree/v4.1.3)**
 
 Delayed::Job
 ============
@@ -37,8 +37,7 @@ multitude of core tasks. Amongst those tasks are:
 
 Installation
 ============
-delayed_job 3.0.0 only supports Rails 3.0+. See the [2.0
-branch](https://github.com/collectiveidea/delayed_job/tree/v2.0) for Rails 2.
+delayed_job 3.0.0 only supports Rails 3.0+.
 
 delayed_job supports multiple backends for storing the job queue. [See the wiki
 for other backends](https://github.com/collectiveidea/delayed_job/wiki/Backends).
@@ -220,6 +219,12 @@ Configured queue priorities can be overriden by passing priority to the delay me
 object.delay(:queue => 'high_priority', priority: 0).method
 ```
 
+You can start processes to only work certain queues with the `queue` and `queues`
+options defined below. Processes started without specifying a queue will run jobs
+from **any** queue. To effectively have a process that runs jobs where a queue is not
+specified, set a default queue name with `Delayed::Worker.default_queue_name` and 
+have the processes run that queue.
+
 Running Jobs
 ============
 `script/delayed_job` can be used to manage a background process which will

data/delayed_job.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |spec|
-  spec.add_dependency 'activesupport', ['>= 3.0', '< 5.1']
+  spec.add_dependency 'activesupport', ['>= 3.0', '< 5.2']
   spec.authors        = ['Brandon Keepers', 'Brian Ryckbost', 'Chris Gaffney', 'David Genord II', 'Erik Michaels-Ober', 'Matt Griffin', 'Steve Richert', 'Tobias Lütke']
   spec.description    = 'Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks.'
   spec.email          = ['brian@collectiveidea.com']
@@ -13,5 +13,5 @@ Gem::Specification.new do |spec|
   spec.require_paths  = ['lib']
   spec.summary        = 'Database-backed asynchronous priority queue system -- Extracted from Shopify'
   spec.test_files     = Dir.glob('spec/**/*')
-  spec.version        = '4.1.2'
+  spec.version        = '4.1.3'
 end

data/lib/delayed/backend/base.rb

@@ -30,16 +30,13 @@ module Delayed
         end
 
         # Allow the backend to attempt recovery from reserve errors
-        def recover_from(_error)
-        end
+        def recover_from(_error); end
 
         # Hook method that is called before a new worker is forked
-        def before_fork
-        end
+        def before_fork; end
 
         # Hook method that is called after a new worker is forked
-        def after_fork
-        end
+        def after_fork; end
 
         def work_off(num = 100)
           warn '[DEPRECATION] `Delayed::Job.work_off` is deprecated. Use `Delayed::Worker.new.work_off instead.'
@@ -101,7 +98,7 @@ module Delayed
       def hook(name, *args)
         if payload_object.respond_to?(name)
           method = payload_object.method(name)
-          method.arity == 0 ? method.call : method.call(self, *args)
+          method.arity.zero? ? method.call : method.call(self, *args)
         end
       rescue DeserializationError # rubocop:disable HandleExceptions
       end

data/lib/delayed/backend/job_preparer.rb

@@ -4,7 +4,7 @@ module Delayed
       attr_reader :options, :args
 
       def initialize(*args)
-        @options = args.extract_options!
+        @options = args.extract_options!.dup
         @args = args
       end
 
@@ -42,9 +42,11 @@ module Delayed
           options[:run_at]   = args[1]
         end
 
+        # rubocop:disable GuardClause
         unless options[:payload_object].respond_to?(:perform)
           raise ArgumentError, 'Cannot enqueue items which do not respond to perform'
         end
+        # rubocop:enabled GuardClause
       end
     end
   end

data/lib/delayed/backend/shared_spec.rb

@@ -113,6 +113,12 @@ shared_examples_for 'a delayed_job backend' do
         job = described_class.enqueue M::ModuleJob.new
         expect { job.invoke_job }.to change { M::ModuleJob.runs }.from(0).to(1)
       end
+
+      it 'does not mutate the options hash' do
+        options = {:priority => 1}
+        described_class.enqueue SimpleJob.new, options
+        expect(options).to eq(:priority => 1)
+      end
     end
 
     context 'with delay_jobs = false' do

data/lib/delayed/command.rb

@@ -77,8 +77,11 @@ module Delayed
         opt.on('--exit-on-complete', 'Exit when no more jobs are available to run. This will exit if all jobs are scheduled to run in the future.') do
           @options[:exit_on_complete] = true
         end
+        opt.on('--daemon-options a, b, c', Array, 'options to be passed through to daemons gem') do |daemon_options|
+          @daemon_options = daemon_options
+        end
       end
-      @args = opts.parse!(args)
+      @args = opts.parse!(args) + (@daemon_options || [])
     end
 
     def daemonize # rubocop:disable PerceivedComplexity
@@ -88,11 +91,13 @@ module Delayed
       if worker_pools
         setup_pools
       elsif @options[:identifier]
+        # rubocop:disable GuardClause
         if worker_count > 1
           raise ArgumentError, 'Cannot specify both --number-of-workers and --identifier'
         else
           run_process("delayed_job.#{@options[:identifier]}", @options)
         end
+        # rubocop:enable GuardClause
       else
         worker_count.times do |worker_index|
           process_name = worker_count == 1 ? 'delayed_job' : "delayed_job.#{worker_index}"

data/lib/delayed/exceptions.rb

@@ -8,5 +8,5 @@ module Delayed
     end
   end
 
-  class FatalBackendError < Exception; end
+  class FatalBackendError < RuntimeError; end
 end

data/lib/delayed/lifecycle.rb

@@ -1,5 +1,5 @@
 module Delayed
-  class InvalidCallback < Exception; end
+  class InvalidCallback < RuntimeError; end
 
   class Lifecycle
     EVENTS = {

data/lib/delayed/message_sending.rb

@@ -6,9 +6,11 @@ module Delayed
       @options = options
     end
 
+    # rubocop:disable MethodMissing
     def method_missing(method, *args)
       Job.enqueue({:payload_object => @payload_class.new(@target, method.to_sym, args)}.merge(@options))
     end
+    # rubocop:enable MethodMissing
   end
 
   module MessageSending
@@ -26,36 +28,36 @@ module Delayed
       warn '[DEPRECATION] `object.send_at(time, :method)` is deprecated. Use `object.delay(:run_at => time).method'
       __delay__(:run_at => time).__send__(method, *args)
     end
+  end
 
-    module ClassMethods
-      def handle_asynchronously(method, opts = {}) # rubocop:disable PerceivedComplexity
-        aliased_method = method.to_s.sub(/([?!=])$/, '')
-        punctuation = $1 # rubocop:disable PerlBackrefs
-        with_method = "#{aliased_method}_with_delay#{punctuation}"
-        without_method = "#{aliased_method}_without_delay#{punctuation}"
-        define_method(with_method) do |*args|
-          curr_opts = opts.clone
-          curr_opts.each_key do |key|
-            next unless (val = curr_opts[key]).is_a?(Proc)
-            curr_opts[key] = if val.arity == 1
-              val.call(self)
-            else
-              val.call
-            end
+  module MessageSendingClassMethods
+    def handle_asynchronously(method, opts = {}) # rubocop:disable PerceivedComplexity
+      aliased_method = method.to_s.sub(/([?!=])$/, '')
+      punctuation = $1 # rubocop:disable PerlBackrefs
+      with_method = "#{aliased_method}_with_delay#{punctuation}"
+      without_method = "#{aliased_method}_without_delay#{punctuation}"
+      define_method(with_method) do |*args|
+        curr_opts = opts.clone
+        curr_opts.each_key do |key|
+          next unless (val = curr_opts[key]).is_a?(Proc)
+          curr_opts[key] = if val.arity == 1
+            val.call(self)
+          else
+            val.call
           end
-          delay(curr_opts).__send__(without_method, *args)
         end
+        delay(curr_opts).__send__(without_method, *args)
+      end
 
-        alias_method without_method, method
-        alias_method method, with_method
+      alias_method without_method, method
+      alias_method method, with_method
 
-        if public_method_defined?(without_method)
-          public method
-        elsif protected_method_defined?(without_method)
-          protected method
-        elsif private_method_defined?(without_method)
-          private method
-        end
+      if public_method_defined?(without_method)
+        public method
+      elsif protected_method_defined?(without_method)
+        protected method
+      elsif private_method_defined?(without_method)
+        private method
       end
     end
   end

data/lib/delayed/performable_method.rb

@@ -30,9 +30,11 @@ module Delayed
       object.method(sym)
     end
 
+    # rubocop:disable MethodMissing
     def method_missing(symbol, *args)
       object.send(symbol, *args)
     end
+    # rubocop:enable MethodMissing
 
     def respond_to?(symbol, include_private = false)
       super || object.respond_to?(symbol, include_private)

data/lib/delayed/psych_ext.rb

@@ -37,7 +37,7 @@ module Delayed
             klass = result.class
             id = result[klass.primary_key]
             begin
-              klass.find(id)
+              klass.unscoped.find(id)
             rescue ActiveRecord::RecordNotFound => error # rubocop:disable BlockNesting
               raise Delayed::DeserializationError, "ActiveRecord::RecordNotFound, class: #{klass}, primary key: #{id} (#{error.message})"
             end

data/lib/delayed/worker.rb

@@ -233,6 +233,8 @@ module Delayed
       job_say job, format('COMPLETED after %.4f', runtime)
       return true # did work
     rescue DeserializationError => error
+      job_say job, "FAILED permanently with #{error.class.name}: #{error.message}", 'error'
+
       job.error = error
       failed(job)
     rescue Exception => error # rubocop:disable RescueException
@@ -268,7 +270,7 @@ module Delayed
     end
 
     def job_say(job, text, level = default_log_level)
-      text = "Job #{job.name} (id=#{job.id}) #{text}"
+      text = "Job #{job.name} (id=#{job.id})#{say_queue(job.queue)} #{text}"
       say text, level
     end
 
@@ -293,6 +295,10 @@ module Delayed
 
   protected
 
+    def say_queue(queue)
+      " (queue=#{queue})" if queue
+    end
+
     def handle_failed_job(job, error)
       job.error = error
       job_say job, "FAILED (#{job.attempts} prior attempts) with #{error.class.name}: #{error.message}", 'error'
@@ -320,8 +326,12 @@ module Delayed
 
     def reload!
       return unless self.class.reload_app?
-      ActionDispatch::Reloader.cleanup!
-      ActionDispatch::Reloader.prepare!
+      if defined?(ActiveSupport::Reloader)
+        Rails.application.reloader.reload!
+      else
+        ActionDispatch::Reloader.cleanup!
+        ActionDispatch::Reloader.prepare!
+      end
     end
   end
 end

data/lib/delayed_job.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'delayed/compatibility'
 require 'delayed/exceptions'
 require 'delayed/message_sending'
@@ -19,4 +20,4 @@ require 'delayed/deserialization_error'
 require 'delayed/railtie' if defined?(Rails::Railtie)
 
 Object.send(:include, Delayed::MessageSending)
-Module.send(:include, Delayed::MessageSending::ClassMethods)
+Module.send(:include, Delayed::MessageSendingClassMethods)

data/lib/generators/delayed_job/delayed_job_generator.rb

@@ -6,6 +6,6 @@ class DelayedJobGenerator < Rails::Generators::Base
 
   def create_executable_file
     template 'script', "#{Delayed::Compatibility.executable_prefix}/delayed_job"
-    chmod "#{Delayed::Compatibility.executable_prefix}/delayed_job", 0755
+    chmod "#{Delayed::Compatibility.executable_prefix}/delayed_job", 0o755
   end
 end

data/spec/autoloaded/clazz.rb

@@ -1,7 +1,6 @@
 # Make sure this file does not get required manually
 module Autoloaded
   class Clazz
-    def perform
-    end
+    def perform; end
   end
 end

data/spec/autoloaded/instance_clazz.rb

@@ -1,6 +1,5 @@
 module Autoloaded
   class InstanceClazz
-    def perform
-    end
+    def perform; end
   end
 end

data/spec/autoloaded/instance_struct.rb

@@ -1,7 +1,6 @@
 module Autoloaded
   InstanceStruct = ::Struct.new(nil)
   class InstanceStruct
-    def perform
-    end
+    def perform; end
   end
 end

data/spec/autoloaded/struct.rb

@@ -2,7 +2,6 @@
 module Autoloaded
   Struct = ::Struct.new(nil)
   class Struct
-    def perform
-    end
+    def perform; end
   end
 end

data/spec/message_sending_spec.rb

@@ -1,6 +1,11 @@
 require 'helper'
 
 describe Delayed::MessageSending do
+  it 'does not include ClassMethods along with MessageSending' do
+    expect { ClassMethods }.to raise_error(NameError)
+    expect(defined?(String::ClassMethods)).to eq(nil)
+  end
+
   describe 'handle_asynchronously' do
     class Story
       def tell!(_arg); end
@@ -19,7 +24,7 @@ describe Delayed::MessageSending do
         expect(job.payload_object.class).to eq(Delayed::PerformableMethod)
         expect(job.payload_object.method_name).to eq(:tell_without_delay!)
         expect(job.payload_object.args).to eq([1])
-      end.to change { Delayed::Job.count }
+      end.to(change { Delayed::Job.count })
     end
 
     describe 'with options' do
@@ -42,8 +47,7 @@ describe Delayed::MessageSending do
       describe 'using a proc with parameters' do
         class Yarn
           attr_accessor :importance
-          def spin
-          end
+          def spin; end
           handle_asynchronously :spin, :priority => proc { |y| y.importance }
         end
 
@@ -107,7 +111,7 @@ describe Delayed::MessageSending do
         expect do
           fairy_tail.delay.tell
         end.to change(fairy_tail, :happy_ending).from(nil).to(true)
-      end.not_to change { Delayed::Job.count }
+      end.not_to(change { Delayed::Job.count })
     end
 
     it 'does delay the job when delay_jobs is true' do
@@ -137,7 +141,7 @@ describe Delayed::MessageSending do
         expect do
           fairy_tail.delay.tell
         end.to change(fairy_tail, :happy_ending).from(nil).to(true)
-      end.not_to change { Delayed::Job.count }
+      end.not_to(change { Delayed::Job.count })
     end
   end
 end

data/spec/performable_method_spec.rb

@@ -30,8 +30,7 @@ describe Delayed::PerformableMethod do
 
   it 'does not raise NoMethodError if target method is private' do
     clazz = Class.new do
-      def private_method
-      end
+      def private_method; end
       private :private_method
     end
     expect { Delayed::PerformableMethod.new(clazz.new, :private_method, []) }.not_to raise_error

data/spec/worker_spec.rb

@@ -24,15 +24,23 @@ describe Delayed::Worker do
   describe 'job_say' do
     before do
       @worker = Delayed::Worker.new
-      @job = double('job', :id => 123, :name => 'ExampleJob')
+      @job = double('job', :id => 123, :name => 'ExampleJob', :queue => nil)
     end
 
     it 'logs with job name and id' do
+      expect(@job).to receive(:queue)
       expect(@worker).to receive(:say).
         with('Job ExampleJob (id=123) message', Delayed::Worker.default_log_level)
       @worker.job_say(@job, 'message')
     end
 
+    it 'logs with job name, queue and id' do
+      expect(@job).to receive(:queue).and_return('test')
+      expect(@worker).to receive(:say).
+        with('Job ExampleJob (id=123) (queue=test) message', Delayed::Worker.default_log_level)
+      @worker.job_say(@job, 'message')
+    end
+
     it 'has a configurable default log level' do
       Delayed::Worker.default_log_level = 'error'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
 platform: ruby
 authors:
 - Brandon Keepers
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -26,7 +26,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -36,7 +36,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 description: Delayed_job (or DJ) encapsulates the common pattern of asynchronously
   executing longer tasks in the background. It is a direct extraction from Shopify
   where the job table is responsible for a multitude of core tasks.
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify