lib/mailit/mailer.rb in mailit-2009.08 vs lib/mailit/mailer.rb in mailit-2010.06.03

@@ -36,11 +36,11 @@
   class Mailer
     OPTIONS = {
       :server    => 'smtp.localhost',
       :port      => 25,
       :domain    => 'localhost',
-      :username  => 'foo',
+      :username  => '',
       :password  => 'foo',
       :noop      => false,
       :auth_type => :login, # :plain, :login, :cram_md5
       :starttls  => false,  # only useful for EventMachine::SmtpClient
     }
@@ -59,14 +59,16 @@
       @options = OPTIONS.merge(options)
     end
 
     def send(mail, override = {})
       require 'net/smtp'
+      mailer = override[:mailer] || ::Net::SMTP
 
       server, port, domain, username, password, auth_type, noop =
         settings(override, :server, :port, :domain, :username, :password, :auth_type, :noop)
+      username = mail.from.to_s if username.empty?
 
-      ::Net::SMTP.start(server, port, domain, username, password, auth_type) do |smtp|
+      mailer.start(server, port, domain, username, password, auth_type) do |smtp|
         return if noop
         smtp.send_message(mail.to_s, mail.from, mail.to)
       end
     end