mailhandler 1.0.20 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ad403b028e0aaa2b38fe06175974beff76015b8
-  data.tar.gz: d3c7387992cb45fdad2d4e2d8de4bbffb9f77edd
+  metadata.gz: aed334966f4daa868a8533ea9e16b841b68f02b6
+  data.tar.gz: 69bc39be92c6408806830d8afead62ebd08080da
 SHA512:
-  metadata.gz: 76bf22bb22a36ee53fd8a67356b9192f0e6ecb491816b55fbfaab48bbd4bbdbc1d85f4e0374852e6a65960badc025101cb17121995acdbf049c5cc5329bf2c31
-  data.tar.gz: 097b7e17cef92ecefdfd69b431efcb71ce3d76fc269bbac299c8d4ef370910119e0c3688b190ee891888ffde76ceebd22d91b46a20b73fbba4b8f6a1d7405efa
+  metadata.gz: 793f2480e28e3a8c9487cd7bdd3b5dade4d40d72306d5056438227711703a538635a11c72ff162578630d699d3ed4da51822ca30bfdd1f10b69e7024f52e2f5c
+  data.tar.gz: 60ea9caf4a6fe6be1efd66a1267cf05b54318a7a341f32aea1f23a0d8ea3971a443dbcc7d06aa4b6cd992f0acdba495ee53a7db65f11def31acdbeb68e044e3d

data/lib/mailhandler/receiving/base.rb

@@ -49,7 +49,8 @@ module MailHandler
           :since,
           :by_recipient,
           :count,
-          :archive
+          :archive,
+          :fast_check
 
       ]
 

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

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 # Base filtering class, which is used for reading list of all files based on passed pattern.
 # Patterns to be used can be checked here: http://ruby-doc.org/core-1.9.3/Dir.html
 

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

@@ -0,0 +1,85 @@
+require_relative '../base'
+require_relative '../../../errors'
+
+module MailHandler
+
+  module Receiving
+
+    class FileList
+
+      module Filter
+
+        class Base
+
+          attr_accessor :files, :fast_check
+
+          def initialize(files)
+
+            @files=files
+
+          end
+
+          def get
+
+            files.select { |file| ignore_exception { meets_expectation?(file) } }
+
+          end
+
+          protected
+
+          def meet_expectation?(file)
+
+            raise MailHandler::InterfaceError, 'Interface not implemented.'
+
+          end
+
+          def read_file(file)
+
+            File.read(file)
+
+          end
+
+          private
+
+          def ignore_exception
+
+            begin
+
+              yield
+
+            rescue
+
+              false
+
+            end
+
+          end
+
+        end
+
+        class ByDate < Base
+
+          def initialize(files, date)
+
+            super(files)
+            @date = date
+
+          end
+
+          private
+
+          def meets_expectation?(file)
+
+            (File.exists? file)? (File.ctime file) > @date : false
+
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,130 @@
+require 'mail'
+require_relative 'base'
+
+module MailHandler
+
+  module Receiving
+
+    class FileList
+
+      module Filter
+
+        # filtering file content by its email properties
+        class Email < Base
+
+          def initialize(files)
+
+            @fast_check=true
+            super(files)
+
+          end
+
+          protected
+
+          def read_email_from_file(file)
+
+            Mail.read(file)
+
+          end
+
+          def meets_expectation?(file)
+
+            # fast content checks search for content by file reading
+            # slow content checks search for content by reconstructing email from file and then searching for content
+            (fast_check)? check_content_fast(file) : check_content_slow(file)
+
+          end
+
+          def check_content_fast(file)
+
+            raise MailHandler::InterfaceError, 'Interface not implemented.'
+
+          end
+
+          def check_content_slow(file)
+
+            raise MailHandler::InterfaceError, 'Interface not implemented.'
+
+          end
+
+        end
+
+        class ByEmailContent < Email
+
+          def initialize(files, content)
+
+            super(files)
+            @content = content
+
+          end
+
+          private
+
+          def check_content_fast(file)
+
+            read_file(file).include? @content
+
+          end
+
+          def check_content_slow(file)
+
+            email = read_email_from_file(file)
+
+            if email.multipart?
+
+              email.text_part.decoded.include?(@content) || email.html_part.decoded.include?(@content)
+
+            else
+
+              email.decoded.include? @content
+
+            end
+
+          end
+
+        end
+
+        class ByEmailSubject < ByEmailContent
+
+          private
+
+          def check_content_fast(file)
+
+            read_file(file).include? @content
+
+          end
+
+          def check_content_slow(file)
+
+            read_email_from_file(file).subject.to_s.include? @content
+
+          end
+
+        end
+
+        class ByEmailRecipient < Email
+
+          def initialize(files, recipient)
+
+            super(files)
+            @recipient = recipient
+
+          end
+
+          private
+
+          def meets_expectation?(file)
+
+            read_email_from_file(file)[@recipient.keys.first].to_s.include? @recipient.values.first
+
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/mailhandler/receiving/folder.rb

