mailhandler 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecef71152a0c0d0fe88836302a0a1d21943aa982
-  data.tar.gz: cad86ec06626c41396a2c5cc62c458cc1206b28a
+  metadata.gz: 6ad403b028e0aaa2b38fe06175974beff76015b8
+  data.tar.gz: d3c7387992cb45fdad2d4e2d8de4bbffb9f77edd
 SHA512:
-  metadata.gz: 969fd41cda3bd806293f955545b8b424cbb3da04bbab0353267de32ecc3db2f06f7e09bf4c557e96c8ad03bc1244558582fb2a624002ad57d7b4c6668199d43d
-  data.tar.gz: 129595a692c4e5bed2cc34f6bba7099f419cec6ae76ffde2049a0e658867b432391b9059ef9eb97efad0f7f714fd3433faa16b00a608004e3124c430d905e9b9
+  metadata.gz: 76bf22bb22a36ee53fd8a67356b9192f0e6ecb491816b55fbfaab48bbd4bbdbc1d85f4e0374852e6a65960badc025101cb17121995acdbf049c5cc5329bf2c31
+  data.tar.gz: 097b7e17cef92ecefdfd69b431efcb71ce3d76fc269bbac299c8d4ef370910119e0c3688b190ee891888ffde76ceebd22d91b46a20b73fbba4b8f6a1d7405efa

data/lib/mailhandler/receiving/{file_filter → filelist}/base.rb

@@ -5,15 +5,45 @@ module MailHandler
 
   module Receiving
 
+    module FileHandling
+
+      # if file exists, execute file operation, otherwise return default return value when it doesn't
+      def access_file(file, default_return = false, &block)
+
+        if File.exists? file
+
+          begin
+
+            block.call
+
+          rescue => e
+
+            raise e if File.exists? file
+            default_return
+
+          end
+
+        else
+
+          default_return
+
+        end
+
+      end
+
+    end
+
     class FileList
 
-      def self.get(pattern)
+      include FileHandling
 
-        Dir.glob(pattern).map { |file| File.absolute_path(file) }
+      def get(pattern)
+
+        Dir.glob(pattern)
 
       end
 
-      def self.sort(files)
+      def sort(files)
 
         swapped = true
         j = 0
@@ -25,7 +55,10 @@ module MailHandler
 
           (files.size - j).times do |i|
 
-            if File.new(files[i]).ctime < File.new(files[i + 1]).ctime
+            file1 = access_file(files[i], false) { File.new(files[i]).ctime }
+            file2 = access_file(files[i+1], false) { File.new(files[i+1]).ctime }
+
+            if file1 && file2 && file1 < file2
               tmp = files[i]
               files[i] = files[i + 1]
               files[i + 1] = tmp

data/lib/mailhandler/receiving/folder.rb

@@ -1,7 +1,7 @@
 require 'mail'
 require_relative 'base.rb'
 require_relative '../errors'
-require_relative 'file_filter/filter.rb'
+require_relative 'filelist/filter.rb'
 
 module MailHandler
 
@@ -9,6 +9,8 @@ module MailHandler
 
     class FolderChecker < Checker
 
+      include FileHandling
+
       # folders in which emails will be searched for and managed
       attr_accessor :inbox_folder,
                     :archive_folder
@@ -31,7 +33,7 @@ module MailHandler
 
         unless email_files.empty?
 
-          @found_emails = read_found_emails(email_files, search_options[:count])
+          @found_emails = parse_email_from_files(email_files, search_options[:count])
           move_files(email_files) if search_options[:archive]
 
         end
@@ -57,17 +59,12 @@ module MailHandler
 
       end
 
-      def read_found_emails(files, count)
-
-        files.first(count).map { |file| Mail.read(file ) }
-
-      end
-
       # find files by FILE_SEARCH_CLASSES options
       # this will ignore filter criteria options which can't be done on files directly
       def find_files(options)
 
-        files = FileList.get(search_pattern)
+        file_list = FileList.new
+        files = file_list.get(search_pattern)
 
         options.each do |key, value|
 
@@ -75,30 +72,45 @@ module MailHandler
 
         end
 
-        FileList.sort(files)
+        file_list.sort(files)
 
       end
 
       def move_files(files)
 
-        files.each do |file|
+        files.each { |file| (inbox_folder == archive_folder)? delete_file(file) : archive_file(file) }
+
+      end
+
+      def parse_email_from_files(files, count)
+
+        read_files(files, count).map { |email_string| Mail.read_from_string(email_string) }
+
+      end
 
-          file = File.basename(file)
-          (inbox_folder == archive_folder)? delete_file(file) : archive_file(file)
+      def read_files(files, count)
+
+        file_contents = []
+        files.first(count).each do |file|
+
+          file_content = access_file(file, nil) { File.read(file ) }
+          file_contents << file_content unless file_content.nil?
 
         end
 
+        file_contents
+
       end
 
       def archive_file(file)
 
-        FileUtils.mv("#{inbox_folder}/#{file}", "#{archive_folder}/#{file}")
+        access_file(file) { FileUtils.mv("#{inbox_folder}/#{File.basename(file)}", "#{archive_folder}/#{File.basename(file)}") }
 
       end
 
       def delete_file(file)
 
-        FileUtils.rm_r "#{inbox_folder}/#{file}", :force => false
+        access_file(file) { FileUtils.rm_r "#{inbox_folder}/#{File.basename(file)}", :force => false }
 
       end
 

data/lib/mailhandler/version.rb

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

metadata

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