action_mailer.rb in sidekiq-2.5.3

- old
+ new

@@ -6,10 +6,11 @@
     # Adds 'delay' and 'delay_for' to ActionMailer to offload arbitrary email
     # delivery to Sidekiq.  Example:
     #
     #    UserMailer.delay.send_welcome_email(new_user)
     #    UserMailer.delay_for(5.days).send_welcome_email(new_user)
+    #    UserMailer.delay_until(5.days.from_now).send_welcome_email(new_user)
     class DelayedMailer
       include Sidekiq::Worker
       # I think it's reasonable to assume that emails should take less
       # than 30 seconds to send.
       sidekiq_options :timeout => 30
@@ -17,19 +18,22 @@
       def perform(yml)
         (target, method_name, args) = YAML.load(yml)
         msg = target.send(method_name, *args)
         # The email method can return nil, which causes ActionMailer to return
         # an undeliverable empty message.
-        msg.deliver if msg && msg.to && msg.from
+        msg.deliver if msg && (msg.to || msg.cc || msg.bcc) && msg.from
       end
     end
 
     module ActionMailer
       def delay(options={})
         Proxy.new(DelayedMailer, self, options)
       end
       def delay_for(interval, options={})
         Proxy.new(DelayedMailer, self, options.merge('at' => Time.now.to_f + interval.to_f))
+      end
+      def delay_until(timestamp, options={})
+        Proxy.new(DelayedMailer, self, options.merge('at' => timestamp.to_f))
       end
     end
 
   end
 end