lib/backgrounder/support/backends.rb in carrierwave_backgrounder-0.2.1 vs lib/backgrounder/support/backends.rb in carrierwave_backgrounder-0.2.2

@@ -1,73 +1,84 @@
-module Support
-  module Backends
+module CarrierWave
+  module Backgrounder
+    module Support
+      module Backends
 
-    def self.included(base)
-      base.extend ClassMethods
-    end
+        def self.included(base)
+          base.extend ClassMethods
+        end
 
-    module ClassMethods
-      attr_reader :queue_options
+        module ClassMethods
+          attr_reader :queue_options
 
-      def backend(queue_name=nil, args={})
-        return @backend if @backend
-        @queue_options = args
-        @backend = queue_name
-      end
+          def backend(queue_name=nil, args={})
+            return @backend if @backend
+            @queue_options = args
+            @backend = queue_name
+          end
 
-      def enqueue_for_backend(worker, class_name, subject_id, mounted_as)
-        self.send :"enqueue_#{backend}", worker, class_name, subject_id, mounted_as
-      end
+          def enqueue_for_backend(worker, class_name, subject_id, mounted_as)
+            self.send :"enqueue_#{backend}", worker, class_name, subject_id, mounted_as
+          end
 
-      private
+          private
 
-      def enqueue_delayed_job(worker, *args)
-        ::Delayed::Job.enqueue worker.new(*args), :queue => queue_options[:queue]
-      end
+          def enqueue_delayed_job(worker, *args)
+            if ::Delayed::Job.new.respond_to?(:queue)
+              ::Delayed::Job.enqueue worker.new(*args), :queue => queue_options[:queue]
+            else
+              ::Delayed::Job.enqueue worker.new(*args)
+              if queue_options[:queue]
+                ::Rails.logger.warn("Queue name given but no queue column exists for Delayed::Job")
+              end
+            end
+          end
 
-      def enqueue_resque(worker, *args)
-        worker.instance_variable_set('@queue', queue_options[:queue] || :carrierwave)
-        ::Resque.enqueue worker, *args
-      end
+          def enqueue_resque(worker, *args)
+            worker.instance_variable_set('@queue', queue_options[:queue] || :carrierwave)
+            ::Resque.enqueue worker, *args
+          end
 
-      def enqueue_sidekiq(worker, *args)
-        args = sidekiq_queue_options('class' => worker, 'args' => args)
-        worker.client_push(args)
-      end
+          def enqueue_sidekiq(worker, *args)
+            args = sidekiq_queue_options('class' => worker, 'args' => args)
+            worker.client_push(args)
+          end
 
-      def enqueue_girl_friday(worker, *args)
-        @girl_friday_queue ||= GirlFriday::WorkQueue.new(queue_options.delete(:queue) || :carrierwave, queue_options) do |msg|
-          worker = msg[:worker]
-          worker.perform
-        end
-        @girl_friday_queue << { :worker => worker.new(*args) }
-      end
+          def enqueue_girl_friday(worker, *args)
+            @girl_friday_queue ||= GirlFriday::WorkQueue.new(queue_options.delete(:queue) || :carrierwave, queue_options) do |msg|
+              worker = msg[:worker]
+              worker.perform
+            end
+            @girl_friday_queue << { :worker => worker.new(*args) }
+          end
 
-      def enqueue_sucker_punch(worker, *args)
-        @sucker_punch_queue ||= SuckerPunch::Queue[queue_options[:queue] || :carrierwave]
-        @sucker_punch_queue.async.perform(*args)
-      end
+          def enqueue_sucker_punch(worker, *args)
+            @sucker_punch_queue ||= SuckerPunch::Queue[queue_options[:queue] || :carrierwave]
+            @sucker_punch_queue.async.perform(*args)
+          end
 
-      def enqueue_qu(worker, *args)
-        worker.instance_variable_set('@queue', queue_options[:queue] || :carrierwave)
-        ::Qu.enqueue worker, *args
-      end
+          def enqueue_qu(worker, *args)
+            worker.instance_variable_set('@queue', queue_options[:queue] || :carrierwave)
+            ::Qu.enqueue worker, *args
+          end
 
-      def enqueue_qc(worker, *args)
-        class_name, subject_id, mounted_as = args
-        ::QC.enqueue "#{worker.name}.perform", class_name, subject_id, mounted_as.to_s
-      end
+          def enqueue_qc(worker, *args)
+            class_name, subject_id, mounted_as = args
+            ::QC.enqueue "#{worker.name}.perform", class_name, subject_id, mounted_as.to_s
+          end
 
-      def enqueue_immediate(worker, *args)
-        worker.new(*args).perform
-      end
+          def enqueue_immediate(worker, *args)
+            worker.new(*args).perform
+          end
 
-      def sidekiq_queue_options(args)
-        args['queue'] = queue_options[:queue] if queue_options[:queue]
-        args['retry'] = queue_options[:retry] unless queue_options[:retry].nil?
-        args['timeout'] = queue_options[:timeout] if queue_options[:timeout]
-        args['backtrace'] = queue_options[:backtrace] if queue_options[:backtrace]
-        args
+          def sidekiq_queue_options(args)
+            args['queue'] = queue_options[:queue] if queue_options[:queue]
+            args['retry'] = queue_options[:retry] unless queue_options[:retry].nil?
+            args['timeout'] = queue_options[:timeout] if queue_options[:timeout]
+            args['backtrace'] = queue_options[:backtrace] if queue_options[:backtrace]
+            args
+          end
+        end
       end
     end
   end
 end