diff --git a/lib/delayed/backend/shared_spec.rb b/lib/delayed/backend/shared_spec.rb index a0c4c1390..a4dfb6896 100644 --- a/lib/delayed/backend/shared_spec.rb +++ b/lib/delayed/backend/shared_spec.rb @@ -1,6 +1,6 @@ require File.expand_path('../../../../spec/sample_jobs', __FILE__) -require 'active_support/core_ext' +require 'active_support/core_ext/numeric/time' shared_examples_for 'a delayed_job backend' do let(:worker) { Delayed::Worker.new } diff --git a/lib/delayed/performable_method.rb b/lib/delayed/performable_method.rb index e9e3bdae1..0bd1fea49 100644 --- a/lib/delayed/performable_method.rb +++ b/lib/delayed/performable_method.rb @@ -1,11 +1,7 @@ -require 'active_support/core_ext/module/delegation' - module Delayed class PerformableMethod attr_accessor :object, :method_name, :args - delegate :method, :to => :object - def initialize(object, method_name, args) raise NoMethodError, "undefined method `#{method_name}' for #{object.inspect}" unless object.respond_to?(method_name, true) @@ -30,6 +26,10 @@ def perform object.send(method_name, *args) if object end + def method(sym) + object.method(sym) + end + def method_missing(symbol, *args) object.send(symbol, *args) end diff --git a/lib/delayed/worker.rb b/lib/delayed/worker.rb index ff6c5431c..17d87576a 100644 --- a/lib/delayed/worker.rb +++ b/lib/delayed/worker.rb @@ -1,8 +1,7 @@ require 'timeout' +require 'active_support/dependencies' require 'active_support/core_ext/numeric/time' require 'active_support/core_ext/class/attribute_accessors' -require 'active_support/core_ext/kernel' -require 'active_support/core_ext/enumerable' require 'logger' require 'benchmark' @@ -172,7 +171,7 @@ def start # rubocop:disable CyclomaticComplexity, PerceivedComplexity end end - count = @result.sum + count = @result[0] + @result[1] if count.zero? if self.class.exit_on_complete diff --git a/lib/delayed_job.rb b/lib/delayed_job.rb index dcddaf947..808831595 100644 --- a/lib/delayed_job.rb +++ b/lib/delayed_job.rb @@ -1,4 +1,3 @@ -require 'active_support' require 'delayed/compatibility' require 'delayed/exceptions' require 'delayed/message_sending'