mailhandler 1.0.36 → 1.0.37

data/lib/mailhandler/receiving/mail.rb

@@ -1,11 +1,8 @@
 module Mail
-
   class IMAP
-
     attr_accessor :imap_connection
 
-    def find_emails(options={}, &block)
-
+    def find_emails(options = {}, &block)
       options = validate_options(options)
       options[:read_only] ? imap_connection.examine(options[:mailbox]) : imap_connection.select(options[:mailbox])
       uids = imap_connection.uid_search(options[:keys])
@@ -13,12 +10,11 @@ module Mail
       uids.reverse! if options[:what].to_sym == :last
       uids = uids.first(options[:count]) if options[:count].is_a?(Integer)
       uids.reverse! if (options[:what].to_sym == :last && options[:order].to_sym == :asc) ||
-          (options[:what].to_sym != :last && options[:order].to_sym == :desc)
+                       (options[:what].to_sym != :last && options[:order].to_sym == :desc)
 
       if block_given?
 
         uids.each do |uid|
-
           uid = options[:uid].to_i unless options[:uid].nil?
           fetchdata = imap_connection.uid_fetch(uid, ['RFC822'])[0]
           new_message = Mail.new(fetchdata.attr['RFC822'])
@@ -30,9 +26,8 @@ module Mail
             yield new_message
           end
 
-          imap_connection.uid_store(uid, "+FLAGS", [Net::IMAP::DELETED]) if options[:delete_after_find] && new_message.is_marked_for_delete?
+          imap_connection.uid_store(uid, '+FLAGS', [Net::IMAP::DELETED]) if options[:delete_after_find] && new_message.is_marked_for_delete?
           break unless options[:uid].nil?
-
         end
 
         imap_connection.expunge if options[:delete_after_find]
@@ -42,25 +37,21 @@ module Mail
         emails = []
 
         uids.each do |uid|
-
           uid = options[:uid].to_i unless options[:uid].nil?
           fetchdata = imap_connection.uid_fetch(uid, ['RFC822'])[0]
           emails << Mail.new(fetchdata.attr['RFC822'])
-          imap_connection.uid_store(uid, "+FLAGS", [Net::IMAP::DELETED]) if options[:delete_after_find]
+          imap_connection.uid_store(uid, '+FLAGS', [Net::IMAP::DELETED]) if options[:delete_after_find]
           break unless options[:uid].nil?
-
         end
 
         imap_connection.expunge if options[:delete_after_find]
         emails.size == 1 && options[:count] == 1 ? emails.first : emails
 
       end
-
     end
 
     # Start an IMAP session
-    def connect(config=Mail::Configuration.instance)
-
+    def connect(_config = Mail::Configuration.instance)
       @imap_connection = Net::IMAP.new(settings[:address], settings[:port], settings[:enable_ssl], nil, false)
 
       if settings[:authentication].nil?
@@ -70,19 +61,14 @@ module Mail
         # (see also http://www.ensta.fr/~diam/ruby/online/ruby-doc-stdlib/libdoc/net/imap_connection/rdoc/classes/Net/IMAP.html#M000718)
         imap_connection.authenticate(settings[:authentication], settings[:user_name], settings[:password])
       end
-
     end
 
     def disconnect
-
       if defined?(imap_connection) && imap_connection && !imap_connection.disconnected?
 
         imap_connection.disconnect
 
       end
-
     end
-
   end
-
 end

data/lib/mailhandler/receiving/notification/console.rb

@@ -1,44 +1,28 @@
 module MailHandler
-
   module Receiving
-
     module Notification
-
       class Console
-
         def notify(search)
-
           output_delay Time.now - search.started_at
-
         end
 
         private
 
         module Seconds
-
           TO_SHOW = 10
-
         end
 
         # print to screen delay length
         def output_delay(delay)
-
           delay_seconds = delay.to_i
-          output(delay_seconds) if [0,1].include? (delay_seconds % Seconds::TO_SHOW)
-
+          output(delay_seconds) if [0, 1].include? (delay_seconds % Seconds::TO_SHOW)
         end
 
         # print to screen delay length
         def output(delay)
-
-          puts "  email delay: #{'%03d' % delay} seconds"
-
+          puts "  email delay: #{format('%03d', delay)} seconds"
         end
-
       end
-
     end
-
   end
-
 end

data/lib/mailhandler/receiving/notification/email.rb

@@ -3,22 +3,18 @@ require_relative 'email/states'
 require_relative '../../errors'
 
 module MailHandler
-
   module Receiving
-
     module Notification
-
       class Email
-
-        attr_reader   :sender,
+        attr_accessor :sender,
                       :from,
                       :contacts,
                       :min_time_to_notify,
-                      :max_time_to_notify,
-                      :current_state
+                      :max_time_to_notify
 
-        def initialize(sender, from, to, min_time_to_notify = 60)
+        attr_reader   :current_state
 
+        def initialize(sender, from, to, min_time_to_notify = 60)
           @min_time_to_notify = min_time_to_notify
 
           @sender = sender
@@ -26,29 +22,22 @@ module MailHandler
           @contacts = to
           init_state
           set_content_handler(EmailContent.new)
-
         end
 
         def notify(search)
-
           @max_time_to_notify = search.max_duration
           init_state if Time.now - search.started_at < min_time_to_notify
           @current_state.notify(search)
-
         end
 
         def set_state(state)
-
           @current_state = state
-
         end
 
         def send_email(type, search)
-
           verify_email_type(type)
           content = @content_handler.retrieve(type, search.options, Time.now - search.started_at, from, contacts)
           sender.send_email content
-
         end
 
         # Allow users to specify their own content classes.