@@ -1,7 +1,9 @@
 require 'mail'
 require_relative 'base.rb'
 require_relative '../errors'
-require_relative 'filelist/filter.rb'
+require_relative 'filelist/base.rb'
+require_relative 'filelist/filter/base.rb'
+require_relative 'filelist/filter/email.rb'
 
 module MailHandler
 
@@ -64,15 +66,26 @@ module MailHandler
       def find_files(options)
 
         file_list = FileList.new
-        files = file_list.get(search_pattern)
+        files = filter_files(file_list.get(search_pattern), options)
+        file_list.sort(files)
+
+      end
+
+      def filter_files(files, options)
 
         options.each do |key, value|
 
-          files = FILE_SEARCH_CLASSES[key].new(files, value).get if FILE_SEARCH_CLASSES[key] != nil
+          if FILE_SEARCH_CLASSES[key] != nil
+
+            filter = FILE_SEARCH_CLASSES[key].new(files, value)
+            filter.fast_check = options[:fast_check] unless options[:fast_check].nil?
+            files = filter.get
+
+          end
 
         end
 
-        file_list.sort(files)
+        files
 
       end
 

data/lib/mailhandler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailhandler
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.21
 platform: ruby
 authors:
 - Igor Balos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -63,7 +63,8 @@ files:
 - lib/mailhandler/receiver.rb
 - lib/mailhandler/receiving/base.rb
 - lib/mailhandler/receiving/filelist/base.rb
-- lib/mailhandler/receiving/filelist/filter.rb
+- lib/mailhandler/receiving/filelist/filter/base.rb
+- lib/mailhandler/receiving/filelist/filter/email.rb
 - lib/mailhandler/receiving/folder.rb
 - lib/mailhandler/receiving/imap.rb
 - lib/mailhandler/receiving/notification/console.rb

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

@@ -1,147 +0,0 @@
-require 'fileutils'
-require_relative 'base'
-
-module MailHandler
-
-  module Receiving
-
-    class FileList
-
-      module Filter
-
-        class Base
-
-          attr_accessor :files
-
-          def initialize(files)
-
-            @files=files
-
-          end
-
-          def get
-
-            files.select { |file| ignore_exception { meets_expectation?(file) } }
-
-          end
-
-          protected
-
-          def meet_expectation?(file)
-
-            raise StandardError, 'Needs to be implemented.'
-
-          end
-
-          def read_file(file)
-
-            # TODO: add UTF support
-            # string need to be read and converted
-            # read_email(file_content).subject.include?(@content) - 10x slower, use something else for reading
-            # Mail::Encodings.unquote_and_convert_to(content, "UTF-8") - 6x slower
-            File.read(file)
-
-          end
-
-          private
-
-          def ignore_exception
-
-            begin
-
-              yield
-
-            rescue
-
-              false
-
-            end
-
-          end
-
-        end
-
-        class ByDate < Base
-
-          def initialize(files, date)
-
-            super(files)
-            @date = date
-
-          end
-
-          private
-
-          def meets_expectation?(file)
-
-            (File.exists? file)? (File.ctime file) > @date : false
-
-          end
-
-        end
-
-        class Email < Base
-
-          def initialize(files)
-
-            super(files)
-
-          end
-
-          protected
-
-          def read_email_from_file(file)
-
-            Mail.read(file)
-
-          end
-
-        end
-
-        class ByEmailContent < Email
-
-          def initialize(files, content)
-
-            super(files)
-            @content = content
-
-          end
-
-          protected
-
-          def meets_expectation?(file)
-
-            read_file(file).include? @content
-
-          end
-
-        end
-
-        class ByEmailSubject < ByEmailContent ; end
-
-        class ByEmailRecipient < Email
-
-          def initialize(files, recipient)
-
-            super(files)
-            @recipient = recipient
-
-          end
-
-          private
-
-          def meets_expectation?(file)
-
-            read_email_from_file(file)[@recipient.keys.first].to_s.include? @recipient.values.first
-
-          end
-
-        end
-
-      end
-
-    end
-
-  end
-
-end