diff --git a/lib/active_job/job_wrappers/delayed_job_wrapper.rb b/lib/active_job/job_wrappers/delayed_job_wrapper.rb deleted file mode 100644 index 0868d7b570c465f13a0cbac08540d9e4f86acec7..0000000000000000000000000000000000000000 --- a/lib/active_job/job_wrappers/delayed_job_wrapper.rb +++ /dev/null @@ -1,9 +0,0 @@ -module ActiveJob - module JobWrappers - class DelayedJobWrapper - def perform(job, *args) - job.perform(*ActiveJob::Parameters.deserialize(args)) - end - end - end -end diff --git a/lib/active_job/job_wrappers/resque_wrapper.rb b/lib/active_job/job_wrappers/resque_wrapper.rb deleted file mode 100644 index 68d9b252baef84f3942d1e626f34cfc9295e3eda..0000000000000000000000000000000000000000 --- a/lib/active_job/job_wrappers/resque_wrapper.rb +++ /dev/null @@ -1,29 +0,0 @@ -require 'resque' - -require 'active_support/core_ext/enumerable' -require 'active_support/core_ext/array/access' - -module ActiveJob - module JobWrappers - class ResqueWrapper - class << self - def wrap(job, args) - [ new(job), *args.prepend(job) ] - end - - def perform(job_name, *args) - job_name.constantize.perform(*ActiveJob::Parameters.deserialize(args)) - end - end - - - def initialize(job) - @queue = job.queue_name - end - - def to_s - self.class.to_s - end - end - end -end diff --git a/lib/active_job/job_wrappers/sidekiq_wrapper.rb b/lib/active_job/job_wrappers/sidekiq_wrapper.rb deleted file mode 100644 index e1332b0210472637e0496054d815e0aae32c915b..0000000000000000000000000000000000000000 --- a/lib/active_job/job_wrappers/sidekiq_wrapper.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'active_job/parameters' - -module ActiveJob - module JobWrappers - class SidekiqWrapper - include Sidekiq::Worker - - def perform(job_name, *args) - job_name.constantize.perform(*ActiveJob::Parameters.deserialize(args)) - end - end - end -end diff --git a/lib/active_job/job_wrappers/sucker_punch_wrapper.rb b/lib/active_job/job_wrappers/sucker_punch_wrapper.rb deleted file mode 100644 index 7e9960b44f4d460582bf03a1425fa1ea1727c52f..0000000000000000000000000000000000000000 --- a/lib/active_job/job_wrappers/sucker_punch_wrapper.rb +++ /dev/null @@ -1,11 +0,0 @@ -module ActiveJob - module JobWrappers - class SuckerPunchWrapper - include SuckerPunch::Job - - def perform(job_name, *args) - job_name.perform(*ActiveJob::Parameters.deserialize(args)) - end - end - end -end diff --git a/lib/active_job/queue_adapters/delayed_job_adapter.rb b/lib/active_job/queue_adapters/delayed_job_adapter.rb index 4730d97a9a09dc72aef1da2ef48757dab6c4c142..1db15f1804cbe00760c64f2571ace27125fb4ca0 100644 --- a/lib/active_job/queue_adapters/delayed_job_adapter.rb +++ b/lib/active_job/queue_adapters/delayed_job_adapter.rb @@ -1,12 +1,17 @@ require 'delayed_job' -require 'active_job/job_wrappers/delayed_job_wrapper' module ActiveJob module QueueAdapters class DelayedJobAdapter class << self def queue(job, *args) - JobWrappers::DelayedJobWrapper.new.delay(queue: job.queue_name).perform(job, *args) + JobWrapper.new.delay(queue: job.queue_name).perform(job, *args) + end + end + + class JobWrapper + def perform(job, *args) + job.perform(*ActiveJob::Parameters.deserialize(args)) end end end diff --git a/lib/active_job/queue_adapters/resque_adapter.rb b/lib/active_job/queue_adapters/resque_adapter.rb index 43a44d2a4842402eaf34561d9fc757a139e1f46d..1d1f9ffe83fafdf8f178110442e5dfa8c2f7ec11 100644 --- a/lib/active_job/queue_adapters/resque_adapter.rb +++ b/lib/active_job/queue_adapters/resque_adapter.rb @@ -1,12 +1,33 @@ require 'resque' -require 'active_job/job_wrappers/resque_wrapper' +require 'active_support/core_ext/enumerable' +require 'active_support/core_ext/array/access' module ActiveJob module QueueAdapters class ResqueAdapter class << self def queue(job, *args) - Resque.enqueue *JobWrappers::ResqueWrapper.wrap(job, args) + Resque.enqueue *JobWrapper.wrap(job, args) + end + end + + class JobWrapper + class << self + def wrap(job, args) + [ new(job), *args.prepend(job) ] + end + + def perform(job_name, *args) + job_name.constantize.perform(*ActiveJob::Parameters.deserialize(args)) + end + end + + def initialize(job) + @queue = job.queue_name + end + + def to_s + self.class.to_s end end end diff --git a/lib/active_job/queue_adapters/sidekiq_adapter.rb b/lib/active_job/queue_adapters/sidekiq_adapter.rb index 70c4377a23692e0997c1e958eaf429a1bc1b5021..90af35525a2b1f3b6f4b211acefc27847dfaee64 100644 --- a/lib/active_job/queue_adapters/sidekiq_adapter.rb +++ b/lib/active_job/queue_adapters/sidekiq_adapter.rb @@ -1,12 +1,19 @@ require 'sidekiq' -require 'active_job/job_wrappers/sidekiq_wrapper' module ActiveJob module QueueAdapters class SidekiqAdapter class << self def queue(job, *args) - JobWrappers::SidekiqWrapper.perform_async(job, *args) + JobWrapper.perform_async(job, *args) + end + end + + class JobWrapper + include Sidekiq::Worker + + def perform(job_name, *args) + job_name.constantize.perform(*ActiveJob::Parameters.deserialize(args)) end end end diff --git a/lib/active_job/queue_adapters/sucker_punch_adapter.rb b/lib/active_job/queue_adapters/sucker_punch_adapter.rb index 8191e5a1df8ec644fd2fd002b2defca8ee69d5c6..d721a0dcd565d9661d5b144e31f28f099064895b 100644 --- a/lib/active_job/queue_adapters/sucker_punch_adapter.rb +++ b/lib/active_job/queue_adapters/sucker_punch_adapter.rb @@ -1,12 +1,19 @@ require 'sucker_punch' -require 'active_job/job_wrappers/sucker_punch_wrapper' module ActiveJob module QueueAdapters class SuckerPunchAdapter class << self def queue(job, *args) - JobWrappers::SuckerPunchWrapper.new.async.perform(job, *args) + JobWrapper.new.async.perform(job, *args) + end + end + + class JobWrapper + include SuckerPunch::Job + + def perform(job_name, *args) + job_name.perform(*ActiveJob::Parameters.deserialize(args)) end end end