delayed_paperclip 2.10.0 → 3.0.0

data/gemfiles/3.2.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "~> 3.2.15"
-
-gemspec :path => "../"

data/gemfiles/4.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "~> 4.0.0"
-
-gemspec :path => "../"

data/gemfiles/4.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "~> 4.1.0"
-
-gemspec :path => "../"

data/init.rb

@@ -1,4 +0,0 @@
-require File.join(File.dirname(__FILE__), "lib", "delayed_paperclip")
-require 'delayed_paperclip/railtie'
-
-DelayedPaperclip::Railtie.insert

data/lib/delayed_paperclip/jobs.rb

@@ -1,8 +0,0 @@
-module DelayedPaperclip
-  module Jobs
-    autoload :ActiveJob,  'delayed_paperclip/jobs/active_job'
-    autoload :DelayedJob, 'delayed_paperclip/jobs/delayed_job'
-    autoload :Resque,     'delayed_paperclip/jobs/resque'
-    autoload :Sidekiq,    'delayed_paperclip/jobs/sidekiq'
-  end
-end

data/lib/delayed_paperclip/jobs/active_job.rb

@@ -1,14 +0,0 @@
-module DelayedPaperclip
-  module Jobs
-    class ActiveJob < ActiveJob::Base
-      def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
-        queue_name = instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:queue]
-        set(:queue => queue_name).perform_later(instance_klass, instance_id, attachment_name.to_s)
-      end
-
-      def perform(instance_klass, instance_id, attachment_name)
-        DelayedPaperclip.process_job(instance_klass, instance_id, attachment_name.to_sym)
-      end
-    end
-  end
-end

data/lib/delayed_paperclip/jobs/delayed_job.rb

@@ -1,46 +0,0 @@
-require 'delayed_job'
-require 'active_support/deprecation'
-
-module DelayedPaperclip
-  module Jobs
-    class DelayedJob < Struct.new(:instance_klass, :instance_id, :attachment_name)
-
-      # This is available in newer versions of DelayedJob. Using the newee Job api thus.
-      if Gem.loaded_specs['delayed_job'].version >= Gem::Version.new("2.1.0")
-
-        def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
-          ActiveSupport::Deprecation.warn(<<-MESSAGE)
-Using DelayedJob adapter for delayed_paperclip is deprecated and will be removed in version 3.0.0.
-Please use ActiveJob adapter.
-          MESSAGE
-
-          ::Delayed::Job.enqueue(
-            :payload_object => new(instance_klass, instance_id, attachment_name),
-            :priority => instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:priority].to_i,
-            :queue => instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:queue]
-          )
-        end
-
-      else
-
-        def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
-          ActiveSupport::Deprecation.warn(<<-MESSAGE)
-Using DelayedJob adapter for delayed_paperclip is deprecated and will be removed in version 3.0.0.
-Please use ActiveJob adapter.
-          MESSAGE
-
-          ::Delayed::Job.enqueue(
-            new(instance_klass, instance_id, attachment_name),
-            instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:priority].to_i,
-            instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:queue]
-          )
-        end
-
-      end
-
-      def perform
-        DelayedPaperclip.process_job(instance_klass, instance_id, attachment_name)
-      end
-    end
-  end
-end

data/lib/delayed_paperclip/jobs/resque.rb

@@ -1,22 +0,0 @@
-require 'resque'
-require 'active_support/deprecation'
-
-module DelayedPaperclip
-  module Jobs
-    class Resque
-      def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
-        @queue = instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:queue]
-        ::Resque.enqueue(self, instance_klass, instance_id, attachment_name)
-
-        ActiveSupport::Deprecation.warn(<<-MESSAGE)
-Using Resque adapter for delayed_paperclip is deprecated and will be removed in version 3.0.0.
-Please use ActiveJob adapter.
-        MESSAGE
-      end
-
-      def self.perform(instance_klass, instance_id, attachment_name)
-        DelayedPaperclip.process_job(instance_klass, instance_id, attachment_name)
-      end
-    end
-  end
-end

data/lib/delayed_paperclip/jobs/sidekiq.rb

@@ -1,30 +0,0 @@
-require 'sidekiq/worker'
-require 'active_support/deprecation'
-
-module DelayedPaperclip
-  module Jobs
-    class Sidekiq
-      include ::Sidekiq::Worker
-
-      def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
-        ActiveSupport::Deprecation.warn(<<-MESSAGE)
-Using Sidekiq adapter for delayed_paperclip is deprecated and will be removed in version 3.0.0.
-Please use ActiveJob adapter.
-        MESSAGE
-
-        queue_name = instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:queue]
-        # Sidekiq >= 4.1.0
-        if respond_to?(:set)
-          set(:queue => queue_name)
-        else
-          sidekiq_options :queue => queue_name
-        end
-        perform_async(instance_klass, instance_id, attachment_name)
-      end
-
-      def perform(instance_klass, instance_id, attachment_name)
-        DelayedPaperclip.process_job(instance_klass, instance_id, attachment_name)
-      end
-    end
-  end
-end

data/rails/init.rb

@@ -1,2 +0,0 @@
-require 'delayed_paperclip/railtie'
-DelayedPaperclip::Railtie.insert

data/spec/integration/active_job_inline_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe "ActiveJob inline" do
-  if defined? ActiveJob
-    before :each do
-      DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::ActiveJob
-      ActiveJob::Base.queue_adapter = :inline
-      ActiveJob::Base.logger = nil
-    end
-
-    let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/fixtures/12k.png")) }
-
-    describe "perform job" do
-      before :each do
-        DelayedPaperclip.options[:url_with_processing] = true
-        reset_dummy
-      end
-
-      it "performs a job" do
-        dummy.image = File.open("#{ROOT}/fixtures/12k.png")
-        Paperclip::Attachment.any_instance.expects(:reprocess!)
-        dummy.save!
-      end
-    end
-  end
-end

data/spec/integration/active_job_resque_spec.rb

@@ -1,28 +0,0 @@
-require 'spec_helper'
-require 'resque'
-
-if defined? ActiveJob
-  describe "Active Job with Resque backend" do
-    before :each do
-      DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::ActiveJob
-      ActiveJob::Base.logger = nil
-      ActiveJob::Base.queue_adapter = :resque
-      Resque.remove_queue(:paperclip)
-    end
-
-    let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/fixtures/12k.png")) }
-
-    describe "integration tests" do
-      include_examples "base usage"
-    end
-
-    def process_jobs
-      worker = Resque::Worker.new(:paperclip)
-      worker.process
-    end
-
-    def jobs_count(queue = :paperclip)
-      Resque.size(queue)
-    end
-  end
-end

data/spec/integration/active_job_sidekiq_spec.rb

@@ -1,34 +0,0 @@
-require 'spec_helper'
-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
-
-    let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/fixtures/12k.png")) }
-
-    describe "integration tests" do
-      include_examples "base usage"
-    end
-  end
-
-  def process_jobs
-    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
-    end
-  end
-
-  def jobs_count(queue = "paperclip")
-    Sidekiq::Queues[queue].size
-  end
-end

data/spec/integration/delayed_job_spec.rb

@@ -1,63 +0,0 @@
-require 'spec_helper'
-require 'delayed_job'
-
-Delayed::Worker.backend = :active_record
-
-describe "Delayed Job" do
-  before :each do
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::DelayedJob
-    build_delayed_jobs
-  end
-
-  let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/fixtures/12k.png")) }
-
-  describe "integration tests" do
-    include_examples "base usage"
-  end
-
-  describe "perform job" do
-    before :each do
-      DelayedPaperclip.options[:url_with_processing] = true
-      reset_dummy
-    end
-
-    it "performs a job" do
-      dummy.image = File.open("#{ROOT}/fixtures/12k.png")
-      Paperclip::Attachment.any_instance.expects(:reprocess!)
-      dummy.save!
-      Delayed::Job.last.payload_object.perform
-    end
-
-    it "is deprecated" do
-      ActiveSupport::Deprecation.expects(:warn)
-
-      dummy.image = File.open("#{ROOT}/fixtures/12k.png")
-      Paperclip::Attachment.any_instance.expects(:reprocess!)
-      dummy.save!
-      Delayed::Job.last.payload_object.perform
-    end
-  end
-
-  def process_jobs
-    Delayed::Worker.new.work_off
-  end
-
-  def jobs_count(queue = nil)
-    Delayed::Job.count
-  end
-
-  def build_delayed_jobs
-    ActiveRecord::Base.connection.create_table :delayed_jobs, :force => true do |table|
-      table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
-      table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
-      table.text     :handler                      # YAML-encoded string of the object that will do work
-      table.string   :last_error                   # reason for last failure (See Note below)
-      table.datetime :run_at                       # When to run. Could be Time.now for immediately, or sometime in the future.
-      table.datetime :locked_at                    # Set when a client is working on this object
-      table.datetime :failed_at                    # Set when all retries have failed (actually, by default, the record is deleted instead)
-      table.string   :locked_by                    # Who is working on this object (if locked)
-      table.string   :queue
-      table.timestamps null: true
-    end
-  end
-end

data/spec/integration/resque_spec.rb

@@ -1,47 +0,0 @@
-require 'spec_helper'
-require 'resque'
-
-describe "Resque" do
-  before :each do
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
-    Resque.remove_queue(:paperclip)
-  end
-
-  let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/fixtures/12k.png")) }
-
-  describe "integration tests" do
-    include_examples "base usage"
-  end
-
-  describe "perform job" do
-    before :each do
-      DelayedPaperclip.options[:url_with_processing] = true
-      reset_dummy
-    end
-
-    it "performs a job" do
-      dummy.image = File.open("#{ROOT}/fixtures/12k.png")
-      Paperclip::Attachment.any_instance.expects(:reprocess!)
-      dummy.save!
-      DelayedPaperclip::Jobs::Resque.perform(dummy.class.name, dummy.id, :image)
-    end
-
-    it "is deprecated" do
-      ActiveSupport::Deprecation.expects(:warn)
-
-      dummy.image = File.open("#{ROOT}/fixtures/12k.png")
-      Paperclip::Attachment.any_instance.expects(:reprocess!)
-      dummy.save!
-      DelayedPaperclip::Jobs::Resque.perform(dummy.class.name, dummy.id, :image)
-    end
-  end
-
-  def process_jobs
-    worker = Resque::Worker.new(:paperclip)
-    worker.process
-  end
-
-  def jobs_count(queue = :paperclip)
-    Resque.size(queue)
-  end
-end

data/spec/integration/sidekiq_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-require 'sidekiq/testing'
-
-describe "Sidekiq" do
-  before :each do
-    Sidekiq.logger.level = Logger::ERROR
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Sidekiq
-    Sidekiq::Queues["paperclip"].clear
-  end
-
-  let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/fixtures/12k.png")) }
-
-  describe "integration tests" do
-    include_examples "base usage"
-  end
-
-  describe "perform job" do
-    before :each do
-      DelayedPaperclip.options[:url_with_processing] = true
-      reset_dummy
-    end
-
-    it "performs a job" do
-      dummy.image = File.open("#{ROOT}/fixtures/12k.png")
-      Paperclip::Attachment.any_instance.expects(:reprocess!)
-      dummy.save!
-      DelayedPaperclip::Jobs::Sidekiq.new.perform(dummy.class.name, dummy.id, :image)
-    end
-
-    it "is deprecated" do
-      ActiveSupport::Deprecation.expects(:warn)
-
-      dummy.image = File.open("#{ROOT}/fixtures/12k.png")
-      Paperclip::Attachment.any_instance.expects(:reprocess!)
-      dummy.save!
-      DelayedPaperclip::Jobs::Sidekiq.new.perform(dummy.class.name, dummy.id, :image)
-    end
-  end
-
-  def process_jobs
-    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
-    end
-  end
-
-  def jobs_count(queue = "paperclip")
-    Sidekiq::Queues[queue].size
-  end
-end