mailhandler 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a290f9049b44faf3abc87592583dfd76063c5442
-  data.tar.gz: 61bdcf1d9d8c1355463d5e7bc0678158e7087864
+  metadata.gz: c27c5a6bcd4af8802a454e343c1e7978b655e237
+  data.tar.gz: eb4a2f4637c35f9b63c46727d190a0328eb9d210
 SHA512:
-  metadata.gz: c9c6e5a41a9f4dbb9ec1631be903839104f52fd10a1aec1d182dd9a320131481b29b79ad22c5368d40b7e422b77699fd3a567e2c59f7002f0b48683234020007
-  data.tar.gz: 6409f13a167cef7deaf8ebb9aac4be757626f5a39d148b77667f26e3da5025852d0f84a7d49078203d7c19e969a62aae525b7b1b810eb449b4ccc5075e23c56f
+  metadata.gz: 166964ab0416a5c07492eb73ec3626f041f77712dda85c3807372ba1472ceb658120c42e7f41af9aa92d2b3e4829fc0d8b909aefc52ab107144e75461e8be932
+  data.tar.gz: 6982dcdf0315ede236c6118c5f4af5270b3c91c4305f4e212fbe7126ac95b592079c6823af912573b7a34a49d4da14e5506df4854aad3775e2dcde97922ac1bf

data/lib/mailhandler/errors.rb

@@ -10,5 +10,6 @@ module MailHandler
 
   class UnknownError        < Error; end
   class TypeError           < Error; end
+  class FileError           < Error; end
 
 end

data/lib/mailhandler/receiving/folder.rb

@@ -26,6 +26,7 @@ module MailHandler
       def find(options)
 
         verify_and_set_search_options(options)
+        verify_mailbox_folders
         email_files = find_files(search_options)
 
         unless email_files.empty?
@@ -42,7 +43,7 @@ module MailHandler
       private
 
       # filter options which need to be done by searching files
-      FILE_SEARCH_OPTIONS = {
+      FILE_SEARCH_CLASSES = {
 
           :by_subject => Filter::ByContent,
           :by_content => Filter::ByContent,
@@ -67,7 +68,7 @@ module MailHandler
 
       end
 
-      # find files by FILE_SEARCH_OPTIONS options
+      # 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)
 
@@ -75,7 +76,7 @@ module MailHandler
 
         options.each do |key, value|
 
-          files = (files & FILE_SEARCH_OPTIONS[key].new(value).get(search_pattern)) if FILE_SEARCH_OPTIONS[key] != nil
+          files = (files & FILE_SEARCH_CLASSES[key].new(value).get(search_pattern)) if FILE_SEARCH_CLASSES[key] != nil
 
         end
 
@@ -85,33 +86,31 @@ module MailHandler
 
       def move_files(files)
 
-        setup_inbox_folders
-
         files.each do |file|
 
           file = File.basename(file)
+          (inbox_folder == archive_folder)? delete_file(file) : archive_file(file)
 
-          if inbox_folder != archive_folder
+        end
 
-            FileUtils.mv("#{inbox_folder}/#{file}", "#{archive_folder}/#{file}")
+      end
 
-          else
+      def archive_file(file)
 
-            FileUtils.rm_r "#{inbox_folder}/#{file}", :force => true
+        FileUtils.mv("#{inbox_folder}/#{file}", "#{archive_folder}/#{file}")
 
-          end
+      end
 
-        end
+      def delete_file(file)
 
-      end
+        FileUtils.rm_r "#{inbox_folder}/#{file}", :force => true
 
-      # create folders if they don't exist
-      def setup_inbox_folders
+      end
 
-        raise MailHandler::Error, 'Folder variables are not set' if inbox_folder.nil? or archive_folder.nil?
+      def verify_mailbox_folders
 
-        Dir::mkdir inbox_folder unless File.directory? inbox_folder
-        Dir::mkdir archive_folder unless File.directory? archive_folder
+        raise MailHandler::Error, 'Folder variables are not set.' if inbox_folder.nil? or archive_folder.nil?
+        raise MailHandler::FileError, 'Mailbox folders do not exist.' unless File.directory? inbox_folder and File.directory? archive_folder
 
       end
 

data/lib/mailhandler/receiving/imap.rb

@@ -122,6 +122,7 @@ module MailHandler
 
             else
 
+              # do nothing
 
           end
 

data/lib/mailhandler/version.rb

@@ -1,5 +1,5 @@
 module MailHandler
 
-  VERSION = '1.0.10'
+  VERSION = '1.0.11'
 
 end

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

@@ -199,9 +199,15 @@ describe MailHandler::Receiving::FolderChecker do
 
         context 'archiving emails' do
 
+          before(:each) {
+
+            FileUtils.mkdir "#{data_folder}/checked" unless Dir.exists? "#{data_folder}/checked"
+
+          }
+
           after(:each) {
 
-            FileUtils.rm_r "#{data_folder}/checked", :force => true
+            FileUtils.rm_r "#{data_folder}/checked", :force => false if Dir.exists? "#{data_folder}"
 
           }
 
@@ -235,7 +241,6 @@ describe MailHandler::Receiving::FolderChecker do
             checker_archive.find({:by_subject => mail.subject, :archive => true})
             expect(checker_archive.found_emails).to be_empty
 
-
           end
 
         end
@@ -246,4 +251,23 @@ describe MailHandler::Receiving::FolderChecker do
 
   end
 
+  context 'invalid folders' do
+
+    it 'inbox folder' do
+
+      checker = MailHandler::Receiving::FolderChecker.new('test', data_folder)
+      expect { checker.find :count => 1 }.to raise_error MailHandler::FileError
+
+    end
+
+    it 'archive folder' do
+
+      checker = MailHandler::Receiving::FolderChecker.new(data_folder, 'test')
+      expect { checker.find :count => 1 }.to raise_error MailHandler::FileError
+
+    end
+
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailhandler
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Igor Balos