Add address wrapping

Makes it easier to deal with addresses that may already have been converted

2 files changed, 16 insertions, 0 deletions

diff --git a/lib/action_mailbox/mail_ext/address_wrapping.rb b/lib/action_mailbox/mail_ext/address_wrapping.rb
new file mode 100644
index 0000000000..f41087a450
--- /dev/null
+++ b/lib/action_mailbox/mail_ext/address_wrapping.rb
@@ -0,0 +1,5 @@
+class Mail::Address
+  def self.wrap(address)
+    address.is_a?(Mail::Address) ? address : Mail::Address.new(address)
+  end
+end
diff --git a/test/unit/mail_ext/address_wrapping_test.rb b/test/unit/mail_ext/address_wrapping_test.rb
new file mode 100644
index 0000000000..6baa360f3e
--- /dev/null
+++ b/test/unit/mail_ext/address_wrapping_test.rb
@@ -0,0 +1,11 @@
+require_relative '../../test_helper'
+
+module MailExt
+  class AddressWrappingTest < ActiveSupport::TestCase
+    test "wrap" do
+      needing_wrapping    = Mail::Address.wrap("david@basecamp.com")
+      wrapping_not_needed = Mail::Address.wrap(Mail::Address.new("david@basecamp.com"))
+      assert_equal needing_wrapping.address, wrapping_not_needed.address
+    end
+  end
+end