mailhandler 1.0.40 → 1.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 056b228a9163d9d2e26aa005ad101f967e2e1cc39bd8fd1b4b9dbafc4c393313
-  data.tar.gz: 411d6e1d41d53a14e90e4293e0092dfa0bca01511c17ef4138879a2770079aef
+  metadata.gz: ec30cb76e980f054f83b42518e4327d3f5fd28a44a166c6bbaba8dcc589de5fb
+  data.tar.gz: 7d2c7c8a6ff038fa791e1fb519a22521876074e9b753b7f91582a0f9adf802c8
 SHA512:
-  metadata.gz: db5f404afdc20afd7f494f4128ed2992bbcdb1586d6db9ec225682daedf48ff27b98a95588e608b131cc87321877794cfd69d819c2a6087cbede64331670cc9e
-  data.tar.gz: 4c0d31bcdb4edb78198c85c2ca3d60f6562b0694ec7c79e156c5a4137a32e86af1b0a97cd38212f26e5f7946c8b5f9ad70131c0587b8221a69a79424ff79b805
+  metadata.gz: c970a64c370a89d34253fdfd22e16381ae8037008ec0baa57a90c89f0385fe56d3d5dfe9d226a79404a1a328a4af73cc99c2d38644dedf1d8d110927a61484e2
+  data.tar.gz: 8c070314f2664729623cf75d268c201d97ba0b41c9ea14fd1cd5991880e46a5b66a34ea9f313e5b73572572f2ee65dcf27c0718a9d1c2eeccc6ce213f63f9c7a

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A sample Gemfile
 source 'https://rubygems.org'
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:default)

data/lib/mailhandler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'mailhandler/sender'
 require_relative 'mailhandler/receiver'
 

data/lib/mailhandler/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MailHandler
   # base error
   class Error < StandardError

data/lib/mailhandler/receiver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'receiving/folder'
 require_relative 'receiving/imap'
 require_relative 'receiving/observer'

data/lib/mailhandler/receiving/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../errors'
 
 module MailHandler

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 # Base filtering class, which is used for reading list of all files based on passed pattern.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../base'
 require_relative '../../../errors'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mail'
 require_relative 'base'
 

data/lib/mailhandler/receiving/folder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mail'
 require_relative 'base.rb'
 require_relative '../errors'

data/lib/mailhandler/receiving/imap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mail'
 require_relative 'base.rb'
 require_relative '../errors'
@@ -92,6 +94,7 @@ module MailHandler
         archive
         by_recipient
         fast_check
+        fetch_type
       ].freeze
 
       RETRY_ON_ERROR_COUNT = 3
@@ -118,7 +121,7 @@ module MailHandler
                                     count: search_options[:count],
                                     order: :desc,
                                     keys: imap_filter_keys(options),
-                                    delete_after_find: options[:archive])
+                                    delete_after_find: options[:archive], fetch_type: options[:fetch_type])
         result.is_a?(Array) ? result : [result]
 
       # Silently ignore IMAP search errors, [RETRY_ON_ERROR_COUNT] times

data/lib/mailhandler/receiving/mail.rb

@@ -1,11 +1,10 @@
+# frozen_string_literal: true
+
 module Mail
   # IMAP class patch to better manage connection and search of emails
   class IMAP
     attr_accessor :imap_connection
 
-    # fetch emails with different flag, to make it work with icloud
-    FETCH_EMAIL_FLAG = "BODY[]" #"RFC822"
-
     def find_emails(options = {}, &block) # rubocop:disable all
       options = validate_options(options)
       options[:read_only] ? imap_connection.examine(options[:mailbox]) : imap_connection.select(options[:mailbox])
@@ -19,8 +18,7 @@ module Mail
       if block_given?
         uids.each do |uid|
           uid = options[:uid].to_i unless options[:uid].nil?
-          fetchdata = imap_connection.uid_fetch(uid, ['RFC822'])[0]
-          new_message = Mail.new(fetchdata.attr['RFC822'])
+          new_message = retrieve_email_content(uid, options[:fetch_type])
           new_message.mark_for_delete = true if options[:delete_after_find]
 
           if block.arity == 3
@@ -39,8 +37,7 @@ module Mail
 
         uids.each do |uid|
           uid = options[:uid].to_i unless options[:uid].nil?
-          fetchdata = imap_connection.uid_fetch(uid, [FETCH_EMAIL_FLAG])[0]
-          emails << Mail.new(fetchdata.attr[FETCH_EMAIL_FLAG])
+          emails << retrieve_email_content(uid, options[:fetch_type])
           imap_connection.uid_store(uid, '+FLAGS', [Net::IMAP::DELETED]) if options[:delete_after_find]
           break unless options[:uid].nil?
         end
@@ -66,5 +63,44 @@ module Mail
     def disconnect
       imap_connection.disconnect if defined?(imap_connection) && imap_connection && !imap_connection.disconnected?
     end
+
+    private
+
+    # fetch emails with different flag
+    # to make it work with icloud
+    FETCH_FLAG = {
+      body: 'BODY[]',
+      rfc: 'RFC822',
+      envelope: 'ENVELOPE'
+    }.freeze
+
+    def retrieve_email_content(uid, flag_type = :body)
+      case flag_type
+      when :body
+        retrieve_email_content_by_body(uid)
+      when :envelope
+        retrieve_email_content_by_envelope(uid)
+
+      else
+        retrieve_email_content_by_body(uid)
+      end
+    end
+
+    def retrieve_email_content_by_body(uid)
+      fetchdata = retrieve_fetch_type_data(FETCH_FLAG[:body], uid)
+      Mail.new(fetchdata)
+    end
+
+    def retrieve_email_content_by_envelope(uid)
+      fetchdata = retrieve_fetch_type_data(FETCH_FLAG[:envelope], uid)
+      mail = Mail.new
+      mail.subject = fetchdata.subject
+      mail
+    end
+
+    def retrieve_fetch_type_data(fetch_type, uid)
+      fetchdata = imap_connection.uid_fetch(uid, fetch_type)[0]
+      fetchdata.attr[fetch_type]
+    end
   end
 end

data/lib/mailhandler/receiving/notification/console.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MailHandler
   module Receiving
     module Notification

data/lib/mailhandler/receiving/notification/email.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'email/content'
 require_relative 'email/states'
 require_relative '../../errors'

data/lib/mailhandler/receiving/notification/email/content.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mail'
 
 module MailHandler

data/lib/mailhandler/receiving/notification/email/states.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../email'
 require_relative '../../../errors'
 

data/lib/mailhandler/receiving/observer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MailHandler
   module Receiving
     # observer handler

data/lib/mailhandler/sender.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'sending/smtp'
 require_relative 'sending/api'
 require_relative 'sending/api_batch'

data/lib/mailhandler/sending/api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mail'
 require 'postmark'
 require_relative 'base.rb'

data/lib/mailhandler/sending/api_batch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'api.rb'
 require_relative '../errors'
 

data/lib/mailhandler/sending/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../errors'
 
 module MailHandler

data/lib/mailhandler/sending/smtp.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/imap'
 require_relative 'base'
 

data/lib/mailhandler/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MailHandler
-  VERSION = '1.0.40'.freeze
+  VERSION = '1.0.41'.freeze
 end

data/mailhandler.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mailhandler/version'

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec'
 require 'mail'
 require 'postmark'

data/spec/unit/mailhandler/receiver_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe MailHandler::Receiver do
@@ -57,7 +59,7 @@ describe MailHandler::Receiver do
       end
     end
 
-    context '.search' do
+    describe '.search' do
       let(:checker) do
         checker = instance_double('Checker')
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe MailHandler::Receiving::Checker do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe MailHandler::Receiving::FolderChecker do
@@ -10,7 +12,7 @@ describe MailHandler::Receiving::FolderChecker do
   context 'search emails' do
     let(:checker) { described_class.new(data_folder, data_folder) }
 
-    context '.find email' do
+    describe '.find email' do
       context 'search options' do
         it 'by multiple search options' do
           time = Time.now

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe MailHandler::Receiving::IMAPChecker do

data/spec/unit/mailhandler/receiving/notification/console_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe MailHandler::Receiving::Notification::Console do

data/spec/unit/mailhandler/receiving/notification/email/content_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe MailHandler::Receiving::Notification::EmailContent do
@@ -7,7 +9,7 @@ describe MailHandler::Receiving::Notification::EmailContent do
   let(:from) { 'igor@example.com' }
   let(:options) { { test: 'test' } }
 
-  context '.email_received' do
+  describe '.email_received' do
     it 'create email' do
       expect(notification_email_content.retrieve(:received, options, 60, from, to)).to be_kind_of Mail::Message
     end
@@ -43,7 +45,7 @@ describe MailHandler::Receiving::Notification::EmailContent do
     end
   end
 
-  context '.email_delayed' do
+  describe '.email_delayed' do
     it 'sender' do
       expect(notification_email_content.retrieve(:delayed, options, 60, from, to)[:from].to_s).to eq from
     end

data/spec/unit/mailhandler/receiving/notification/email_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe MailHandler::Receiving::Notification::Email do

data/spec/unit/mailhandler/sender_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe MailHandler::Sender do

data/spec/unit/mailhandler/sending/sender_api_batch_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe MailHandler::Sending::PostmarkBatchAPISender do

data/spec/unit/mailhandler/sending/sender_api_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe MailHandler::Sending::PostmarkAPISender do

data/spec/unit/mailhandler/sending/sender_smtp_spec.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe MailHandler::Sending::SMTPSender do
   subject(:smtp_sender) { described_class }
 
-  context '.send' do
+  describe '.send' do
     context 'invalid' do
       it 'incorrect mail type' do
         sender = smtp_sender.new
@@ -12,7 +14,7 @@ describe MailHandler::Sending::SMTPSender do
     end
   end
 
-  context '.new' do
+  describe '.new' do
     context 'smtp timeouts' do
       it 'open' do
         sender = smtp_sender.new

data/spec/unit/mailhandler_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe MailHandler::Handler do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailhandler
 version: !ruby/object:Gem::Version
-  version: 1.0.40
+  version: 1.0.41
 platform: ruby
 authors:
 - Igor Balos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2019-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail