mailhandler 1.0.26 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2ddb338b7a52cc1426f32afaaaeab6db6c33b7d
-  data.tar.gz: e79fff22bcc348aa7ecd8c3c6027172f5926f265
+  metadata.gz: 312566ee726f5b9dfebce785b387733856e1ce6b
+  data.tar.gz: 808d6790c07347ba88607893870c83817c968369
 SHA512:
-  metadata.gz: 40bfafd947ed23c6562519d1427da8c491097a7d7eeeb2b48c9cdf04c8d169d14d146d509530b264c65b982eb53f3d7fc81f479028c781361f928e834a748d26
-  data.tar.gz: a2dde2cb11e392fb60d5947671dc390f67094535154e0fe3eb8174925be7663c60f401d62f4c88b0a431fd8d25c90db8e255c6b9931ddbf7ff95c6a404a0e9b3
+  metadata.gz: 43055df6d4ffa6bfb05b02cbd362dfa01455bb6c466f17b571a9520b9cd4de0f34a7232eeab3d930dd32848f5d46bf89ef05a8e0a59b5a9e9ab6abcdb6bb1085
+  data.tar.gz: 74ee5fe56db299d830b3e1355ba1a64ccfa43d9967972b54f4ec5d9141e12a12283646188a1e43de333aa11d3bb58feb78507c889df47cf6cb7cb83770d1bdf0

data/lib/mailhandler/receiving/imap.rb

@@ -140,7 +140,7 @@ module MailHandler
 
       def imap_search(retry_count, options)
 
-        result = mailer.find(:what => :last, :count => search_options[:count], :order => :desc, :keys => imap_filter_keys(options), :delete_after_find => options[:archive])
+        result = mailer.find_emails(:what => :last, :count => search_options[:count], :order => :desc, :keys => imap_filter_keys(options), :delete_after_find => options[:archive])
         (result.kind_of? Array)? result : [result]
 
       # Silently ignore IMAP search errors, [RETRY_ON_ERROR_COUNT] times
@@ -182,11 +182,11 @@ module MailHandler
 
             when :since
 
-              keys << 'SINCE' << Net::IMAP.format_datetime(options[:since])
+              keys << 'SINCE' << Net::IMAP.format_date(options[:since])
 
             when :before
 
-              keys << 'BEFORE' << Net::IMAP.format_datetime(options[:before])
+              keys << 'BEFORE' << Net::IMAP.format_date(options[:before])
 
             else
 

data/lib/mailhandler/receiving/mail.rb

@@ -2,13 +2,13 @@ module Mail
 
   class IMAP
 
-    attr_accessor :imap
+    attr_accessor :imap_connection
 
-    def find(options={}, &block)
+    def find_emails(options={}, &block)
 
       options = validate_options(options)
-      options[:read_only] ? imap.examine(options[:mailbox]) : imap.select(options[:mailbox])
-      uids = imap.uid_search(options[:keys])
+      options[:read_only] ? imap_connection.examine(options[:mailbox]) : imap_connection.select(options[:mailbox])
+      uids = imap_connection.uid_search(options[:keys])
 
       uids.reverse! if options[:what].to_sym == :last
       uids = uids.first(options[:count]) if options[:count].is_a?(Integer)
@@ -20,22 +20,22 @@ module Mail
         uids.each do |uid|
 
           uid = options[:uid].to_i unless options[:uid].nil?
-          fetchdata = imap.uid_fetch(uid, ['RFC822'])[0]
+          fetchdata = imap_connection.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
+            yield new_message, imap_connection, 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?
+          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.expunge if options[:delete_after_find]
+        imap_connection.expunge if options[:delete_after_find]
 
       else
 
@@ -44,14 +44,14 @@ module Mail
         uids.each do |uid|
 
           uid = options[:uid].to_i unless options[:uid].nil?
-          fetchdata = imap.uid_fetch(uid, ['RFC822'])[0]
+          fetchdata = imap_connection.uid_fetch(uid, ['RFC822'])[0]
           emails << Mail.new(fetchdata.attr['RFC822'])
-          imap.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.expunge if options[:delete_after_find]
+        imap_connection.expunge if options[:delete_after_find]
         emails.size == 1 && options[:count] == 1 ? emails.first : emails
 
       end
@@ -61,23 +61,23 @@ 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_connection = Net::IMAP.new(settings[:address], settings[:port], settings[:enable_ssl], nil, false)
 
       if settings[:authentication].nil?
-        imap.login(settings[:user_name], settings[:password])
+        imap_connection.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])
+        # (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) && imap && !imap.disconnected?
+      if defined?(imap_connection) && imap_connection && !imap_connection.disconnected?
 
-        imap.disconnect
+        imap_connection.disconnect
 
       end
 

data/lib/mailhandler/version.rb

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

metadata

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