diff options
| -rw-r--r-- | app/models/info_request.rb | 14 | ||||
| -rw-r--r-- | app/models/outgoing_mailer.rb | 2 | ||||
| -rw-r--r-- | spec/fixtures/raw_emails.yml | 2 | ||||
| -rw-r--r-- | spec/models/outgoing_mailer_spec.rb | 47 | ||||
| -rw-r--r-- | todo.txt | 2 |
5 files changed, 61 insertions, 6 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 8cfc61c4e..6faf0dbad 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -202,6 +202,8 @@ public # Subject lines for emails about the request def email_subject_request + # XXX pull out this general_register_office specialisation + # into some sort of separate jurisdiction dependent file if self.public_body.url_name == 'general_register_office' # without GQ in the subject, you just get an auto response self.law_used_full + ' request GQ - ' + self.title @@ -209,11 +211,15 @@ public self.law_used_full + ' request - ' + self.title end end - def email_subject_followup - if self.public_body.url_name == 'general_register_office' - 'Re: ' + self.law_used_full + ' request GQ - ' + self.title + def email_subject_followup(incoming_message = nil) + if incoming_message.nil? + 'Re: ' + self.email_subject_request else - 'Re: ' + self.law_used_full + ' request - ' + self.title + if incoming_message.mail.subject.match(/^Re:/i) + incoming_message.mail.subject + else + 'Re: ' + incoming_message.mail.subject + end end end diff --git a/app/models/outgoing_mailer.rb b/app/models/outgoing_mailer.rb index ae7e86f4e..1546d3fd0 100644 --- a/app/models/outgoing_mailer.rb +++ b/app/models/outgoing_mailer.rb @@ -73,7 +73,7 @@ class OutgoingMailer < ApplicationMailer if outgoing_message.what_doing == 'internal_review' return "Internal review of " + info_request.email_subject_request else - return info_request.email_subject_followup + return info_request.email_subject_followup(outgoing_message.incoming_message_followup) end end # Whether we have a valid email address for a followup diff --git a/spec/fixtures/raw_emails.yml b/spec/fixtures/raw_emails.yml index 4930e9966..d24b61854 100644 --- a/spec/fixtures/raw_emails.yml +++ b/spec/fixtures/raw_emails.yml @@ -6,7 +6,7 @@ useless_raw_email: Date: Tue, 13 Nov 2007 11:39:55 +0000 NoCc: foi+request-1-4b571715@cat Bcc: - Subject: Re: Freedom of Information Request - Why do you have such a fancy dog? + Subject: Geraldine FOI Code AZXB421 Reply-To: In-Reply-To: <471f1eae5d1cb_7347..fdbe67386163@cat.tmail> diff --git a/spec/models/outgoing_mailer_spec.rb b/spec/models/outgoing_mailer_spec.rb index de59b09b2..0bbe39cad 100644 --- a/spec/models/outgoing_mailer_spec.rb +++ b/spec/models/outgoing_mailer_spec.rb @@ -66,4 +66,51 @@ describe OutgoingMailer, " when working out follow up addresses" do end +describe OutgoingMailer, "when working out follow up subjects" do + fixtures :info_requests, :incoming_messages, :outgoing_messages + + it "should prefix the title with 'Freedom of Information request -' for initial requests" do + ir = info_requests(:fancy_dog_request) + im = ir.incoming_messages[0] + + ir.email_subject_request.should == "Freedom of Information request - Why do you have & such a fancy dog?" + end + + it "should use 'Re:' and inital request subject for followups which aren't replies to particular messages" do + ir = info_requests(:fancy_dog_request) + om = outgoing_messages(:useless_outgoing_message) + + OutgoingMailer.subject_for_followup(ir, om).should == "Re: Freedom of Information request - Why do you have & such a fancy dog?" + end + + it "should prefix with Re: the subject of the message being replied to" do + ir = info_requests(:fancy_dog_request) + im = ir.incoming_messages[0] + om = outgoing_messages(:useless_outgoing_message) + om.incoming_message_followup = im + + OutgoingMailer.subject_for_followup(ir, om).should == "Re: Geraldine FOI Code AZXB421" + end + + it "should not add Re: prefix if there already is such a prefix" do + ir = info_requests(:fancy_dog_request) + im = ir.incoming_messages[0] + om = outgoing_messages(:useless_outgoing_message) + om.incoming_message_followup = im + + im.raw_email.data = im.raw_email.data.sub("Subject: Geraldine FOI Code AZXB421", "Subject: Re: Geraldine FOI Code AZXB421") + OutgoingMailer.subject_for_followup(ir, om).should == "Re: Geraldine FOI Code AZXB421" + end + + it "should not add Re: prefix if there already is a lower case re: prefix" do + ir = info_requests(:fancy_dog_request) + im = ir.incoming_messages[0] + om = outgoing_messages(:useless_outgoing_message) + om.incoming_message_followup = im + + im.raw_email.data = im.raw_email.data.sub("Subject: Geraldine FOI Code AZXB421", "Subject: re: Geraldine FOI Code AZXB421") + OutgoingMailer.subject_for_followup(ir, om).should == "re: Geraldine FOI Code AZXB421" + end +end + @@ -7,6 +7,8 @@ http://www.whatdotheyknow.com/request/causes_of_the_financial_crisis#incoming-12 * write some tests first, of every kind of followup * grep for subject_for_followup and email_subject_request +Make it so when you make followups the whole request is shown on the page. + Finish profile photo Ask people for annotation immediately after they have submitted their request |