mailhandler 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccdd586333da46030574a44e6dcb812da650a587
-  data.tar.gz: 418eab028c86d6e3f0d186b01c412372989a3d10
+  metadata.gz: 638f7cfc88aa7e83259905c127723c0ecc5f26ea
+  data.tar.gz: cbfdb4fa89e30bfd374e850cf63933f753589cac
 SHA512:
-  metadata.gz: f3ba4e02d921daaa54f8d8188cde334877599610956675411fc328e5bd2d7b998905dd810c8a7f0b7e1dbb32da555043ba33f8542e1fe0454514b0ae52199fdd
-  data.tar.gz: 6ede03e547267d50c50c5dcfa762b0b38ee71d165a63dae979b998be115155759c450157f86219fb5bccd26611c3310d5b7a445a1e0ab55fd0d737c749b8aa75
+  metadata.gz: 78c12824348df632bacb66983cc0d0bd582619af1bca973825d4dcc605b29b14f48d39ff6e8ab79bc880f802bf3937750b74c2314c949cc1aee244fc8c7af891
+  data.tar.gz: 83c3993bace242b2f05ec806f7a2ab8ef5fb478fe3acbdecb444e6be614ed92bc5a3d27f74ac3e0cf00b7be26e5190e831caaeb1f515ed8364770e162cf3837c

data/lib/mailhandler/receiving/base.rb

@@ -24,13 +24,12 @@ module MailHandler
 
       DEFAULT_SEARCH_OPTIONS = [
 
-          :count, :archive
+          :archive
       ]
 
       def initialize
 
-        # Default number of email results to return, and whether to archive emails.
-        @search_options = {:count => 50, :archive => false}
+        base_search_options
         reset_found_emails
 
       end
@@ -47,12 +46,25 @@ module MailHandler
 
       end
 
+      def reset_found_emails
+
+        @found_emails = []
+
+      end
+
       protected
 
+      def base_search_options
+
+        # Default number of email results to return, and whether to archive emails.
+        @search_options = {:count => 50, :archive => false}
+
+      end
+
       def verify_and_set_search_options(options)
 
+        base_search_options
         validate_used_options(options)
-        validate_mandatory_options(options)
 
         @search_options = search_options.merge options
         reset_found_emails
@@ -67,24 +79,6 @@ module MailHandler
 
       end
 
-      def validate_mandatory_options(options)
-
-        search = AVAILABLE_SEARCH_OPTIONS - DEFAULT_SEARCH_OPTIONS
-
-        unless search.any? { |e| options[e] != nil }
-
-          raise StandardError, "At least one of the following search options has to be used: #{search}"
-
-        end
-
-      end
-
-      def reset_found_emails
-
-        @found_emails = []
-
-      end
-
     end
 
   end

data/lib/mailhandler/receiving/imap.rb

@@ -85,14 +85,16 @@ module MailHandler
 
         if options[:archive]
 
-          Mail.find_and_delete(:what => :last, :count => search_options[:count], :order => :desc, :keys => imap_filter_keys(options))
+          result = Mail.find_and_delete(:what => :last, :count => search_options[:count], :order => :desc, :keys => imap_filter_keys(options))
 
         else
 
-          Mail.find(:what => :last, :count => search_options[:count], :order => :desc, :keys => imap_filter_keys(options))
+          result = Mail.find(:what => :last, :count => search_options[:count], :order => :desc, :keys => imap_filter_keys(options))
 
         end
 
+        (result.kind_of? Array)? result : [result]
+
       end
 
       def imap_filter_keys(options)
@@ -111,11 +113,15 @@ module MailHandler
 
               keys << 'SUBJECT' << options[:by_subject]
 
+            else
+
+
           end
 
         end
 
-        keys
+        (keys.empty?)? nil : keys
+
 
       end
 

data/lib/mailhandler/version.rb

@@ -1,5 +1,5 @@
 module MailHandler
 
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 
 end

data/mailhandler.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
 
   s.authors     = ["Igor Balos"]
-  s.email       = "ibalosh@gmail.com"
+  s.email       = ["ibalosh@gmail.com", "igor@wildbit.com"]
 
   s.summary     = "Postmark email receiving and sending handler."
   s.description = "Use this gem to send emails through SMTP and Postmark API. Check if email arrived by imap or folder check."
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.files       = `git ls-files`.split($/)
   s.test_files  = `git ls-files -- {spec}/*`.split("\n")
-  s.homepage    = 'https://github.com/ibalosh'
+  s.homepage    = 'https://github.com/wildbit'
   s.require_paths = ["lib"]
 
   s.post_install_message = %q{

data/readme.md

@@ -1,6 +1,6 @@
 # MailHandler Gem
 
-[![Build Status](https://travis-ci.org/ibalosh/MailHandler.svg?branch=master)](https://travis-ci.org/ibalosh/MailHandler)
+[![Build Status](https://travis-ci.org/wildbit/mailhandler.svg?branch=master)](https://travis-ci.org/wildbit/mailhandler)
 
 MailHandler is a simple wrapper for [mail](https://github.com/mikel/mail) and [postmark](https://github.com/wildbit/postmark-gem) libraries which allows you to send and retrieve emails, 
 and get more details about email sending and delivery. Main purpose of the gem is easier email sending/delivery testing. 
@@ -41,7 +41,7 @@ If you plan to check for an email in your inbox which support IMAP, you can use
  
 ``` ruby
 email_receiver = MailHandler.receiver(:imap) do |checker|
-  checker.address = 'imap.googlemail.com'
+  checker.address = 'imap.example.com'
   checker.port = 993
   checker.username = 'username'
   checker.password = 'password'

data/spec/unit/mailhandler/receiver_spec.rb

@@ -13,6 +13,7 @@ describe MailHandler::Receiver do
       allow(checker).to receive(:find) { sleep receiving_duration; true }
       allow(checker).to receive(:search_result) { true }
       allow(checker).to receive(:found_emails) { [found_email] }
+      allow(checker).to receive(:reset_found_emails) { [] }
       checker
 
     }
@@ -70,6 +71,7 @@ describe MailHandler::Receiver do
         allow(checker).to receive(:find) { sleep 1; false }
         allow(checker).to receive(:search_result) { false }
         allow(checker).to receive(:found_emails) { [] }
+        allow(checker).to receive(:reset_found_emails) { [] }
         checker
 
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailhandler
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Igor Balos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -46,7 +46,9 @@ dependencies:
         version: 1.7.0
 description: Use this gem to send emails through SMTP and Postmark API. Check if email
   arrived by imap or folder check.
-email: ibalosh@gmail.com
+email:
+- ibalosh@gmail.com
+- igor@wildbit.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -88,7 +90,7 @@ files:
 - spec/unit/mailhandler/sending/sender_api_batch_spec.rb
 - spec/unit/mailhandler/sending/sender_api_spec.rb
 - spec/unit/mailhandler_spec.rb
-homepage: https://github.com/ibalosh
+homepage: https://github.com/wildbit
 licenses:
 - MIT
 metadata: {}