Move address_from_name_and_email to mail handler.

7 files changed, 33 insertions, 24 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index e1885dee6..85524e798 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -275,7 +275,7 @@ public
         return self.magic_email("request-")
     end
     def incoming_name_and_email
-        return TMail::Address.address_from_name_and_email(self.user_name, self.incoming_email).to_s
+        return MailHandler.address_from_name_and_email(self.user_name, self.incoming_email)
     end
 
     # Subject lines for emails about the request
@@ -707,11 +707,11 @@ public
         return self.public_body.is_followupable?
     end
     def recipient_name_and_email
-        return TMail::Address.address_from_name_and_email(
+        return MailHandler.address_from_name_and_email(
             _("{{law_used}} requests at {{public_body}}",
                 :law_used => self.law_used_short,
                 :public_body => self.public_body.short_or_long_name),
-            self.recipient_email).to_s
+            self.recipient_email)
     end
 
     # History of some things that have happened
diff --git a/app/models/outgoing_mailer.rb b/app/models/outgoing_mailer.rb
index 277794c69..503166b8a 100644
--- a/app/models/outgoing_mailer.rb
+++ b/app/models/outgoing_mailer.rb
@@ -47,7 +47,8 @@ class OutgoingMailer < ApplicationMailer
             return info_request.recipient_name_and_email
         else
             # calling safe_mail_from from so censor rules are run
-            return TMail::Address.address_from_name_and_email(incoming_message_followup.safe_mail_from, incoming_message_followup.from_email).to_s
+            return MailHandler.address_from_name_and_email(incoming_message_followup.safe_mail_from,
+                                                           incoming_message_followup.from_email)
         end
     end
     # Used in the preview of followup
diff --git a/app/models/user.rb b/app/models/user.rb
index 70386f7e4..6e1e21481 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -203,7 +203,7 @@ class User < ActiveRecord::Base
 
 # For use in to/from in email messages
     def name_and_email
-        return TMail::Address.address_from_name_and_email(self.name, self.email).to_s
+        return MailHandler.address_from_name_and_email(self.name, self.email)
     end
 
     # The "internal admin" is a special user for internal use.
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
 
diff --git a/spec/models/track_mailer_spec.rb b/spec/models/track_mailer_spec.rb
index 1bf77dab5..9bf03c3d0 100644
--- a/spec/models/track_mailer_spec.rb
+++ b/spec/models/track_mailer_spec.rb
@@ -169,7 +169,7 @@ describe TrackMailer do
 
         it 'should deliver one email, with right headers' do
             @user = mock_model(User,
-                    :name_and_email => TMail::Address.address_from_name_and_email('Tippy Test', 'tippy@localhost'),
+                    :name_and_email => MailHandler.address_from_name_and_email('Tippy Test', 'tippy@localhost'),
                     :url_name => 'tippy_test'
             )