Merge remote-tracking branch 'jpmckinney_github/extract_method5' into rails-3-develop

1 files changed, 35 insertions, 50 deletions

diff --git a/app/mailers/request_mailer.rb b/app/mailers/request_mailer.rb
index f2298f368..f12b4a0d6 100644
--- a/app/mailers/request_mailer.rb
+++ b/app/mailers/request_mailer.rb
@@ -100,13 +100,8 @@ class RequestMailer < ApplicationMailer
         @url = confirm_url(:email_token => post_redirect.email_token)
         @info_request = info_request
 
-        headers('Return-Path' => blackhole_email, 'Reply-To' => contact_from_name_and_email, # not much we can do if the user's email is broken
-                'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834
-                'X-Auto-Response-Suppress' => 'OOF')
-
-        mail(:from => contact_from_name_and_email,
-             :to => user.name_and_email,
-             :subject => _("Delayed response to your FOI request - ") + info_request.title.html_safe)
+        auto_generated_headers
+        mail_user_with_info_request_title(user, _("Delayed response to your FOI request - "), info_request)
     end
 
     # Tell the requester that the public body is very late in replying
@@ -120,13 +115,8 @@ class RequestMailer < ApplicationMailer
         @url = confirm_url(:email_token => post_redirect.email_token)
         @info_request = info_request
 
-        headers('Return-Path' => blackhole_email, 'Reply-To' => contact_from_name_and_email, # not much we can do if the user's email is broken
-                'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834
-                'X-Auto-Response-Suppress' => 'OOF')
-
-        mail(:from => contact_from_name_and_email,
-             :to => user.name_and_email,
-             :subject => _("You're long overdue a response to your FOI request - ") + info_request.title.html_safe)
+        auto_generated_headers
+        mail_user_with_info_request_title(user, _("You're long overdue a response to your FOI request - "), info_request)
     end
 
     # Tell the requester that they need to say if the new response
@@ -142,13 +132,8 @@ class RequestMailer < ApplicationMailer
         @incoming_message = incoming_message
         @info_request = info_request
 
-        headers('Return-Path' => blackhole_email, 'Reply-To' => contact_from_name_and_email, # not much we can do if the user's email is broken
-                'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834
-                'X-Auto-Response-Suppress' => 'OOF')
-
-        mail(:from => contact_from_name_and_email,
-             :to => info_request.user.name_and_email,
-             :subject => _("Was the response you got to your FOI request any good?"))
+        auto_generated_headers
+        mail_user(info_request.user, _("Was the response you got to your FOI request any good?"))
     end
 
     # Tell the requester that someone updated their old unclassified request
@@ -156,13 +141,8 @@ class RequestMailer < ApplicationMailer
         @url = request_url(info_request)
         @info_request = info_request
 
-        headers('Return-Path' => blackhole_email, 'Reply-To' => contact_from_name_and_email, # not much we can do if the user's email is broken
-                'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834
-                'X-Auto-Response-Suppress' => 'OOF')
-
-        mail(:from => contact_from_name_and_email,
-             :to => info_request.user.name_and_email,
-             :subject => _("Someone has updated the status of your request"))
+        auto_generated_headers
+        mail_user(info_request.user, _("Someone has updated the status of your request"))
     end
 
     # Tell the requester that they need to clarify their request
@@ -178,13 +158,8 @@ class RequestMailer < ApplicationMailer
         @incoming_message = incoming_message
         @info_request = info_request
 
-        headers('Return-Path' => blackhole_email, 'Reply-To' => contact_from_name_and_email, # not much we can do if the user's email is broken
-                'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834
-                'X-Auto-Response-Suppress' => 'OOF')
-
-        mail(:from => contact_from_name_and_email,
-             :to => info_request.user.name_and_email,
-             :subject => _("Clarify your FOI request - ") + info_request.title.html_safe)
+        auto_generated_headers
+        mail_user_with_info_request_title(info_request.user, _("Clarify your FOI request - "), info_request)
     end
 
     # Tell requester that somebody add an annotation to their request
@@ -192,25 +167,15 @@ class RequestMailer < ApplicationMailer
         @comment, @info_request = comment, info_request
         @url = comment_url(comment)
 
-        headers('Return-Path' => blackhole_email, 'Reply-To' => contact_from_name_and_email, # not much we can do if the user's email is broken
-                'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834
-                'X-Auto-Response-Suppress' => 'OOF')
-
-        mail(:from => contact_from_name_and_email,
-             :to => info_request.user.name_and_email,
-             :subject => _("Somebody added a note to your FOI request - ") + info_request.title.html_safe)
+        auto_generated_headers
+        mail_user_with_info_request_title(info_request.user, _("Somebody added a note to your FOI request - "), info_request)
     end
     def comment_on_alert_plural(info_request, count, earliest_unalerted_comment)
         @count, @info_request = count, info_request
         @url = comment_url(earliest_unalerted_comment)
 
-        headers('Return-Path' => blackhole_email, 'Reply-To' => contact_from_name_and_email, # not much we can do if the user's email is broken
-                'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834
-                'X-Auto-Response-Suppress' => 'OOF')
-
-        mail(:from => contact_from_name_and_email,
-             :to => info_request.user.name_and_email,
-             :subject => _("Some notes have been added to your FOI request - ") + info_request.title.html_safe)
+        auto_generated_headers
+        mail_user_with_info_request_title(info_request.user, _("Some notes have been added to your FOI request - "), info_request)
     end
 
     # Class function, called by script/mailin with all incoming responses.
@@ -468,7 +433,27 @@ class RequestMailer < ApplicationMailer
         end
     end
 
+    private
 
-end
+    def auto_generated_headers
+        headers({
+            'Return-Path' => blackhole_email,
+            'Reply-To' => contact_from_name_and_email, # not much we can do if the user's email is broken
+            'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834
+            'X-Auto-Response-Suppress' => 'OOF',
+        })
+    end
 
+    def mail_user_with_info_request_title(user, subject, info_request)
+        mail_user(user, subject + info_request.title.html_safe)
+    end
+
+    def mail_user(user, subject)
+        mail({
+            :from => contact_from_name_and_email,
+            :to => user.name_and_email,
+            :subject => subject,
+        })
+    end
 
+end