mailhandler 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d5da2d84a112a75963921878106d433e7692f45
-  data.tar.gz: 6d52c2232c683d02a2cfb6d27da46e5d399cc6c2
+  metadata.gz: 2ec9ad0acba66aa31321e63ed9f9acf9b95f57ea
+  data.tar.gz: 16279973b129e4a3f384e7cfdaa025603b6b3814
 SHA512:
-  metadata.gz: 1834533b14c45829273d4c050b5f9f3cb1e0ac08e834bd9ac4d0b4e5b79250fe7e926120a36e64c844a5351d2b43df14eabbf7b3fa0220c327921e6fc74f904d
-  data.tar.gz: e595566eb6a85f3043bb371d48a51d38a04bc430d7b4e5fd5a3ea434af6c76126e44086b007e68db703cdc28e72cc37ed318c5f6078859c68b64710577dc02f4
+  metadata.gz: 04381e76cc9adc9b6bfa1e2d649957cf60a2fbd1f5b2da7fa08d50d51d2e6fe3beaa61d13de6a4dcde7719c24c5affe8519d4bc13e97364a94a0ecf5e812d7fe
+  data.tar.gz: e0c657384c7679083bbe7047738fb2fb810fe58e9562a3a7ed9fd3d764178d155ce905a82e2722520786af049dbfbfe4aab991ed0e9d7e9b0a764f7401764a0f

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

@@ -0,0 +1,56 @@
+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
+module Filter
+
+  class Base
+
+    def Base.sort(files)
+
+      swapped = true
+      j = 0
+
+      while swapped do
+
+        swapped = false
+        j+=1
+
+        (files.size - j).times do |i|
+
+          if File.new(files[i]).ctime < File.new(files[i + 1]).ctime
+            tmp = files[i]
+            files[i] = files[i + 1]
+            files[i + 1] = tmp
+            swapped = true
+
+          end
+
+        end
+
+      end
+
+      files
+
+    end
+
+    def get(pattern)
+
+      files = []
+      Dir.glob(pattern).each { |file| files << File.absolute_path(file) }
+      files
+
+    end
+
+    protected
+
+    def read_email(content)
+
+      Mail.read_from_string(content)
+
+    end
+
+  end
+
+end
+

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

@@ -0,0 +1,167 @@
+require_relative 'base.rb'
+
+# Implementations of base filtering, which will allow further filtering the list of files based on email content.
+module Filter
+
+  class ByFilename < Base
+
+    def get(pattern)
+
+      super(pattern)
+
+    end
+
+  end
+
+  class ContentBase < Base
+
+    def initialize(content)
+
+      @content = content.to_s
+
+    end
+
+    protected
+
+    def filter_files(files)
+
+      files.select do |file|
+
+        begin
+
+          file_match_filter?(file)
+
+        rescue
+
+          # return false if error occurred or content was not found
+          false
+
+        end
+
+      end
+
+    end
+
+    def file_match_filter?(file)
+
+      raise StandardError, 'Not implemented'
+
+    end
+
+  end
+
+  class BySubject < ContentBase
+
+    def initialize(content)
+
+      super(content)
+
+    end
+
+    def get(pattern)
+
+      files = super(pattern)
+      filter_files(files)
+
+    end
+
+    private
+
+    def file_match_filter?(file)
+
+      read_email(File.read(file)).subject.include? @content
+
+    end
+
+  end
+
+  class ByContent < ContentBase
+
+    def initialize(content)
+
+      super(content)
+
+    end
+
+    def get(pattern)
+
+      files = super(pattern)
+      filter_files(files)
+
+    end
+
+    private
+
+    def file_match_filter?(file)
+
+      File.read(file).include? @content
+
+    end
+
+  end
+
+  class ByDate < ContentBase
+
+    def initialize(date)
+
+      @date = date
+
+    end
+
+    def get(pattern)
+
+      files = super(pattern)
+      filter_files(files)
+
+    end
+
+    private
+
+    def file_match_filter?(file)
+
+      file = File.new(file)
+      if file != nil
+
+        file.ctime > @date
+
+      else
+
+        false
+
+      end
+
+    end
+
+  end
+
+  module Email
+
+    class ByRecipient < ContentBase
+
+      def initialize(recipient)
+
+        @recipient = recipient
+
+      end
+
+      def get(pattern)
+
+        files = super(pattern)
+        filter_files(files)
+
+      end
+
+      private
+
+      def file_match_filter?(file)
+
+        email = read_email(File.read(file))
+        email[@recipient.keys.first].to_s.include? @recipient.values.first
+
+      end
+
+    end
+
+  end
+
+end

data/lib/mailhandler/receiving/folder.rb

@@ -1,8 +1,10 @@
-require_relative 'base.rb'
-require_relative 'filter'
 require 'mail'
+require_relative 'base.rb'
 require_relative '../errors'
 
+require_relative 'file_filter/base.rb'
+require_relative 'file_filter/filter.rb'
+
 module MailHandler
 
   module Receiving
@@ -45,7 +47,7 @@ module MailHandler
       # filter options which need to be done by searching files
       FILE_SEARCH_CLASSES = {
 
-          :by_subject => Filter::ByContent,
+          :by_subject => Filter::BySubject,
           :by_content => Filter::ByContent,
           :by_date => Filter::ByDate,
           :by_recipient => Filter::Email::ByRecipient
@@ -59,12 +61,7 @@ module MailHandler
 
       def read_found_emails(files, count)
 
-        files.first(count).map do |file|
-
-          email_content = File.read(file)
-          Mail.read_from_string(email_content)
-
-        end
+        files.first(count).map { |file| Mail.read_from_string(File.read(file)) }
 
       end
 
@@ -103,7 +100,7 @@ module MailHandler
 
       def delete_file(file)
 
-        FileUtils.rm_r "#{inbox_folder}/#{file}", :force => true
+        FileUtils.rm_r "#{inbox_folder}/#{file}", :force => false
 
       end
 

data/lib/mailhandler/receiving/imap.rb

@@ -91,16 +91,7 @@ module MailHandler
 
       def find_emails(options)
 
-        if options[:archive]
-
-          result = Mail.find_and_delete(:what => :last, :count => search_options[:count], :order => :desc, :keys => imap_filter_keys(options))
-
-        else
-
-          result = Mail.find(:what => :last, :count => search_options[:count], :order => :desc, :keys => imap_filter_keys(options))
-
-        end
-
+        result = Mail.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

data/lib/mailhandler/version.rb

@@ -1,5 +1,5 @@
 module MailHandler
 
-  VERSION = '1.0.13'
+  VERSION = '1.0.14'
 
 end

data/spec/data/email-uni1.txt

@@ -0,0 +1,47 @@
+Delivered-To: igor@example.com
+Received: by 12.74.171.199 with SMTP id 1w7csp487013o2c;
+        Mon, 21 Dec 2015 01:45:03 -0800 (PST)
+X-Received: by 11.14.225.211 with SMTP id k202mr13688721ywe.168.1450691103560;
+        Mon, 21 Dec 2015 01:45:03 -0800 (PST)
+Received: from sc-exam.mtasv.net (sc-exam.itasv.net. [51.32.152.221])
+        by mx.google.com with ESMTPS id n124si20919044ywc.44.2015.22.22.01.45.03
+        for <igor@example.com>
+        (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
+        Mon, 21 Dec 2015 01:45:03 -0800 (PST)
+Received-SPF: pass (google.com: domain of unces@wb.example.com designates 11.1.1.1 as permitted sender) client-ip=11.1.1.1;
+Authentication-Results: mx.google.com;
+       spf=pass (google.com: domain of ounces@wb.example.com designates 11.1.1.1 as permitted sender) smtp.mailfrom=ounces@wb.example.com;
+       dkim=pass header.i=@example.com;
+       dmarc=pass (p=NONE dis=NONE) header.from=example.com
+DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; s=jan2013.pm; d=example.com;
+ h=From:Date:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:To:Reply-To:Message-ID; i=igor@example.com;
+ bh=PzwfK1FvIpe5JXJSkPKh5z/fDTY=;
+ b=Y8QAdWtGwwC9QSXtVQ+QJzOt+dzOm+WrOCJ/dnGbD8eBKYuEBRxwo18FqmSIP7petsfqU3NIXK85
+   uF7yvyaBdMkafiKrR4du+TFTf+QBfsOoSrCIvKhCqnRgTEeL/niuYMbjNDrUNWcxq5VvUWKrtyjf
+   cvyZhxW2Cwdbd5nZ2NM=
+DomainKey-Signature: a=rsa-sha1; c=nofws; q=dns; s=jan2013.pm; d=example.com;
+ b=S7CL7EMB1XKFCedi2NHfRSxWEnzBXnt6f48UxDcpGBWQGRj5b53isqmr5dnwAvP+q6HdQDc0rDgk
+   hXnckMTHE1p1MmeBSvETDB+FU4VXnA4CaAfeRTf+rUZlz1w5d/aWKqBSa9kPJQvwQrCypxqcPJql
+   7K0YKl5PtWP3D5gn/KU=;
+Received: by sc-exam.mtasv.net id hev51u1jk5kd for <igor@example.com>; Mon, 21 Dec 2015 04:45:03 -0500 (envelope-from <ounces@wb.example.com>)
+X-IADB-IP: 11.1.1.1
+X-IADB-IP-REVERSE: 11.1.1.2
+From: "John Smith" <igor@example.com> 
+Date: Mon, 21 Dec 2015 04:45:03 -0500
+Subject: =?UTF-8?Q?=D0=95-=D0=BC=D0=B0=D0=B8=D0=BB=20=D0=BF=D1=80?=
+	=?UTF-8?Q?=D0=B8=D0=BC=D0=B5=D1=80=2069578385=20?=
+MIME-Version: 1.0
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+X-Mailer: aspNetEmail ver 4.0.0.38
+X-PM-RCPT: |bTB8MjA3NDd8MTYzODZ8aWJhbG9zaC50ZXN0aW5nQGdtYWlsLmNv11==|
+X-PM-Message-Id: 1fb4ccd8-fe62-4424-a0aa-a30b281b9631
+To: igor@example.com
+Message-ID: <5677ca1e87ee0_de33fee2381c080708d8@Johns-MacBook-Pro.local.mail>
+
+<=21DOCTYPE html>=0A<html>=0A=0A<body>=0A<h1>My First Heading</h1>=0A<p>M=
+y first paragraph=2E</p>=0A<p>My first paragraph S=C3=BC=C3=9Fe =2E</p>=0A=
+=0A<img src=3D=22http://ea=2Epstmrk=2Eit/open/MjA3NDdfMTYzODZfb3ZlcjUwXzh=
+mYjRjY2Q4LWZlNjItNDQyNC1hMGFhLWEzMGIyODFiOTYzMF9pYmFsb3NoLnRlc3RpbmdAZ21h=
+aWwuY29t=22 width=3D=221=22 height=3D=221=22 border=3D=220=22 /></body>=0A=
+</html>

data/spec/data/email-uni2.txt

@@ -0,0 +1,46 @@
+Delivered-To: igor@example.com
+Received: by 12.74.171.199 with SMTP id 1w7csp487013o2c;
+        Mon, 21 Dec 2015 01:45:03 -0800 (PST)
+X-Received: by 11.14.225.211 with SMTP id k202mr13688721ywe.168.1450691103560;
+        Mon, 21 Dec 2015 01:45:03 -0800 (PST)
+Received: from sc-exam.mtasv.net (sc-exam.itasv.net. [51.32.152.221])
+        by mx.google.com with ESMTPS id n124si20919044ywc.44.2015.22.22.01.45.03
+        for <igor@example.com>
+        (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
+        Mon, 21 Dec 2015 01:45:03 -0800 (PST)
+Received-SPF: pass (google.com: domain of unces@wb.example.com designates 11.1.1.1 as permitted sender) client-ip=11.1.1.1;
+Authentication-Results: mx.google.com;
+       spf=pass (google.com: domain of ounces@wb.example.com designates 11.1.1.1 as permitted sender) smtp.mailfrom=ounces@wb.example.com;
+       dkim=pass header.i=@example.com;
+       dmarc=pass (p=NONE dis=NONE) header.from=example.com
+DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; s=jan2013.pm; d=example.com;
+ h=From:Date:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:To:Reply-To:Message-ID; i=igor@example.com;
+ bh=PzwfK1FvIpe5JXJSkPKh5z/fDTY=;
+ b=Y8QAdWtGwwC9QSXtVQ+QJzOt+dzOm+WrOCJ/dnGbD8eBKYuEBRxwo18FqmSIP7petsfqU3NIXK85
+   uF7yvyaBdMkafiKrR4du+TFTf+QBfsOoSrCIvKhCqnRgTEeL/niuYMbjNDrUNWcxq5VvUWKrtyjf
+   cvyZhxW2Cwdbd5nZ2NM=
+DomainKey-Signature: a=rsa-sha1; c=nofws; q=dns; s=jan2013.pm; d=example.com;
+ b=S7CL7EMB1XKFCedi2NHfRSxWEnzBXnt6f48UxDcpGBWQGRj5b53isqmr5dnwAvP+q6HdQDc0rDgk
+   hXnckMTHE1p1MmeBSvETDB+FU4VXnA4CaAfeRTf+rUZlz1w5d/aWKqBSa9kPJQvwQrCypxqcPJql
+   7K0YKl5PtWP3D5gn/KU=;
+Received: by sc-exam.mtasv.net id hev51u1jk5kd for <igor@example.com>; Mon, 21 Dec 2015 04:45:03 -0500 (envelope-from <ounces@wb.example.com>)
+X-IADB-IP: 11.1.1.1
+X-IADB-IP-REVERSE: 11.1.1.2
+From: "John Smith" <igor@example.com> 
+Date: Mon, 21 Dec 2015 04:45:03 -0500
+Subject: =?UTF-8?Q?E-Mail=20beispiels=20m=C3=B6glich=201=20?=
+MIME-Version: 1.0
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+X-Mailer: aspNetEmail ver 4.0.0.38
+X-PM-RCPT: |bTB8MjA3NDd8MTYzODZ8aWJhbG9zaC50ZXN0aW5nQGdtYWlsLmNv11==|
+X-PM-Message-Id: 1fb4ccd8-fe62-4424-a0aa-a30b281b9631
+To: igor@example.com
+Message-ID: <5677ca1e87ee0_de33fee2381c080708d8@Johns-MacBook-Pro.local.mail>
+
+<=21DOCTYPE html>=0A<html>=0A=0A<body>=0A<h1>My First Heading</h1>=0A<p>M=
+y first paragraph=2E</p>=0A<p>My first paragraph S=C3=BC=C3=9Fe =2E</p>=0A=
+=0A<img src=3D=22http://ea=2Epstmrk=2Eit/open/MjA3NDdfMTYzODZfb3ZlcjUwXzh=
+mYjRjY2Q4LWZlNjItNDQyNC1hMGFhLWEzMGIyODFiOTYzMF9pYmFsb3NoLnRlc3RpbmdAZ21h=
+aWwuY29t=22 width=3D=221=22 height=3D=221=22 border=3D=220=22 /></body>=0A=
+</html>

data/spec/data/email2.txt

@@ -8,4 +8,4 @@ Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-test body 1878275
+test body 1878278

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 describe MailHandler::Receiving::FolderChecker do
@@ -131,7 +132,7 @@ describe MailHandler::Receiving::FolderChecker do
 
         it 'by recipient' do
 
-          checker.find({:by_recipient => { to: 'igor@example.com'} })
+          checker.find({:by_recipient => { to: 'igor+nonexisting@example.com'} })
           expect(checker.found_emails).to be_empty
 
         end
@@ -161,6 +162,13 @@ describe MailHandler::Receiving::FolderChecker do
 
         end
 
+        it 'by content' do
+
+          checker.find({:by_content => '1878271'})
+          expect(checker.found_emails.size).to be 1
+
+        end
+
         it 'by subject - multiple' do
 
           checker.find({:by_subject => 'test'})
@@ -183,7 +191,7 @@ describe MailHandler::Receiving::FolderChecker do
         it 'by date' do
 
           checker.find({:by_date => Time.new(2015,10,12,13,30,0, "+02:00")})
-          expect(checker.found_emails.size).to be 2
+          expect(checker.found_emails.size).to be 4
 
         end
 
@@ -197,6 +205,24 @@ describe MailHandler::Receiving::FolderChecker do
 
         end
 
+        context 'unicode' do
+
+          it 'by subject - cyrillic' do
+
+            checker.find({:by_subject => 'Е-маил пример'})
+            expect(checker.found_emails.size).to be 1
+
+          end
+
+          it 'by subject - german' do
+
+            checker.find({:by_subject => 'möglich'})
+            expect(checker.found_emails.size).to be 1
+
+          end
+
+        end
+
         context 'archiving emails' do
 
           before(:each) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailhandler
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Igor Balos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -62,7 +62,8 @@ files:
 - lib/mailhandler/errors.rb
 - lib/mailhandler/receiver.rb
 - lib/mailhandler/receiving/base.rb
-- lib/mailhandler/receiving/filter.rb
+- lib/mailhandler/receiving/file_filter/base.rb
+- lib/mailhandler/receiving/file_filter/filter.rb
 - lib/mailhandler/receiving/folder.rb
 - lib/mailhandler/receiving/imap.rb
 - lib/mailhandler/receiving/notification/console.rb
@@ -78,6 +79,8 @@ files:
 - lib/mailhandler/version.rb
 - mailhandler.gemspec
 - readme.md
+- spec/data/email-uni1.txt
+- spec/data/email-uni2.txt
 - spec/data/email1.txt
 - spec/data/email2.txt
 - spec/spec_helper.rb

data/lib/mailhandler/receiving/filter.rb

@@ -1,163 +0,0 @@
-require 'fileutils'
-
-module Filter
-
-  class Base
-
-    def Base.sort(files)
-
-      swapped = true
-      j = 0
-
-      while swapped do
-
-        swapped = false
-        j+=1
-
-        (files.size - j).times do |i|
-
-          if File.new(files[i]).ctime < File.new(files[i + 1]).ctime
-            tmp = files[i]
-            files[i] = files[i + 1]
-            files[i + 1] = tmp
-            swapped = true
-
-          end
-
-        end
-
-      end
-
-      files
-
-    end
-
-    def get(pattern)
-
-      files = []
-      Dir.glob(pattern).each { |file| files << File.absolute_path(file) }
-      files
-
-    end
-
-  end
-
-  class ByFilename < Base
-
-    def get(pattern)
-
-      super(pattern)
-
-    end
-
-  end
-
-  class ByContent < Base
-
-    def initialize(content)
-
-      @content = content.to_s
-
-    end
-
-    def get(pattern)
-
-      files = super(pattern)
-
-      matched_files = []
-
-      files.each do |file|
-
-        begin
-
-          content = File.read(file)
-          matched_files << file if content.include? @content
-
-        rescue
-
-          # skip file reading if file is not there anymore
-
-        end
-
-      end
-
-      matched_files
-
-    end
-
-  end
-
-  class ByDate < Base
-
-    def initialize(date)
-
-      @date = date
-
-    end
-
-    def get(pattern)
-
-      files = super(pattern)
-      files.select { |filename|
-
-        file = nil
-        begin
-
-          file = File.new(filename)
-
-        rescue
-
-          # skip file reading if file is not there anymore
-
-        end
-
-        file.ctime > @date if (file != nil)
-
-      }
-
-    end
-
-  end
-
-  module Email
-
-    class ByRecipient < Base
-
-      def initialize(recipient)
-
-        @recipient = recipient
-
-      end
-
-      def get(pattern)
-
-        files = super(pattern)
-
-        matched_files = []
-
-        files.each do |file|
-
-          begin
-
-            content = File.read(file)
-
-            email = Mail.read_from_string(content)
-            matched_files << file if email[@recipient.keys.first].to_s.include? @recipient.values.first
-
-          rescue
-
-            # skip file reading if file is not there anymore
-
-          end
-
-        end
-
-        matched_files
-
-      end
-
-    end
-
-  end
-
-end