mailhandler 1.0.25 → 1.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 923924f2168d404cb5fd28d97b77d19276e41fe7
-  data.tar.gz: 31843295da603ab56eccedafefac33fdc5584de6
+  metadata.gz: c2ddb338b7a52cc1426f32afaaaeab6db6c33b7d
+  data.tar.gz: e79fff22bcc348aa7ecd8c3c6027172f5926f265
 SHA512:
-  metadata.gz: 79e0f23fd3d186e623909cea7e601c1975ccfa157eb5833bc87106dae474b52ac0fd4c9fcce76ceb113df0158585e47fbff2f977261c629fbba9b2dbd24ca3fe
-  data.tar.gz: 47ccdcadd144b7b4b68d2e3c5e400c2ff1acec00760e1fb713003a68234290c2d9cf3d45a4859f476c66c79bd62546ce809e8cdbfc1e5d1d941654e48598d736
+  metadata.gz: 40bfafd947ed23c6562519d1427da8c491097a7d7eeeb2b48c9cdf04c8d169d14d146d509530b264c65b982eb53f3d7fc81f479028c781361f928e834a748d26
+  data.tar.gz: a2dde2cb11e392fb60d5947671dc390f67094535154e0fe3eb8174925be7663c60f401d62f4c88b0a431fd8d25c90db8e255c6b9931ddbf7ff95c6a404a0e9b3

data/lib/mailhandler/receiving/mail.rb

@@ -10,58 +10,50 @@ module Mail
       options[:read_only] ? imap.examine(options[:mailbox]) : imap.select(options[:mailbox])
       uids = imap.uid_search(options[:keys])
 
-      if uids.nil? || uids.empty?
+      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)
 
-        []
+      if block_given?
 
-      else
-
-        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)
-
-        if block_given?
-
-          uids.each do |uid|
-
-            uid = options[:uid].to_i unless options[:uid].nil?
-            fetchdata = imap.uid_fetch(uid, ['RFC822'])[0]
-            new_message = Mail.new(fetchdata.attr['RFC822'])
-            new_message.mark_for_delete = true if options[:delete_after_find]
+        uids.each do |uid|
 
-            if block.arity == 3
-              yield new_message, imap, uid
-            else
-              yield new_message
-            end
-
-            imap.uid_store(uid, "+FLAGS", [Net::IMAP::DELETED]) if options[:delete_after_find] && new_message.is_marked_for_delete?
-            break unless options[:uid].nil?
+          uid = options[:uid].to_i unless options[:uid].nil?
+          fetchdata = imap.uid_fetch(uid, ['RFC822'])[0]
+          new_message = Mail.new(fetchdata.attr['RFC822'])
+          new_message.mark_for_delete = true if options[:delete_after_find]
 
+          if block.arity == 3
+            yield new_message, imap, uid
+          else
+            yield new_message
           end
 
-          imap.expunge if options[:delete_after_find]
+          imap.uid_store(uid, "+FLAGS", [Net::IMAP::DELETED]) if options[:delete_after_find] && new_message.is_marked_for_delete?
+          break unless options[:uid].nil?
 
-        else
+        end
 
-          emails = []
+        imap.expunge if options[:delete_after_find]
 
-          uids.each do |uid|
+      else
 
-            uid = options[:uid].to_i unless options[:uid].nil?
-            fetchdata = imap.uid_fetch(uid, ['RFC822'])[0]
-            emails << Mail.new(fetchdata.attr['RFC822'])
-            imap.uid_store(uid, "+FLAGS", [Net::IMAP::DELETED]) if options[:delete_after_find]
-            break unless options[:uid].nil?
+        emails = []
 
-          end
+        uids.each do |uid|
 
-          imap.expunge if options[:delete_after_find]
-          emails.size == 1 && options[:count] == 1 ? emails.first : emails
+          uid = options[:uid].to_i unless options[:uid].nil?
+          fetchdata = imap.uid_fetch(uid, ['RFC822'])[0]
+          emails << Mail.new(fetchdata.attr['RFC822'])
+          imap.uid_store(uid, "+FLAGS", [Net::IMAP::DELETED]) if options[:delete_after_find]
+          break unless options[:uid].nil?
 
         end
 
+        imap.expunge if options[:delete_after_find]
+        emails.size == 1 && options[:count] == 1 ? emails.first : emails
+
       end
 
     end

data/lib/mailhandler/version.rb

@@ -1,5 +1,5 @@
 module MailHandler
 
-  VERSION = '1.0.25'
+  VERSION = '1.0.26'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailhandler
 version: !ruby/object:Gem::Version
-  version: 1.0.25
+  version: 1.0.26
 platform: ruby
 authors:
 - Igor Balos