mailhandler 1.0.52 → 1.0.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7a197abe40976a389b5ff18bec02184905627083f5e4c75f1822c5040845e29
-  data.tar.gz: cf09e5646d042c4ff3837827db41b08c0905f8d3563143258b381bfa1121ad36
+  metadata.gz: ada1ede9480ecca3ccdd3e20a3cde4a572862fc4c92df3085d0e7ad3b4ee706b
+  data.tar.gz: b5766d76b779a52c8f17ffe16af6aa85339079fa5ec2c62987436b7f3f78ff33
 SHA512:
-  metadata.gz: 47dc5ceb61e9f9239c98e4cacca9e840dfd0e659455ce5cee7e6a17f85f5a5f40e33d0b2da9428d32c456b77bd015fc9f12b4dac419c540dfc8f8281283b85f9
-  data.tar.gz: 3edc28dced7fe3dbba39964c157120fb1600a9c1662534beef6c98ebec54a1ccddd4f7ac08d2dd994f201e3214293ca86bbb74dffdc066aa7cbc13d145e77ea0
+  metadata.gz: ccf98235acb4d8e5006eeefc75bf79e0e503dca6ce642a7375ab65c343b61f78b8969f4a03c92dc44e8d0fdb3eed4ef081e5765f51c33cb6263e205d08e8d2b2
+  data.tar.gz: 0e094b8e7a768a5c9696ff27d32d8d0a8fce5737da69708909c2724059d1d6eecdf9e5e1b6b9b84f4026ea30d1834515fa9208d4aac4cdca913cb5377a80b33a

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,26 @@ 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|
+        @sender.dispatcher.instance_variable_set("@#{setting_name}", setting_value)
+      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|
+        receiver.checker.instance_variable_set("@#{setting_name}", setting_value)
+      end
+
+      add_receiving_notifications(receiver, settings[:notifications])
       @receiver = receiver
     end
 

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

@@ -8,7 +8,8 @@ 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 +22,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 +39,13 @@ module MailHandler
 
     private
 
+    def check_response(response)
+      return unless validate_response
+      return if dispatcher.valid_response?(response)
+
+      raise "Invalid sending response: #{response}"
+    end
+
     def init_sending_details(email)
       @sending = Sending.new
       @sending.started_at = Time.now

data/lib/mailhandler/sending/api.rb

@@ -45,6 +45,18 @@ 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
+
       DEFAULTS = {
         host: 'api.postmarkapp.com',
         read_timeout: 15,

data/lib/mailhandler/sending/api_batch.rb

@@ -17,6 +17,10 @@ module MailHandler
         client.deliver_messages(emails)
       end
 
+      def valid_response?(responses)
+        responses.map { |response| super(response) }.all?(true)
+      end
+
       protected
 
       def verify_email(emails)

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

@@ -42,6 +42,10 @@ module MailHandler
         save_response ? response : nil
       end
 
+      def valid_response?(response)
+        response.string.to_s.downcase.include?('250 2.0.0 ok')
+      end
+
       private
 
       def init_net_smtp

data/lib/mailhandler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailhandler
 version: !ruby/object:Gem::Version
-  version: 1.0.52
+  version: 1.0.53
 platform: ruby
 authors:
 - Igor Balos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail