mailhandler 1.0.21 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aed334966f4daa868a8533ea9e16b841b68f02b6
-  data.tar.gz: 69bc39be92c6408806830d8afead62ebd08080da
+  metadata.gz: 6ffda69ae4a9be229a9071524a77f71a3b873748
+  data.tar.gz: 6b28a918816ee5f8830529792066210b781321d2
 SHA512:
-  metadata.gz: 793f2480e28e3a8c9487cd7bdd3b5dade4d40d72306d5056438227711703a538635a11c72ff162578630d699d3ed4da51822ca30bfdd1f10b69e7024f52e2f5c
-  data.tar.gz: 60ea9caf4a6fe6be1efd66a1267cf05b54318a7a341f32aea1f23a0d8ea3971a443dbcc7d06aa4b6cd992f0acdba495ee53a7db65f11def31acdbeb68e044e3d
+  metadata.gz: 836a3e85fe73ca400d881c44b1e520fabb78fdc63859ea98df4f7cfb8d7c34fa6188b911d3aa061e256749da63474723cb4a7fd2b4c59b5fff6a4a7708ea2bd9
+  data.tar.gz: 13ad0ea77e75ce066cd71789343f01f49333d764e159921ea120374fcf55823a75e3742cab9bf6e7bfc1739e780d8943e441ce16b4cd644131f7945d04ec095d

data/lib/mailhandler/receiver.rb

@@ -1,6 +1,7 @@
 require_relative 'receiving/folder'
 require_relative 'receiving/imap'
 require_relative 'receiving/observer'
+require_relative 'receiving/mail.rb'
 
 module MailHandler
 
@@ -43,6 +44,7 @@ module MailHandler
     def find_email(options)
 
       init_search_details(options)
+      checker.start
 
       until search_time_expired?
 
@@ -57,6 +59,10 @@ module MailHandler
 
       checker.search_result
 
+      ensure
+
+        checker.stop
+      
     end
 
     private

data/lib/mailhandler/receiving/base.rb

@@ -22,6 +22,14 @@ module MailHandler
 
       end
 
+      def start
+
+      end
+
+      def stop
+
+      end
+
       def find(options)
 
         raise MailHandler::InterfaceError, 'Find interface not implemented.'

data/lib/mailhandler/receiving/filelist/filter/base.rb

@@ -57,20 +57,43 @@ module MailHandler
 
         end
 
-        class ByDate < Base
+        module ByDate
 
-          def initialize(files, date)
+          class Since < Base
 
-            super(files)
-            @date = date
+            def initialize(files, date)
+
+              super(files)
+              @date = date
+
+            end
+
+            private
+
+            def meets_expectation?(file)
+
+              (File.exists? file)? (File.ctime file) > @date : false
+
+            end
 
           end
 
-          private
+          class Before < Base
+
+            def initialize(files, date)
+
+              super(files)
+              @date = date
+
+            end
+
+            private
 
-          def meets_expectation?(file)
+            def meets_expectation?(file)
 
-            (File.exists? file)? (File.ctime file) > @date : false
+              (File.exists? file)? (File.ctime file) < @date : false
+
+            end
 
           end
 

data/lib/mailhandler/receiving/folder.rb

@@ -44,6 +44,12 @@ module MailHandler
 
       end
 
+      def start
+
+        verify_mailbox_folders
+
+      end
+
       private
 
       # filter options which need to be done by searching files
@@ -51,7 +57,8 @@ module MailHandler
 
           :by_subject => FileList::Filter::ByEmailSubject,
           :by_content => FileList::Filter::ByEmailContent,
-          :since => FileList::Filter::ByDate,
+          :since => FileList::Filter::ByDate::Since,
+          :before => FileList::Filter::ByDate::Before,
           :by_recipient => FileList::Filter::ByEmailRecipient
       }
 

data/lib/mailhandler/receiving/imap.rb

@@ -27,15 +27,45 @@ module MailHandler
       def find(options)
 
         verify_and_set_search_options(options)
