mailhandler 1.0.24 → 1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2c92c21a448a3f604ea019ee4ecffe0e89c8ddd
-  data.tar.gz: 9599f219db0bc2bfbff8898e5be866aebce980ad
+  metadata.gz: 923924f2168d404cb5fd28d97b77d19276e41fe7
+  data.tar.gz: 31843295da603ab56eccedafefac33fdc5584de6
 SHA512:
-  metadata.gz: a6e7dd092250d6c5fd0f1841b6293264b6f71a6322b2b0d787b054e641bc48bbd46a15232785b3198c7b4b5ce0c872e0f83148e76202fd43484d544af3f2c64c
-  data.tar.gz: b32af98f6af8d2857086ef8a1c9bca05f43b0956e3a852b24af8d62f16d85554f4b685eed262061f350d0518599a453a84141e7099bb8be242425051d07e1866
+  metadata.gz: 79e0f23fd3d186e623909cea7e601c1975ccfa157eb5833bc87106dae474b52ac0fd4c9fcce76ceb113df0158585e47fbff2f977261c629fbba9b2dbd24ca3fe
+  data.tar.gz: 47ccdcadd144b7b4b68d2e3c5e400c2ff1acec00760e1fb713003a68234290c2d9cf3d45a4859f476c66c79bd62546ce809e8cdbfc1e5d1d941654e48598d736

data/lib/mailhandler/receiving/imap.rb

@@ -182,11 +182,11 @@ module MailHandler
 
             when :since
 
-              keys << 'SINCE' << Net::IMAP.format_date(options[:since])
+              keys << 'SINCE' << Net::IMAP.format_datetime(options[:since])
 
             when :before
 
-              keys << 'BEFORE' << Net::IMAP.format_date(options[:before])
+              keys << 'BEFORE' << Net::IMAP.format_datetime(options[:before])
 
             else
 

data/lib/mailhandler/receiving/mail.rb

@@ -7,41 +7,48 @@ module Mail
     def find(options={}, &block)
 
       options = validate_options(options)
-
       options[:read_only] ? imap.examine(options[:mailbox]) : imap.select(options[:mailbox])
-
       uids = imap.uid_search(options[:keys])
-      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]
-          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?
-        end
 
-        imap.expunge if options[:delete_after_find]
+      if uids.nil? || uids.empty?
+
+        []
 
       else
 
-        emails = []
+        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]
+
+            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?
+
+          end
 
-        unless uids.nil?
+          imap.expunge if options[:delete_after_find]
+
+        else
+
+          emails = []
 
           uids.each do |uid|
+
             uid = options[:uid].to_i unless options[:uid].nil?
             fetchdata = imap.uid_fetch(uid, ['RFC822'])[0]
             emails << Mail.new(fetchdata.attr['RFC822'])
@@ -50,10 +57,10 @@ module Mail
 
           end
 
-        end
+          imap.expunge if options[:delete_after_find]
+          emails.size == 1 && options[:count] == 1 ? emails.first : emails
 
-        imap.expunge if options[:delete_after_find]
-        emails.size == 1 && options[:count] == 1 ? emails.first : emails
+        end
 
       end
 
@@ -62,15 +69,15 @@ module Mail
     # Start an IMAP session
     def connect(config=Mail::Configuration.instance)
 
-        @imap = Net::IMAP.new(settings[:address], settings[:port], settings[:enable_ssl], nil, false)
+      @imap = Net::IMAP.new(settings[:address], settings[:port], settings[:enable_ssl], nil, false)
 
-        if settings[:authentication].nil?
-          imap.login(settings[:user_name], settings[:password])
-        else
-          # Note that Net::IMAP#authenticate('LOGIN', ...) is not equal with Net::IMAP#login(...)!
-          # (see also http://www.ensta.fr/~diam/ruby/online/ruby-doc-stdlib/libdoc/net/imap/rdoc/classes/Net/IMAP.html#M000718)
-          imap.authenticate(settings[:authentication], settings[:user_name], settings[:password])
-        end
+      if settings[:authentication].nil?
+        imap.login(settings[:user_name], settings[:password])
+      else
+        # Note that Net::IMAP#authenticate('LOGIN', ...) is not equal with Net::IMAP#login(...)!
+        # (see also http://www.ensta.fr/~diam/ruby/online/ruby-doc-stdlib/libdoc/net/imap/rdoc/classes/Net/IMAP.html#M000718)
+        imap.authenticate(settings[:authentication], settings[:user_name], settings[:password])
+      end
 
     end
 

data/lib/mailhandler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailhandler
 version: !ruby/object:Gem::Version
-  version: 1.0.24
+  version: 1.0.25
 platform: ruby
 authors:
 - Igor Balos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail