delayed_paperclip 2.9.1 → 2.9.2

data/spec/delayed_paperclip_spec.rb

@@ -2,28 +2,35 @@ require 'spec_helper'
 require 'resque'
 
 describe DelayedPaperclip do
-  before :all do
+  before :each do
     reset_dummy
   end
 
-  describe ".options" do
-    it ".options returns basic options" do
-      DelayedPaperclip.options.should == {:background_job_class => DelayedPaperclip::Jobs::Resque,
-                                          :url_with_processing => true,
-                                          :processing_image_url => nil}
+  context "with Resque adapter" do
+    before :each do
+      DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
     end
-  end
 
-  describe ".processor" do
-    it ".processor returns processor" do
-      DelayedPaperclip.processor.should == DelayedPaperclip::Jobs::Resque
+    describe ".options" do
+      it ".options returns basic options" do
+        DelayedPaperclip.options.should == {:background_job_class => DelayedPaperclip::Jobs::Resque,
+                                            :url_with_processing => true,
+                                            :processing_image_url => nil,
+                                            :queue => "paperclip"}
+      end
     end
-  end
 
-  describe ".enqueue" do
-    it "delegates to processor" do
-      DelayedPaperclip::Jobs::Resque.expects(:enqueue_delayed_paperclip).with("Dummy", 1, :image)
-      DelayedPaperclip.enqueue("Dummy", 1, :image)
+    describe ".processor" do
+      it ".processor returns processor" do
+        DelayedPaperclip.processor.should == DelayedPaperclip::Jobs::Resque
+      end
+    end
+
+    describe ".enqueue" do
+      it "delegates to processor" do
+        DelayedPaperclip::Jobs::Resque.expects(:enqueue_delayed_paperclip).with("Dummy", 1, :image)
+        DelayedPaperclip.enqueue("Dummy", 1, :image)
+      end
     end
   end
 
@@ -32,28 +39,36 @@ describe DelayedPaperclip do
 
     it "finds dummy and calls #process_delayed!" do
       dummy_stub = stub
-      dummy_stub.expects(:find).with(dummy.id).returns(dummy)
+      dummy_stub.expects(:where).with(id: dummy.id).returns([dummy])
       Dummy.expects(:unscoped).returns(dummy_stub)
       dummy.image.expects(:process_delayed!)
       DelayedPaperclip.process_job("Dummy", dummy.id, :image)
     end
+
+    it "doesn't find dummy and it doesn't raise any exceptions" do
+      dummy_stub = stub
+      dummy_stub.expects(:where).with(id: dummy.id).returns([])
+      Dummy.expects(:unscoped).returns(dummy_stub)
+      expect do
+        DelayedPaperclip.process_job("Dummy", dummy.id, :image)
+      end.not_to raise_exception
+    end
   end
 
   describe "paperclip definitions" do
-    before :all do
+    before :each do
       reset_dummy :paperclip => { styles: { thumbnail: "25x25"} }
     end
 
     it "returns paperclip options regardless of version" do
-      Dummy.paperclip_definitions.should ==  {:image =>   { :styles => { :thumbnail => "25x25" },
+      expect(Dummy.paperclip_definitions).to eq({:image =>   { :styles => { :thumbnail => "25x25" },
                                               :delayed => { :priority => 0,
                                                             :only_process => [],
                                                             :url_with_processing => true,
                                                             :processing_image_url => nil,
-                                                            :queue => nil}
+                                                            :queue => "paperclip"}
                                                           }
-                                              }
+                                              })
     end
-
   end
-end
+end

data/spec/integration/active_job_inline_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe "ActiveJob inline" do
-
   if defined? ActiveJob
-    before :all do
+    before :each do
       DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::ActiveJob
+      ActiveJob::Base.queue_adapter = :inline
       ActiveJob::Base.logger = nil
     end
 
@@ -23,4 +23,4 @@ describe "ActiveJob inline" do
       end
     end
   end
-end
+end

data/spec/integration/active_job_resque_spec.rb

@@ -3,8 +3,7 @@ require 'resque'
 
 if defined? ActiveJob
   describe "Active Job with Resque backend" do
-
-    before :all do
+    before :each do
       DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::ActiveJob
       ActiveJob::Base.logger = nil
       ActiveJob::Base.queue_adapter = :resque
@@ -22,10 +21,8 @@ if defined? ActiveJob
       worker.process
     end
 
-    def jobs_count
-
-      Resque.size(:paperclip)
+    def jobs_count(queue = :paperclip)
+      Resque.size(queue)
     end
-
   end
-end
+end

data/spec/integration/active_job_sidekiq_spec.rb

@@ -1,35 +1,34 @@
 require 'spec_helper'
-require 'sidekiq/api'
+require 'sidekiq/testing'
 
 describe "ActiveJob with Sidekiq backend" do
+  if defined? ActiveJob
+    before :each do
+      DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::ActiveJob
+      ActiveJob::Base.logger = nil
+      ActiveJob::Base.queue_adapter = :sidekiq
+      Sidekiq::Queues["paperclip"].clear
+    end
 
-if defined? ActiveJob
-  before :all do
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::ActiveJob
-    ActiveJob::Base.logger = nil
-    ActiveJob::Base.queue_adapter = :sidekiq
-  end
-
-  let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/spec/fixtures/12k.png")) }
+    let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/spec/fixtures/12k.png")) }
 
-  describe "integration tests" do
-    include_examples "base usage"
+    describe "integration tests" do
+      include_examples "base usage"
+    end
   end
-end
 
   def process_jobs
-    Sidekiq::Queue.new(:paperclip).each do |job|
-      worker = job.klass.constantize.new
-      args   = job.args
+    Sidekiq::Queues["paperclip"].each do |job|
+      worker = job["class"].constantize.new
+      args   = job["args"]
       begin
         worker.perform(*args)
       rescue # Assume sidekiq handle exception properly
       end
-      job.delete
     end
   end
 
-  def jobs_count
-    Sidekiq::Queue.new(:paperclip).size
+  def jobs_count(queue = "paperclip")
+    Sidekiq::Queues[queue].size
   end
 end

data/spec/integration/base_delayed_paperclip_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Base Delayed Paperclip Integration" do
-  before :all do
+  before :each do
     DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
     Resque.remove_queue(:paperclip)
   end
@@ -14,16 +14,15 @@ describe "Base Delayed Paperclip Integration" do
 
   describe "double save" do
     before :each do
-      dummy.image_processing.should be_false
+      dummy.image_processing.should be_falsey
       dummy.image = File.open("#{ROOT}/spec/fixtures/12k.png")
       dummy.save!
     end
 
     it "processing column remains true" do
-      dummy.image_processing.should be_true
+      dummy.image_processing.should be_truthy
       dummy.save!
-      dummy.image_processing.should be_true
+      dummy.image_processing.should be_truthy
     end
   end
-
-end
+end

data/spec/integration/delayed_job_spec.rb

@@ -4,8 +4,7 @@ require 'delayed_job'
 Delayed::Worker.backend = :active_record
 
 describe "Delayed Job" do
-
-  before :all do
+  before :each do
     DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::DelayedJob
     build_delayed_jobs
   end
@@ -34,7 +33,7 @@ describe "Delayed Job" do
     Delayed::Worker.new.work_off
   end
 
-  def jobs_count
+  def jobs_count(queue = nil)
     Delayed::Job.count
   end
 
@@ -52,4 +51,4 @@ describe "Delayed Job" do
       table.timestamps null: true
     end
   end
-end
+end

data/spec/integration/examples/base.rb

@@ -12,10 +12,10 @@ shared_examples "base usage" do
 
     it "allows normal paperclip functionality" do
       Paperclip::Attachment.any_instance.expects(:post_process)
-      dummy.image.delay_processing?.should be_false
-      dummy.image.post_processing.should be_true
-      dummy.save.should be_true
-      File.exists?(dummy.image.path).should be_true
+      dummy.image.delay_processing?.should be_falsey
+      dummy.image.post_processing.should be_truthy
+      dummy.save.should be_truthy
+      File.exists?(dummy.image.path).should be_truthy
     end
 
     context "missing url" do
@@ -52,16 +52,16 @@ shared_examples "base usage" do
       dummy.image.post_processing = true
     end
     it "has delay_processing is false" do
-      dummy.image.delay_processing?.should be_false
+      dummy.image.delay_processing?.should be_falsey
     end
 
     it "post processing returns true" do
-      dummy.image.post_processing.should be_true
+      dummy.image.post_processing.should be_truthy
     end
 
     it "writes the file" do
       dummy.save
-      File.exists?(dummy.image.path).should be_true
+      File.exists?(dummy.image.path).should be_truthy
     end
   end
 
@@ -73,16 +73,16 @@ shared_examples "base usage" do
     end
 
     it "delays processing" do
-      dummy.image.delay_processing?.should be_true
+      dummy.image.delay_processing?.should be_truthy
     end
 
     it "post_processing is false" do
-      dummy.image.post_processing.should be_false
+      dummy.image.post_processing.should be_falsey
     end
 
     it "has file after save" do
       dummy.save
-      File.exists?(dummy.image.path).should be_true
+      File.exists?(dummy.image.path).should be_truthy
     end
 
   end
@@ -98,9 +98,9 @@ shared_examples "base usage" do
   describe "processing column not altered" do
     it "resets after job finished" do
       dummy.save!
