Removed deprecated adapters.

refs jrgifford#179
morygonzalez · Jul 18, 2016 · cc410bc · cc410bc
1 parent 34592cf
commit cc410bc
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 297 deletions.
diff --git a/delayed_paperclip.gemspec b/delayed_paperclip.gemspec
@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.homepage    = %q{http://github.com/jrgifford/delayed_paperclip}
 
   s.add_dependency 'paperclip', [">= 3.3"]
+  s.add_dependency 'activejob', ">= 4.2"
 
   s.add_development_dependency 'mocha'
   s.add_development_dependency "rspec", '< 3.0'

diff --git a/lib/delayed_paperclip.rb b/lib/delayed_paperclip.rb
@@ -1,28 +1,20 @@
-require 'delayed_paperclip/jobs'
+require 'delayed_paperclip/jobs/active_job'
 require 'delayed_paperclip/attachment'
 require 'delayed_paperclip/url_generator'
 require 'delayed_paperclip/railtie'
 
 module DelayedPaperclip
 
   class << self
-
     def options
       @options ||= {
-        :background_job_class => detect_background_task,
+        :background_job_class => DelayedPaperclip::Jobs::ActiveJob,
         :url_with_processing  => true,
         :processing_image_url => nil,
         :queue => "paperclip"
       }
     end
 
-    def detect_background_task
-      return DelayedPaperclip::Jobs::ActiveJob  if defined? ::ActiveJob::Base
-      return DelayedPaperclip::Jobs::DelayedJob if defined? ::Delayed::Job
-      return DelayedPaperclip::Jobs::Resque     if defined? ::Resque
-      return DelayedPaperclip::Jobs::Sidekiq    if defined? ::Sidekiq
-    end
-
     def processor
       options[:background_job_class]
     end

diff --git a/lib/delayed_paperclip/jobs.rb b/lib/delayed_paperclip/jobs.rb
diff --git a/lib/delayed_paperclip/jobs/delayed_job.rb b/lib/delayed_paperclip/jobs/delayed_job.rb
diff --git a/lib/delayed_paperclip/jobs/resque.rb b/lib/delayed_paperclip/jobs/resque.rb
diff --git a/lib/delayed_paperclip/jobs/sidekiq.rb b/lib/delayed_paperclip/jobs/sidekiq.rb
diff --git a/spec/delayed_paperclip/attachment_spec.rb b/spec/delayed_paperclip/attachment_spec.rb
@@ -2,7 +2,7 @@
 
 describe DelayedPaperclip::Attachment do
   before :each do
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
+    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::ActiveJob
     reset_dummy(dummy_options)
   end
 

diff --git a/spec/delayed_paperclip/class_methods_spec.rb b/spec/delayed_paperclip/class_methods_spec.rb
@@ -2,7 +2,7 @@
 
 describe DelayedPaperclip::ClassMethods do
   before :each do
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
+    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::ActiveJob
     reset_dummy(with_processed: false)
   end
 

diff --git a/spec/delayed_paperclip/instance_methods_spec.rb b/spec/delayed_paperclip/instance_methods_spec.rb
@@ -2,7 +2,7 @@
 
 describe DelayedPaperclip::InstanceMethods do
   before :each do
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
+    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::ActiveJob
     reset_dummy
   end
 

diff --git a/spec/delayed_paperclip/url_generator_spec.rb b/spec/delayed_paperclip/url_generator_spec.rb
@@ -2,7 +2,7 @@
 
 describe DelayedPaperclip::UrlGenerator do
   before :each do
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
+    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::ActiveJob
     reset_dummy(dummy_options)
   end
 

diff --git a/spec/delayed_paperclip_spec.rb b/spec/delayed_paperclip_spec.rb
@@ -8,12 +8,12 @@
 
   context "with Resque adapter" do
     before :each do
-      DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
+      DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::ActiveJob
     end
 
     describe ".options" do
       it ".options returns basic options" do
-        DelayedPaperclip.options.should == {:background_job_class => DelayedPaperclip::Jobs::Resque,
+        DelayedPaperclip.options.should == {:background_job_class => DelayedPaperclip::Jobs::ActiveJob,
                                             :url_with_processing => true,
                                             :processing_image_url => nil,
                                             :queue => "paperclip"}
@@ -22,13 +22,13 @@
 
     describe ".processor" do
       it ".processor returns processor" do
-        DelayedPaperclip.processor.should == DelayedPaperclip::Jobs::Resque
+        DelayedPaperclip.processor.should == DelayedPaperclip::Jobs::ActiveJob
       end
     end
 
     describe ".enqueue" do
       it "delegates to processor" do
-        DelayedPaperclip::Jobs::Resque.expects(:enqueue_delayed_paperclip).with("Dummy", 1, :image)
+        DelayedPaperclip::Jobs::ActiveJob.expects(:enqueue_delayed_paperclip).with("Dummy", 1, :image)
         DelayedPaperclip.enqueue("Dummy", 1, :image)
       end
     end

diff --git a/spec/integration/base_delayed_paperclip_spec.rb b/spec/integration/base_delayed_paperclip_spec.rb
@@ -2,7 +2,7 @@
 
 describe "Base Delayed Paperclip Integration" do
   before :each do
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
+    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::ActiveJob
     Resque.remove_queue(:paperclip)
   end
 

diff --git a/spec/integration/delayed_job_spec.rb b/spec/integration/delayed_job_spec.rb
diff --git a/spec/integration/resque_spec.rb b/spec/integration/resque_spec.rb
diff --git a/spec/integration/sidekiq_spec.rb b/spec/integration/sidekiq_spec.rb