@@ -57,30 +46,18 @@ module MailHandler
           @content_handler = content_handler
         end
 
-
         private
 
         def init_state
-
           @current_state = Notification::NoDelay.new(self)
-
         end
 
-        EMAIL_TYPES = [:delayed, :received]
+        EMAIL_TYPES = %i[delayed received].freeze
 
         def verify_email_type(type)
-
           raise MailHandler::TypeError, "Incorrect type: #{type}, allowed types: #{EMAIL_TYPES}." unless EMAIL_TYPES.include? type
-
         end
-
       end
-
     end
-
   end
-
 end
-
-
-

data/lib/mailhandler/receiving/notification/email/content.rb

@@ -1,52 +1,41 @@
 require 'mail'
 
 module MailHandler
-
   module Receiving
-
     module Notification
-
       class EmailContent
-
         # @param [Symbol] type - notification type
         # @param [Hash] options - search options used for searching for an email
         # @param [Int] delay - delay in seconds
         # @param [String] from - email address
         # @param [String] to - email address
         def retrieve(type, options, delay, from, to)
-
           mail = Mail.new
           mail.from = from
           mail.to = to
-          delay = (delay.to_f/60).round(2)
+          delay = (delay.to_f / 60).round(2)
 
           case type
 
-            when :received
+          when :received
 
-              mail.subject = "Received - delay was #{delay} minutes"
-              mail.body = "Received - delay was #{delay} minutes - search by #{options}"
+            mail.subject = "Received - delay was #{delay} minutes"
+            mail.body = "Received - delay was #{delay} minutes - search by #{options}"
 
-            when :delayed
+          when :delayed
 
-              mail.subject = "Over #{delay} minutes delay"
-              mail.body = "Over #{delay} minutes delay - search by #{options}"
+            mail.subject = "Over #{delay} minutes delay"
+            mail.body = "Over #{delay} minutes delay - search by #{options}"
 
-            else
+          else
 
-              raise StandardError, "Incorrect type: #{type}"
+            raise StandardError, "Incorrect type: #{type}"
 
           end
 
           mail
-
         end
-
-
       end
-
     end
-
   end
-
 end

data/lib/mailhandler/receiving/notification/email/states.rb

@@ -2,68 +2,49 @@ require_relative '../email'
 require_relative '../../../errors'
 
 module MailHandler
-
   module Receiving
-
     module Notification
-
       class DelayState
-
         attr_accessor :context,
                       :notified
 
         def initialize(context)
-
           @context = context
-
         end
 
         def notification_fired
-
           @notified = true
-
         end
 
-        def notify(search)
-
+        def notify(_search)
           raise MailHandler::InterfaceError, 'notify(search) interface has to be implemented.'
-
         end
 
         protected
 
         def send_notification_email(type, search)
-
           unless notified
 
             context.send_email(type, search)
             notification_fired
 
           end
-
         end
-
       end
 
       class NoDelay < DelayState
-
         def notify(search)
-
           if Time.now - search.started_at >= context.min_time_to_notify
 
             context.set_state(Delay.new(context))
             context.notify(search)
 
           end
-
         end
-
       end
 
       class Delay < DelayState
-
         def notify(search)
-
           if search.result
 
             context.set_state(Received.new(context))
@@ -79,36 +60,20 @@ module MailHandler
             send_notification_email(:delayed, search)
 
           end
-
         end
-
       end
 
       class MaxDelay < DelayState
-
         def notify(search)
-
           send_notification_email(:delayed, search)
-
         end
-
       end
 
       class Received < DelayState
-
         def notify(search)
-
           send_notification_email(:received, search)
-
         end
-
       end
-
     end
-
   end
-
 end
-
-
-

data/lib/mailhandler/receiving/observer.rb

@@ -1,37 +1,26 @@
 module MailHandler
-
   module Receiving
-
     module Observer
-
       def init_observer
+        @observers = []
+      end
 
-        @observers = Array.new
-
+      def get_observers()
+        @observers
       end
 
       def add_observer(observer)
-
-        @observers ||= Array.new
+        @observers ||= []
         @observers << observer
-
       end
 
       def delete_observer(observer)
-
         @observers.delete(observer) if @observers
-
       end
 
       def notify_observers(search)
-
         @observers.each { |observer| observer.notify(search) } if @observers
-
       end
-
     end
-
   end
-
 end
-

data/lib/mailhandler/sender.rb

@@ -4,9 +4,7 @@ require_relative 'sending/api_batch'
 
 # Class for sending email, and storing details about the sending.
 module MailHandler
-
   class Sender
-
     attr_accessor :dispatcher,
                   :sending
 
@@ -15,44 +13,34 @@ module MailHandler
     # @param [int] - how long sending lasted, seconds
     # @param [Object] - sending response message
     # @param [Mail] - email/emails sent
-    Sending = Struct.new( :started_at, :finished_at, :duration, :response, :email)
+    Sending = Struct.new(:started_at, :finished_at, :duration, :response, :email)
 
     # @param [Sending::Oblect] dispatcher - sender type used for sending email
     def initialize(dispatcher)
-
       @dispatcher = dispatcher
       @sending = Sending.new
-
     end
 
     def send_email(email)
-
       init_sending_details(email)
       response = dispatcher.send(email)
       update_sending_details(response)
 
       response
-
     end
 
     private
 
     def init_sending_details(email)
-
       @sending = Sending.new
       @sending.started_at = Time.now
       @sending.email = email
-
     end
 
     def update_sending_details(response)
-
       @sending.finished_at = Time.now
       @sending.duration = @sending.finished_at - @sending.started_at
       @sending.response = response
-
     end
-
   end
-
-end
+end