-      dummy.image_processing?.should be_true
+      dummy.image_processing?.should be_truthy
       process_jobs
-      dummy.reload.image_processing?.should be_false
+      dummy.reload.image_processing?.should be_falsey
     end
 
     context "with error" do
@@ -110,10 +110,10 @@ shared_examples "base usage" do
 
       it "stays true even if errored" do
         dummy.save!
-        dummy.image_processing?.should be_true
+        dummy.image_processing?.should be_truthy
         process_jobs
-        dummy.image_processing?.should be_true
-        dummy.reload.image_processing?.should be_true
+        dummy.image_processing?.should be_truthy
+        dummy.reload.image_processing?.should be_truthy
       end
     end
   end
@@ -121,10 +121,10 @@ shared_examples "base usage" do
   # TODO: test appears redundant
   describe "processing is true for new record" do
     it "is true" do
-      dummy.image_processing?.should be_false
-      dummy.new_record?.should be_true
+      dummy.image_processing?.should be_falsey
+      dummy.new_record?.should be_truthy
       dummy.save!
-      dummy.reload.image_processing?.should be_true
+      dummy.reload.image_processing?.should be_truthy
     end
   end
 
@@ -176,7 +176,7 @@ shared_examples "base usage" do
     context "paperclip callback" do
       before :each do
         Dummy.send(:define_method, :done_processing) { puts 'done' }
-        Dummy.after_image_post_process :done_processing
+        Dummy.send(:after_image_post_process, :done_processing)
         Dummy.any_instance.expects(:done_processing).once
       end
 
@@ -243,7 +243,7 @@ shared_examples "base usage" do
       dummy.save!
       process_jobs
       dummy.reload.image.url(:thumbnail).should start_with("/system/dummies/images/000/000/001/thumbnail/12k.jpg")
-      File.exists?(dummy.image.path).should be_true
+      File.exists?(dummy.image.path).should be_truthy
     end
   end
 
@@ -259,9 +259,9 @@ shared_examples "base usage" do
 
     it "does not increase jobs count" do
       dummy.save!
-      dummy.image_processing?.should be_true
+      dummy.image_processing?.should be_truthy
       process_jobs
-      dummy.reload.image_processing?.should be_false
+      dummy.reload.image_processing?.should be_falsey
 
       Paperclip::Attachment.any_instance.expects(:reprocess!).once
 
@@ -269,8 +269,8 @@ shared_examples "base usage" do
       dummy.image.reprocess_without_delay!(:thumbnail)
       existing_jobs.should == jobs_count
 
-      dummy.image_processing?.should be_false
-      File.exists?(dummy.image.path).should be_true
+      dummy.image_processing?.should be_falsey
+      File.exists?(dummy.image.path).should be_truthy
     end
 
   end
@@ -312,5 +312,13 @@ shared_examples "base usage" do
     end
   end
 
-end
+  describe "queue option" do
+    it "enqueues job with given queue name" do
+      reset_dummy :queue => "custom"
 
+      expect do
+        dummy.save!
+      end.to change { jobs_count("custom") }.by(1)
+    end
+  end
+end

data/spec/integration/resque_spec.rb

@@ -2,8 +2,7 @@ require 'spec_helper'
 require 'resque'
 
 describe "Resque" do
-
-  before :all do
+  before :each do
     DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
     Resque.remove_queue(:paperclip)
   end
@@ -33,8 +32,7 @@ describe "Resque" do
     worker.process
   end
 
-  def jobs_count
-    Resque.size(:paperclip)
+  def jobs_count(queue = :paperclip)
+    Resque.size(queue)
   end
-
-end
+end

data/spec/integration/sidekiq_spec.rb

@@ -1,12 +1,11 @@
 require 'spec_helper'
-require 'sidekiq/api'
+require 'sidekiq/testing'
 
 describe "Sidekiq" do
-
-  before :all do
+  before :each do
     Sidekiq.logger.level = Logger::ERROR
     DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Sidekiq
-    Sidekiq::Queue.new(:paperclip).clear
+    Sidekiq::Queues["paperclip"].clear
   end
 
   let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/spec/fixtures/12k.png")) }
@@ -30,19 +29,17 @@ describe "Sidekiq" do
   end
 
   def process_jobs
-    Sidekiq::Queue.new(:paperclip).each do |job|
-      worker = job.klass.constantize.new
-      args   = job.args
+    Sidekiq::Queues["paperclip"].each do |job|
+      worker = job["class"].constantize.new
+      args   = job["args"]
       begin
         worker.perform(*args)
       rescue # Assume sidekiq handle exception properly
       end
-      job.delete
     end
   end
 
-  def jobs_count
-    Sidekiq::Queue.new(:paperclip).size
+  def jobs_count(queue = "paperclip")
+    Sidekiq::Queues[queue].size
   end
-
 end