-        init_retriever
         @found_emails = find_emails(search_options)
 
         search_result
 
       end
 
+      def start
+
+        init_retriever
+        connect
+
+      end
+
+      def stop
+
+        disconnect
+
+      end
+
       private
 
+      def mailer
+
+        @mailer ||= Mail.retriever_method
+
+      end
+
+      def connect
+
+        mailer.connect
+
+      end
+
+      def disconnect
+
+        mailer.disconnect
+
+      end
+
       # search options:
       # by_subject - String, search by a whole string as part of the subject of the email
       # by_content - String, search by a whole string as part of the content of the email
@@ -46,6 +76,8 @@ module MailHandler
 
           :by_subject,
           :by_content,
+          :since,
+          :before,
           :count,
           :archive,
           :by_recipient
@@ -92,7 +124,7 @@ module MailHandler
 
       def find_emails(options)
 
-        result = Mail.find(:what => :last, :count => search_options[:count], :order => :desc, :keys => imap_filter_keys(options), :delete_after_find => options[:archive])
+        result = mailer.find(:what => :last, :count => search_options[:count], :order => :desc, :keys => imap_filter_keys(options), :delete_after_find => options[:archive])
         (result.kind_of? Array)? result : [result]
 
       end
@@ -117,6 +149,14 @@ module MailHandler
 
               keys << 'BODY' << options[:by_content].to_s
 
+            when :since
+
+              keys << 'SINCE' << Net::IMAP.format_date(options[:since])
+
+            when :before
+
+              keys << 'BEFORE' << Net::IMAP.format_date(options[:before])
+
             else
 
               # do nothing

data/lib/mailhandler/receiving/mail.rb

@@ -0,0 +1,91 @@
+module Mail
+
+  class IMAP
+
+    attr_accessor :imap
+
+    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]
+
+      else
+
+        emails = []
+
+        unless uids.nil?
+
+          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'])
+            imap.uid_store(uid, "+FLAGS", [Net::IMAP::DELETED]) if options[:delete_after_find]
+            break unless options[:uid].nil?
+
+          end
+
+        end
+
+        imap.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)
+
+        puts "connect"
+        @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
+
+    end
+
+    def disconnect
+
+      puts "disconnect"
+      if defined?(imap) && imap && !imap.disconnected?
+
+        imap.disconnect
+
+      end
+
+    end
+
+  end
+
+end

data/lib/mailhandler/version.rb

@@ -1,5 +1,5 @@
 module MailHandler
 
-  VERSION = '1.0.21'
+  VERSION = '1.0.22'
 
 end

data/spec/unit/mailhandler/receiver_spec.rb

@@ -14,6 +14,8 @@ describe MailHandler::Receiver do
       allow(checker).to receive(:search_result) { true }
       allow(checker).to receive(:found_emails) { [found_email] }
       allow(checker).to receive(:reset_found_emails) { [] }
+      allow(checker).to receive(:start) { nil }
+      allow(checker).to receive(:stop) { nil }
       checker
 
     }
@@ -72,6 +74,8 @@ describe MailHandler::Receiver do
         allow(checker).to receive(:search_result) { false }
         allow(checker).to receive(:found_emails) { [] }
         allow(checker).to receive(:reset_found_emails) { [] }
+        allow(checker).to receive(:start) { nil }
+        allow(checker).to receive(:stop) { nil }
         checker
 
       }

data/spec/unit/mailhandler/receiving/imap_spec.rb

@@ -54,12 +54,6 @@ describe MailHandler::Receiving::IMAPChecker do
 
     context 'invalid' do
 
-      it 'by date' do
-
-        expect { checker.find({:since => Time.now}) }.to raise_error MailHandler::Error
-
-      end
-
       it 'by_test' do
 
         expect { checker.find({:by_test => 'test'}) }.to raise_error MailHandler::Error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailhandler
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.22
 platform: ruby
 authors:
 - Igor Balos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -67,6 +67,7 @@ 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