diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Rakefile | 4 | ||||
| -rw-r--r-- | lib/active_job/base.rb | 1 | ||||
| -rw-r--r-- | lib/active_job/job_wrappers/sidekiq_wrapper.rb | 11 | ||||
| -rw-r--r-- | lib/active_job/queue_adapters/sidekiq_adapter.rb | 14 | ||||
| -rw-r--r-- | test/adapters/sidekiq.rb | 2 |
6 files changed, 31 insertions, 3 deletions
@@ -3,4 +3,4 @@ source 'https://rubygems.org' gemspec gem 'resque' - +gem 'sidekiq' @@ -22,12 +22,12 @@ task :default => :test desc 'Run all adapter tests' task :test do - tasks = %w(test_inline test_resque) + tasks = %w(test_inline test_resque test_sidekiq) run_without_aborting(*tasks) end -%w( inline resque ).each do |adapter| +%w( inline resque sidekiq ).each do |adapter| Rake::TestTask.new("test_#{adapter}") do |t| t.libs << 'test' t.test_files = FileList['test/cases/**/*_test.rb'] diff --git a/lib/active_job/base.rb b/lib/active_job/base.rb index 341ea6158b..d1fff27a3a 100644 --- a/lib/active_job/base.rb +++ b/lib/active_job/base.rb @@ -1,5 +1,6 @@ require 'active_job/queue_adapters/inline_adapter' require 'active_job/queue_adapters/resque_adapter' +require 'active_job/queue_adapters/sidekiq_adapter' module ActiveJob class Base diff --git a/lib/active_job/job_wrappers/sidekiq_wrapper.rb b/lib/active_job/job_wrappers/sidekiq_wrapper.rb new file mode 100644 index 0000000000..fb728ae0fd --- /dev/null +++ b/lib/active_job/job_wrappers/sidekiq_wrapper.rb @@ -0,0 +1,11 @@ +module ActiveJob + module JobWrappers + class SidekiqWrapper + include Sidekiq::Worker + + def perform(job_name, *args) + job_name.constantize.perform(*args) + end + end + end +end diff --git a/lib/active_job/queue_adapters/sidekiq_adapter.rb b/lib/active_job/queue_adapters/sidekiq_adapter.rb new file mode 100644 index 0000000000..70c4377a23 --- /dev/null +++ b/lib/active_job/queue_adapters/sidekiq_adapter.rb @@ -0,0 +1,14 @@ +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) + end + end + end + end +end diff --git a/test/adapters/sidekiq.rb b/test/adapters/sidekiq.rb new file mode 100644 index 0000000000..74ce808d55 --- /dev/null +++ b/test/adapters/sidekiq.rb @@ -0,0 +1,2 @@ +require 'sidekiq/testing/inline' +ActiveJob::Base.queue_adapter = ActiveJob::QueueAdapters::SidekiqAdapter |