mailhandler 1.0.53 → 1.0.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ada1ede9480ecca3ccdd3e20a3cde4a572862fc4c92df3085d0e7ad3b4ee706b
-  data.tar.gz: b5766d76b779a52c8f17ffe16af6aa85339079fa5ec2c62987436b7f3f78ff33
+  metadata.gz: 922df060ca41561a56d889b8a68c1f772d49ac30667c8c98a1df11caddb96cfa
+  data.tar.gz: 8e2b840dbe67e91dd5db768ea6dfe77365d4ecacee1957818ad186f8d936588d
 SHA512:
-  metadata.gz: ccf98235acb4d8e5006eeefc75bf79e0e503dca6ce642a7375ab65c343b61f78b8969f4a03c92dc44e8d0fdb3eed4ef081e5765f51c33cb6263e205d08e8d2b2
-  data.tar.gz: 0e094b8e7a768a5c9696ff27d32d8d0a8fce5737da69708909c2724059d1d6eecdf9e5e1b6b9b84f4026ea30d1834515fa9208d4aac4cdca913cb5377a80b33a
+  metadata.gz: 263a717a84589e47f673f92209002b8bf3c9f5affc8ac103d36e44e77bfa2000626e9c73b2d4669b0c21a3f568cdc20f186a05f380a97526e4db19f5927dd0a7
+  data.tar.gz: a86f93fecdfd7985ddb393dc42a132ad14b0ed8fe738d0eb9ec3c5abdd0e6e89e224a87b3beec57acc7616c9656a46c895dce10d0807c951646c5064540e134b

data/lib/mailhandler.rb

@@ -91,7 +91,9 @@ module MailHandler
       @sender = MailHandler::Sender.new(SENDER_TYPES[type].new)
 
       settings.each do |setting_name, setting_value|
-        @sender.dispatcher.instance_variable_set("@#{setting_name}", setting_value)
+        if @sender.dispatcher.respond_to?(setting_name)
+          @sender.dispatcher.instance_variable_set("@#{setting_name}", setting_value)
+        end
       end
 
       @sender
@@ -102,7 +104,9 @@ module MailHandler
       receiver = MailHandler::Receiver.new(CHECKER_TYPES[type].new)
 
       settings.each do |setting_name, setting_value|
-        receiver.checker.instance_variable_set("@#{setting_name}", setting_value)
+        if receiver.checker.respond_to?(setting_name)
+          receiver.checker.instance_variable_set("@#{setting_name}", setting_value)
+        end
       end
 
       add_receiving_notifications(receiver, settings[:notifications])

data/lib/mailhandler/errors.rb

@@ -8,6 +8,8 @@ module MailHandler
     end
   end
 
+  class SearchEmailError    < Error; end
+  class SendEmailError      < Error; end
   class UnknownError        < Error; end
   class TypeError           < Error; end
   class FileError           < Error; end

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/receiver.rb

@@ -4,6 +4,7 @@ require_relative 'receiving/folder'
 require_relative 'receiving/imap'
 require_relative 'extensions/mail/imap'
 require_relative 'receiving/observer'
+require_relative 'errors'
 
 module MailHandler
   # handling receiving email
@@ -13,7 +14,8 @@ module MailHandler
     attr_accessor :checker,
                   :search,
                   :max_search_duration,
-                  :search_frequency
+                  :search_frequency,
+                  :validate_result
 
     module DEFAULTS
       MAX_SEARCH_DURATION = 240 # maximum time for search to last in [seconds]
@@ -36,6 +38,7 @@ module MailHandler
       @checker = checker
       @max_search_duration = DEFAULTS::MAX_SEARCH_DURATION
       @search_frequency = DEFAULTS::SEARCH_FREQUENCY
+      @validate_result = false
     end
 
     def find_email(options)
@@ -52,10 +55,18 @@ module MailHandler
       checker.search_result
     ensure
       checker.stop
+      check_result
     end
 
     private
 
+    def check_result
+      return unless validate_result
+      return if checker.search_result
+
+      raise SearchEmailError, "Email searched by #{@search.options} not found for #{@search.max_duration} seconds."
+    end
+
     def single_search(options)
       received = checker.find(options)
       update_search_details

data/lib/mailhandler/sender.rb

@@ -3,6 +3,7 @@
 require_relative 'sending/smtp'
 require_relative 'sending/api'
 require_relative 'sending/api_batch'
+require_relative 'errors'
 
 module MailHandler
   # Class for sending email, and storing details about the sending.
@@ -43,7 +44,7 @@ module MailHandler
       return unless validate_response
       return if dispatcher.valid_response?(response)
 
-      raise "Invalid sending response: #{response}"
+      raise SendEmailError, "Invalid sending response: #{response}."
     end
 
     def init_sending_details(email)

data/lib/mailhandler/sending/api.rb

