maedana-ar_mailer 2.1.5 → 2.1.5.1

data/lib/action_mailer/ar_mailer.rb

@@ -1,3 +1,5 @@
+require 'smtp_tls' unless Net::SMTP.instance_methods.include?("enable_starttls_auto")
+
 ##
 # Adds sending email through an ActiveRecord table as a delivery method for
 # ActionMailer.
@@ -28,11 +30,37 @@ class ActionMailer::Base
     end
   end
 
+  def perform_delivery_smtp(mail)
+    destinations = mail.destinations
+    mail.ready_to_send
+    sender = (mail['return-path'] && mail['return-path'].spec) || mail['from']
+
+    settings = [
+      smtp_settings[:domain],
+      (smtp_settings[:user] || smtp_settings[:user_name]),
+      smtp_settings[:password],
+      smtp_settings[:authentication]
+    ]
+
+    smtp = Net::SMTP.new(smtp_settings[:address], smtp_settings[:port])
+    if smtp.respond_to?(:enable_starttls_auto)
+      smtp.enable_starttls_auto unless smtp_settings[:tls] == false
+    else
+      settings << smtp_settings[:tls]
+    end
+
+    smtp.start(*settings) do |smtp|
+      smtp.sendmail(mail.encoded, sender, destinations)
+    end
+  end
+
   def perform_delivery_smtp_failover_activerecord(mail)
     perform_delivery_smtp mail
   rescue Exception => e
     perform_delivery_activerecord mail
-    raise e
+    logger.error e
+    e.backtrace.each { |line| logger.error line}
+    after_failed_delivery_smtp_mail(e) if defined? self.after_failed_delivery_smtp_mail
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maedana-ar_mailer
 version: !ruby/object:Gem::Version 
-  version: 2.1.5
+  version: 2.1.5.1
 platform: ruby
 authors: 
 - Eric Hodel