mailhandler 1.0.57 → 1.0.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb1c79224a2d06818e5fe0d17efb43582e3bc4493e0a96059ade1ce0a040210d
-  data.tar.gz: 65a3032f84a5f0485b8d9e59768d3641d74ffeb32731d06854e18828fb975211
+  metadata.gz: 922df060ca41561a56d889b8a68c1f772d49ac30667c8c98a1df11caddb96cfa
+  data.tar.gz: 8e2b840dbe67e91dd5db768ea6dfe77365d4ecacee1957818ad186f8d936588d
 SHA512:
-  metadata.gz: b95a623ebf0d6c1d06f2f8de30ff4f8123ae0cb9d5bde77d2b61f088af958154bf1c7626db84137cd5ded7e3734b79ad0fda345cec2f88e8784583c9aeb8706d
-  data.tar.gz: 33e8d8113c5bdc964564a034c9113a98ad571acc1fd824448a6b6def2363c82b8e72dc98bcd15042ae0656cf27d84cedd698d0d61541688dd80ff4b4ad44ea22
+  metadata.gz: 263a717a84589e47f673f92209002b8bf3c9f5affc8ac103d36e44e77bfa2000626e9c73b2d4669b0c21a3f568cdc20f186a05f380a97526e4db19f5927dd0a7
+  data.tar.gz: a86f93fecdfd7985ddb393dc42a132ad14b0ed8fe738d0eb9ec3c5abdd0e6e89e224a87b3beec57acc7616c9656a46c895dce10d0807c951646c5064540e134b

data/lib/mailhandler/extensions/mail/smtp.rb

@@ -0,0 +1,22 @@
+module Mail
+  # wrapper methods to support sending raw email, where recipient and sender can be custom
+  class SMTP
+    def deliver_raw!(raw_source_email, smtp_from, smtp_to)
+      response = start_smtp_session do |smtp|
+        Mail::SMTPConnection.new(:connection => smtp, :return_response => true).
+          deliver_raw!(raw_source_email, smtp_from, smtp_to)
+      end
+
+      settings[:return_response] ? response : self
+    end
+  end
+
+  # wrapper methods to support sending raw email, where recipient and sender can be custom
+  class SMTPConnection
+    def deliver_raw!(raw_source_email, smtp_from, smtp_to)
+      response = smtp.sendmail(dot_stuff(raw_source_email), smtp_from, smtp_to)
+
+      settings[:return_response] ? response : self
+    end
+  end
+end

data/lib/mailhandler/sending/smtp.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'base'
+require_relative "../extensions/mail/smtp"
 
 module MailHandler
   module Sending
@@ -36,10 +37,8 @@ module MailHandler
       end
 
       def send_raw_email(text_email, smtp_from, smtp_to)
-        response = init_net_smtp.start(domain, username, password, authentication) do |smtp|
-          smtp.send_message(text_email, smtp_from, smtp_to)
-        end
-
+        # use same settings as when sending mail created with Mail gem
+        response = Mail::SMTP.new(delivery_options).deliver_raw!(text_email, smtp_from, smtp_to)
         save_response ? response : nil
       end
 
@@ -54,14 +53,6 @@ module MailHandler
 
       private
 
-      def init_net_smtp
-        sending = Net::SMTP.new(address, port)
-        sending.read_timeout = read_timeout
-        sending.open_timeout = open_timeout
-        sending.enable_starttls_auto if use_ssl
-        sending
-      end
-
       def configure_sending(email)
         email.delivery_method :smtp, delivery_options
         email

data/lib/mailhandler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MailHandler
-  VERSION = '1.0.57'
+  VERSION = '1.0.59'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailhandler
 version: !ruby/object:Gem::Version
-  version: 1.0.57
+  version: 1.0.59
 platform: ruby
 authors:
 - Igor Balos
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -56,6 +56,7 @@ files:
 - lib/mailhandler.rb
 - lib/mailhandler/errors.rb
 - lib/mailhandler/extensions/mail/imap.rb
+- lib/mailhandler/extensions/mail/smtp.rb
 - lib/mailhandler/receiver.rb
 - lib/mailhandler/receiving/base.rb
 - lib/mailhandler/receiving/filelist/base.rb