mailhandler 1.0.42 → 1.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99f1d39aad0dedeab9bdac5972470471bd199bb4b5fc1a99e6c4d518c6bdda4f
-  data.tar.gz: 9601b811111067f81d85fd139a9eb51c83a4741336f503d8356dde26cace3e57
+  metadata.gz: 7d42c93426c484996cc604a260820c1db617cf9d3e17d3441ac07038f31df9b0
+  data.tar.gz: afb801fe33b1b317aeb036ec0a9722fccd0a2524ec8ce58333659552ae947ad3
 SHA512:
-  metadata.gz: d11f02d93e90fa805968be45194277dfbd6e8584b043a953e383a5b5cc8406da0285271491c79c4d8ab6ddebabbdb78eba2fb4f6d55d3c13e0a3f37abb2be85a
-  data.tar.gz: 0bc30ecfdbbb5490be43e4c241a354a83206da0475173c8706b57a0526c3de7b1c9c9014083537f09b2c4297c32e18f9a213450aad19fa72996cea2ef7ba9147
+  metadata.gz: 32410e9dfca936b1638ed6f4eff71800ce41f50193d8926dd2d9c5c62620856231c337a05acc9ca0299e5fad8cb1d442d0aae2bd9bba93bb18544c1db1d93f26
+  data.tar.gz: 2f84617e07cf1ba803bb958c65b5ede2e46ded12bb8f514a219b0366bd8efb2f5051a1e38c324b31cb1b478014d45543f931fcc9abfc6432d0c1e7da8c0e64dd

data/lib/mailhandler/receiver.rb

@@ -2,8 +2,8 @@
 
 require_relative 'receiving/folder'
 require_relative 'receiving/imap'
+require_relative 'extensions/mail/imap'
 require_relative 'receiving/observer'
-require_relative 'receiving/mail.rb'
 
 module MailHandler
   # handling receiving email
@@ -44,6 +44,7 @@ module MailHandler
 
       until search_time_expired?
         break if single_search(options)
+
         sleep search_frequency
       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

@@ -31,6 +31,10 @@ module MailHandler
       response
     end
 
+    def dispatcher_client
+      dispatcher.client if dispatcher.respond_to?(:client)
+    end
+
     private
 
     def init_sending_details(email)

data/lib/mailhandler/sending/api.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'mail'
 require 'postmark'
 require_relative 'base.rb'
 
@@ -11,18 +10,19 @@ module MailHandler
       attr_accessor :host,
                     :api_token,
                     :use_ssl,
-                    :client,
                     :http_open_timeout,
-                    :http_read_timeout
+                    :http_read_timeout,
+                    :client
 
       def initialize(api_token = nil)
         @type = :postmark_api
-        @host = DEFAULT_HOST
+        @host = DEFAULTS[:host]
         @api_token = api_token
         @use_ssl = false
 
-        @http_open_timeout = 15
-        @http_read_timeout = 15
+        @http_open_timeout = DEFAULTS[:open_timeout]
+        @http_read_timeout = DEFAULTS[:read_timeout]
+        init_client
       end
 
       def send(email)
@@ -42,7 +42,11 @@ module MailHandler
                                            host: host, secure: @use_ssl)
       end
 
-      DEFAULT_HOST = 'api.postmarkapp.com'.freeze
+      DEFAULTS = {
+        host: 'api.postmarkapp.com',
+        read_timeout: 15,
+        open_timeout: 15
+      }.freeze
     end
   end
 end

data/lib/mailhandler/sending/base.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'mail'
 require_relative '../errors'
 
 module MailHandler

data/lib/mailhandler/sending/smtp.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'net/imap'
 require_relative 'base'
 
 module MailHandler
@@ -23,7 +22,7 @@ module MailHandler
         @type = :smtp
         @authentication = 'plain'
         @use_ssl = false
-        @save_response = false
+        @save_response = true
 
         @open_timeout = 60
         @read_timeout = 60
@@ -35,10 +34,31 @@ module MailHandler
         save_response ? email.deliver! : email.deliver
       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
+
+        save_response ? response : nil
+      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
+      end
+
       def configure_sending(email)
-        options = {
+        email.delivery_method :smtp, delivery_options
+        email
+      end
+
+      def delivery_options
+        {
           address: address,
           port: port,
           domain: domain,
@@ -51,9 +71,6 @@ module MailHandler
           open_timeout: open_timeout,
           read_timeout: read_timeout
         }
-
-        email.delivery_method :smtp, options
-        email
       end
     end
   end

data/lib/mailhandler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MailHandler
-  VERSION = '1.0.42'.freeze
+  VERSION = '1.0.51'
 end

data/spec/unit/mailhandler/sending/sender_smtp_spec.rb

@@ -28,7 +28,7 @@ describe MailHandler::Sending::SMTPSender do
     end
 
     it 'save response' do
-      expect(smtp_sender.new.save_response).to be false
+      expect(smtp_sender.new.save_response).to be true
     end
 
     it 'use ssl' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailhandler
 version: !ruby/object:Gem::Version
-  version: 1.0.42
+  version: 1.0.51
 platform: ruby
 authors:
 - Igor Balos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -55,6 +55,7 @@ files:
 - Rakefile
 - lib/mailhandler.rb
 - lib/mailhandler/errors.rb
+- lib/mailhandler/extensions/mail/imap.rb
 - lib/mailhandler/receiver.rb
 - lib/mailhandler/receiving/base.rb
 - lib/mailhandler/receiving/filelist/base.rb
@@ -62,7 +63,6 @@ files:
 - lib/mailhandler/receiving/filelist/filter/email.rb
 - lib/mailhandler/receiving/folder.rb
 - lib/mailhandler/receiving/imap.rb
-- lib/mailhandler/receiving/mail.rb
 - lib/mailhandler/receiving/notification/console.rb
 - lib/mailhandler/receiving/notification/email.rb
 - lib/mailhandler/receiving/notification/email/content.rb