Move address_from_name_and_email to mail handler.

3 files changed, 26 insertions, 18 deletions

diff --git a/lib/mail_handler/backends/mail_backend.rb b/lib/mail_handler/backends/mail_backend.rb
index fd2fa627f..bc4bf564c 100644
--- a/lib/mail_handler/backends/mail_backend.rb
+++ b/lib/mail_handler/backends/mail_backend.rb
@@ -29,6 +29,19 @@ module MailHandler
                 part_file_name.nil? ? nil : part_file_name.dup
             end
 
+            # Format
+            def address_from_name_and_email(name, email)
+                if !MySociety::Validate.is_valid_email(email)
+                    raise "invalid email " + email + " passed to address_from_name_and_email"
+                end
+                if name.nil?
+                    return Mail::Address.new(email)
+                end
+                address = Mail::Address.new
+                address.display_name = name
+                address.address = email
+                address.to_s
+            end
         end
     end
 end
\ No newline at end of file
diff --git a/lib/mail_handler/backends/tmail_backend.rb b/lib/mail_handler/backends/tmail_backend.rb
index 0fa90a657..1c5489145 100644
--- a/lib/mail_handler/backends/tmail_backend.rb
+++ b/lib/mail_handler/backends/tmail_backend.rb
@@ -41,6 +41,17 @@ module MailHandler
                 return part_file_name
             end
 
+            def address_from_name_and_email(name, email)
+                if !MySociety::Validate.is_valid_email(email)
+                    raise "invalid email " + email + " passed to address_from_name_and_email"
+                end
+                if name.nil?
+                    return TMail::Address.parse(email)
+                end
+                # Botch an always quoted RFC address, then parse it
+                name = name.gsub(/(["\\])/, "\\\\\\1")
+                TMail::Address.parse('"' + name + '" <' + email + '>').to_s
+            end
         end
     end
 end
\ No newline at end of file
diff --git a/lib/mail_handler/backends/tmail_extensions.rb b/lib/mail_handler/backends/tmail_extensions.rb
index bc994b9f3..9359dfeea 100644
--- a/lib/mail_handler/backends/tmail_extensions.rb
+++ b/lib/mail_handler/backends/tmail_extensions.rb
@@ -74,22 +74,6 @@ module TMail
 
     end
 
-    class Address
-        # Monkeypatch! Constructor which makes a TMail::Address given
-        # a name and an email
-        def Address.address_from_name_and_email(name, email)
-            if !MySociety::Validate.is_valid_email(email)
-                raise "invalid email " + email + " passed to address_from_name_and_email"
-            end
-            if name.nil?
-                return TMail::Address.parse(email)
-            end
-            # Botch an always quoted RFC address, then parse it
-            name = name.gsub(/(["\\])/, "\\\\\\1")
-            return TMail::Address.parse('"' + name + '" <' + email + '>')
-        end
-    end
-
     module TextUtils
         # Monkeypatch! Much more aggressive list of characters to cause quoting
         # than in normal TMail. e.g. Have found real cases where @ needs quoting.
@@ -101,8 +85,8 @@ module TMail
     end
 end
 
-# Monkeypatch! TMail 1.2.7.1 will parse only one address out of a list of addresses with 
-# unquoted display parts https://github.com/mikel/tmail/issues#issue/9 - this monkeypatch 
+# Monkeypatch! TMail 1.2.7.1 will parse only one address out of a list of addresses with
+# unquoted display parts https://github.com/mikel/tmail/issues#issue/9 - this monkeypatch
 # fixes this issue.
 module TMail