Expose delay as sidekiq_delay also, fixes #1393

Changes.md

@@ -1,6 +1,10 @@
 2.17.1
 -----------
 
+- Expose `delay` extension as `sidekiq_delay` also.  This allows you to
+  run Delayed::Job and Sidekiq in the same process, selectively porting
+  `delay` calls to `sidekiq_delay`.  You just need to ensure that
+  Sidekiq is required **before** Delayed::Job in your Gemfile. [#1393]
 - Bump redis client required version to 3.0.6
 - Minor CSS fixes for Web UI
 

lib/sidekiq/extensions/action_mailer.rb

@@ -22,15 +22,18 @@ module Sidekiq
     end
 
     module ActionMailer
-      def delay(options={})
+      def sidekiq_delay(options={})
         Proxy.new(DelayedMailer, self, options)
       end
-      def delay_for(interval, options={})
+      def sidekiq_delay_for(interval, options={})
         Proxy.new(DelayedMailer, self, options.merge('at' => Time.now.to_f + interval.to_f))
       end
-      def delay_until(timestamp, options={})
+      def sidekiq_delay_until(timestamp, options={})
         Proxy.new(DelayedMailer, self, options.merge('at' => timestamp.to_f))
       end
+      alias_method :delay, :sidekiq_delay
+      alias_method :delay_for, :sidekiq_delay_for
+      alias_method :delay_until, :sidekiq_delay_until
     end
 
   end

lib/sidekiq/extensions/active_record.rb

@@ -21,15 +21,18 @@ module Sidekiq
     end
 
     module ActiveRecord
-      def delay(options={})
+      def sidekiq_delay(options={})
         Proxy.new(DelayedModel, self, options)
       end
-      def delay_for(interval, options={})
+      def sidekiq_delay_for(interval, options={})
         Proxy.new(DelayedModel, self, options.merge('at' => Time.now.to_f + interval.to_f))
       end
-      def delay_until(timestamp, options={})
+      def sidekiq_delay_until(timestamp, options={})
         Proxy.new(DelayedModel, self, options.merge('at' => timestamp.to_f))
       end
+      alias_method :delay, :sidekiq_delay
+      alias_method :delay_for, :sidekiq_delay_for
+      alias_method :delay_until, :sidekiq_delay_until
     end
 
   end

lib/sidekiq/extensions/class_methods.rb

@@ -19,15 +19,18 @@ module Sidekiq
     end
 
     module Klass
-      def delay(options={})
+      def sidekiq_delay(options={})
         Proxy.new(DelayedClass, self, options)
       end
-      def delay_for(interval, options={})
+      def sidekiq_delay_for(interval, options={})
         Proxy.new(DelayedClass, self, options.merge('at' => Time.now.to_f + interval.to_f))
       end
-      def delay_until(timestamp, options={})
+      def sidekiq_delay_until(timestamp, options={})
         Proxy.new(DelayedClass, self, options.merge('at' => timestamp.to_f))
       end
+      alias_method :delay, :sidekiq_delay
+      alias_method :delay_for, :sidekiq_delay_for
+      alias_method :delay_until, :sidekiq_delay_until
     end
 
   end