mailhandler 1.0.52 → 1.0.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7a197abe40976a389b5ff18bec02184905627083f5e4c75f1822c5040845e29
-  data.tar.gz: cf09e5646d042c4ff3837827db41b08c0905f8d3563143258b381bfa1121ad36
+  metadata.gz: eb1c79224a2d06818e5fe0d17efb43582e3bc4493e0a96059ade1ce0a040210d
+  data.tar.gz: 65a3032f84a5f0485b8d9e59768d3641d74ffeb32731d06854e18828fb975211
 SHA512:
-  metadata.gz: 47dc5ceb61e9f9239c98e4cacca9e840dfd0e659455ce5cee7e6a17f85f5a5f40e33d0b2da9428d32c456b77bd015fc9f12b4dac419c540dfc8f8281283b85f9
-  data.tar.gz: 3edc28dced7fe3dbba39964c157120fb1600a9c1662534beef6c98ebec54a1ccddd4f7ac08d2dd994f201e3214293ca86bbb74dffdc066aa7cbc13d145e77ea0
+  metadata.gz: b95a623ebf0d6c1d06f2f8de30ff4f8123ae0cb9d5bde77d2b61f088af958154bf1c7626db84137cd5ded7e3734b79ad0fda345cec2f88e8784583c9aeb8706d
+  data.tar.gz: 33e8d8113c5bdc964564a034c9113a98ad571acc1fd824448a6b6def2363c82b8e72dc98bcd15042ae0656cf27d84cedd698d0d61541688dd80ff4b4ad44ea22

data/lib/mailhandler.rb

@@ -34,12 +34,7 @@ module MailHandler
   #
   def sender(type = :postmark_api, settings = {})
     handler = Handler.new
-    handler.init_sender(type)
-
-    settings.each do |setting_name, setting_value|
-      handler.sender.dispatcher.instance_variable_set("@#{setting_name}", setting_value)
-    end
-
+    handler.init_sender(type, settings)
     yield(handler.sender.dispatcher) if block_given?
 
     handler.sender
@@ -72,12 +67,7 @@ module MailHandler
   #
   def receiver(type = :folder, settings = {})
     handler = Handler.new
-    handler.init_receiver(type, settings[:notifications])
-
-    settings.each do |setting_name, setting_value|
-      handler.receiver.checker.instance_variable_set("@#{setting_name}", setting_value)
-    end
-
+    handler.init_receiver(type, settings)
     yield(handler.receiver.checker) if block_given?
     handler.receiver
   end
@@ -96,16 +86,30 @@ module MailHandler
     attr_accessor :sender,
                   :receiver
 
-    def init_sender(type = :postmark_api)
+    def init_sender(type = :postmark_api, settings = {})
       verify_type(type, SENDER_TYPES)
       @sender = MailHandler::Sender.new(SENDER_TYPES[type].new)
+
+      settings.each do |setting_name, setting_value|
+        if @sender.dispatcher.respond_to?(setting_name)
+          @sender.dispatcher.instance_variable_set("@#{setting_name}", setting_value)
+        end
+      end
+
+      @sender
     end
 
-    def init_receiver(type = :folder, notifications = [])
+    def init_receiver(type = :folder, settings = {})
       verify_type(type, CHECKER_TYPES)
       receiver = MailHandler::Receiver.new(CHECKER_TYPES[type].new)
 
-      add_receiving_notifications(receiver, notifications)
+      settings.each do |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])
       @receiver = receiver
     end
 

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/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/receiving/base.rb

@@ -90,7 +90,7 @@ module MailHandler
 
         count = options[:count]
         error_message = "Incorrect option options[:count]=#{options[:count]}."
-        raise MailHandler::Error, error_message if (count <0) || (count > 2000)
+        raise MailHandler::Error, error_message if (count < 0) || (count > 2000)
       end
 
       def validate_used_options(options)

data/lib/mailhandler/sender.rb

@@ -3,12 +3,14 @@
 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.
   class Sender
     attr_accessor :dispatcher,
-                  :sending
+                  :sending,
+                  :validate_response
 
     # @param [Time] - sending started at Time
     # @param [Time] - sending finished at Time
@@ -21,13 +23,14 @@ module MailHandler
     def initialize(dispatcher)
       @dispatcher = dispatcher
       @sending = Sending.new
+      @validate_response = false
     end
 
     def send_email(email)
       init_sending_details(email)
       response = dispatcher.send(email)
       update_sending_details(response)
-
+      check_response(response)
       response
     end
 
@@ -37,6 +40,13 @@ module MailHandler
 
     private
 
+    def check_response(response)
+      return unless validate_response
+      return if dispatcher.valid_response?(response)
+
+      raise SendEmailError, "Invalid sending response: #{response}."
+    end
+
     def init_sending_details(email)
       @sending = Sending.new
       @sending.started_at = Time.now

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,11 +46,30 @@ module MailHandler
                                            host: host, secure: @use_ssl)
       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,11 +14,20 @@ 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)
+        responses.map { |response| super(response) }.all?(true)
       end
 
       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/base.rb

@@ -13,6 +13,10 @@ module MailHandler
         raise MailHandler::InterfaceError, 'Send interface not implemented.'
       end
 
+      def valid_response?(_response)
+        raise MailHandler::InterfaceError, 'Method not implemented.'
+      end
+
       protected
 
       def verify_email(email)

data/lib/mailhandler/sending/smtp.rb

@@ -12,7 +12,8 @@ module MailHandler
                     :username,
                     :password,
                     :authentication,
-                    :use_ssl
+                    :use_ssl,
+                    :openssl_verify_mode
 
       attr_accessor :open_timeout,
                     :read_timeout,
@@ -42,6 +43,15 @@ module MailHandler
         save_response ? response : nil
       end
 
+      def valid_response?(response)
+        response.string.to_s.downcase.include?('250 2.0.0 ok')
+      end
+
+      def timeout=(value)
+        @read_timeout = value
+        @open_timeout = value
+      end
+
       private
 
       def init_net_smtp
@@ -66,6 +76,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.52'
+  VERSION = '1.0.57'
 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.52
+  version: 1.0.57
 platform: ruby
 authors:
 - Igor Balos
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -114,8 +114,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: []