@@ -27,7 +27,8 @@ module MailHandler
       def send(email)
         verify_email(email)
         init_client
-        client.deliver_message(email)
+        response = client.deliver_message(email)
+        format_response(response)
       end
 
       def client
@@ -45,23 +46,30 @@ module MailHandler
                                            host: host, secure: @use_ssl)
       end
 
-      def formatted_response(response)
-        return if response.keys.select { |key| key.is_a? Symbol }.empty?
-        return unless response.is_a? Hash
-
-        response.keys.select { |key| key.is_a? String }.each { |s| response.delete(s) }
-        response
-      end
-
       def valid_response?(response)
         response[:message].to_s.strip.downcase == 'ok' && response[:error_code].to_s.downcase == '0'
       end
 
+      def timeout=(value)
+        @http_open_timeout = value
+        @http_read_timeout = value
+      end
+
       DEFAULTS = {
         host: 'api.postmarkapp.com',
-        read_timeout: 15,
-        open_timeout: 15
+        read_timeout: 60,
+        open_timeout: 60
       }.freeze
+
+      protected
+
+      def format_response(response)
+        return response unless response.is_a? Hash
+        return response if response.keys.select { |key| key.is_a? Symbol }.empty?
+
+        response.keys.select { |key| key.is_a? String }.each { |s| response.delete(s) }
+        response
+      end
     end
   end
 end

data/lib/mailhandler/sending/api_batch.rb

@@ -14,7 +14,8 @@ module MailHandler
       def send(emails)
         verify_email(emails)
         init_client
-        client.deliver_messages(emails)
+        response = client.deliver_messages(emails)
+        format_response(response)
       end
 
       def valid_response?(responses)
@@ -23,6 +24,10 @@ module MailHandler
 
       protected
 
+      def format_response(response)
+        response.map { |r| super(r) }
+      end
+
       def verify_email(emails)
         return if emails.is_a?(Array) && emails.all? { |e| e.is_a? allowed_email_type }
 

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
@@ -12,7 +13,8 @@ module MailHandler
                     :username,
                     :password,
                     :authentication,
-                    :use_ssl
+                    :use_ssl,
+                    :openssl_verify_mode
 
       attr_accessor :open_timeout,
                     :read_timeout,
@@ -35,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
 
@@ -46,16 +46,13 @@ module MailHandler
         response.string.to_s.downcase.include?('250 2.0.0 ok')
       end
 
-      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
+      def timeout=(value)
+        @read_timeout = value
+        @open_timeout = value
       end
 
+      private
+
       def configure_sending(email)
         email.delivery_method :smtp, delivery_options
         email
@@ -70,6 +67,7 @@ module MailHandler
           password: password,
           authentication: @authentication,
           enable_starttls_auto: @use_ssl,
+          openssl_verify_mode: @openssl_verify_mode,
 
           return_response: save_response,
           open_timeout: open_timeout,

data/lib/mailhandler/version.rb

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

data/spec/unit/mailhandler/receiver_spec.rb

@@ -59,6 +59,34 @@ describe MailHandler::Receiver do
       end
     end
 
+    describe '.search not found' do
+      let(:checker) do
+        checker = instance_double('Checker')
+
+        allow(checker).to receive(:find).and_return(false)
+        allow(checker).to receive(:search_result).and_return(false)
+        allow(checker).to receive(:found_emails).and_return([])
+        allow(checker).to receive(:reset_found_emails).and_return([])
+        allow(checker).to receive(:start).and_return(nil)
+        allow(checker).to receive(:stop).and_return(nil)
+        checker
+      end
+
+      it "raise error" do
+        receiver.max_search_duration = 3
+        receiver.validate_result=true
+        expect { receiver.find_email(default_search_option) }.
+            to raise_error(MailHandler::SearchEmailError,
+                           "Email searched by {:by_subject=>\"test\"} not found for 3 seconds.")
+      end
+
+      it "do not raise error" do
+        receiver.max_search_duration = 3
+        receiver.validate_result=false
+        expect(receiver.find_email(default_search_option)).to be false
+      end
+    end
+
     describe '.search' do
       let(:checker) do
         checker = instance_double('Checker')
@@ -67,7 +95,7 @@ describe MailHandler::Receiver do
           sleep 1
           false
         end
-        allow(checker).to receive(:search_result).and_return(false)
+        allow(checker).to receive(:search_result).and_return(true)
         allow(checker).to receive(:found_emails).and_return([])
         allow(checker).to receive(:reset_found_emails).and_return([])
         allow(checker).to receive(:start).and_return(nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailhandler
 version: !ruby/object:Gem::Version
-  version: 1.0.53
+  version: 1.0.59
 platform: ruby
 authors:
 - Igor Balos
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-17 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
@@ -114,8 +115,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.9.3
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Postmark email receiving and sending handler.
 test_files: []