From 6c168aaffb37c62dee6c895a22e240e5552be669 Mon Sep 17 00:00:00 2001 From: George Claghorn Date: Wed, 26 Dec 2018 16:18:42 -0500 Subject: Nest Action Mailbox classes in the API docs --- .../action_mailbox/mail_ext/address_equality.rb | 8 +++-- .../action_mailbox/mail_ext/address_wrapping.rb | 8 +++-- .../lib/action_mailbox/mail_ext/addresses.rb | 38 ++++++++++++---------- .../lib/action_mailbox/mail_ext/recipients.rb | 8 +++-- 4 files changed, 35 insertions(+), 27 deletions(-) (limited to 'actionmailbox/lib/action_mailbox/mail_ext') diff --git a/actionmailbox/lib/action_mailbox/mail_ext/address_equality.rb b/actionmailbox/lib/action_mailbox/mail_ext/address_equality.rb index 69243a666e..39a43b3468 100644 --- a/actionmailbox/lib/action_mailbox/mail_ext/address_equality.rb +++ b/actionmailbox/lib/action_mailbox/mail_ext/address_equality.rb @@ -1,7 +1,9 @@ # frozen_string_literal: true -class Mail::Address - def ==(other_address) - other_address.is_a?(Mail::Address) && to_s == other_address.to_s +module Mail + class Address + def ==(other_address) + other_address.is_a?(Mail::Address) && to_s == other_address.to_s + end end end diff --git a/actionmailbox/lib/action_mailbox/mail_ext/address_wrapping.rb b/actionmailbox/lib/action_mailbox/mail_ext/address_wrapping.rb index fcdfbb6f6f..19eb624c1c 100644 --- a/actionmailbox/lib/action_mailbox/mail_ext/address_wrapping.rb +++ b/actionmailbox/lib/action_mailbox/mail_ext/address_wrapping.rb @@ -1,7 +1,9 @@ # frozen_string_literal: true -class Mail::Address - def self.wrap(address) - address.is_a?(Mail::Address) ? address : Mail::Address.new(address) +module Mail + class Address + def self.wrap(address) + address.is_a?(Mail::Address) ? address : Mail::Address.new(address) + end end end diff --git a/actionmailbox/lib/action_mailbox/mail_ext/addresses.rb b/actionmailbox/lib/action_mailbox/mail_ext/addresses.rb index 377373bee6..5eab1feb3d 100644 --- a/actionmailbox/lib/action_mailbox/mail_ext/addresses.rb +++ b/actionmailbox/lib/action_mailbox/mail_ext/addresses.rb @@ -1,27 +1,29 @@ # frozen_string_literal: true -class Mail::Message - def from_address - header[:from]&.address_list&.addresses&.first - end +module Mail + class Message + def from_address + header[:from]&.address_list&.addresses&.first + end - def recipients_addresses - to_addresses + cc_addresses + bcc_addresses + x_original_to_addresses - end + def recipients_addresses + to_addresses + cc_addresses + bcc_addresses + x_original_to_addresses + end - def to_addresses - Array(header[:to]&.address_list&.addresses) - end + def to_addresses + Array(header[:to]&.address_list&.addresses) + end - def cc_addresses - Array(header[:cc]&.address_list&.addresses) - end + def cc_addresses + Array(header[:cc]&.address_list&.addresses) + end - def bcc_addresses - Array(header[:bcc]&.address_list&.addresses) - end + def bcc_addresses + Array(header[:bcc]&.address_list&.addresses) + end - def x_original_to_addresses - Array(header[:x_original_to]).collect { |header| Mail::Address.new header.to_s } + def x_original_to_addresses + Array(header[:x_original_to]).collect { |header| Mail::Address.new header.to_s } + end end end diff --git a/actionmailbox/lib/action_mailbox/mail_ext/recipients.rb b/actionmailbox/lib/action_mailbox/mail_ext/recipients.rb index a8ac42d602..1f8a713218 100644 --- a/actionmailbox/lib/action_mailbox/mail_ext/recipients.rb +++ b/actionmailbox/lib/action_mailbox/mail_ext/recipients.rb @@ -1,7 +1,9 @@ # frozen_string_literal: true -class Mail::Message - def recipients - Array(to) + Array(cc) + Array(bcc) + Array(header[:x_original_to]).map(&:to_s) +module Mail + class Message + def recipients + Array(to) + Array(cc) + Array(bcc) + Array(header[:x_original_to]).map(&:to_s) + end end end -- cgit v1.2.3