diff options
| -rw-r--r-- | app/models/incoming_message.rb | 13 | ||||
| -rw-r--r-- | spec/models/incoming_message_spec.rb | 11 | ||||
| -rw-r--r-- | todo.txt | 2 |
3 files changed, 23 insertions, 3 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index fe1f9a2ac..9b3f8d052 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -19,7 +19,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: incoming_message.rb,v 1.193 2009-03-17 23:36:41 francis Exp $ +# $Id: incoming_message.rb,v 1.194 2009-03-17 23:55:33 francis Exp $ # TODO # Move some of the (e.g. quoting) functions here into rblib, as they feel @@ -238,11 +238,18 @@ class FOIAttachment end def display_filename + filename = self._internal_display_filename + + # Remove slashes, they mess with URLs + filename.gsub!(/\//, "-") + + return filename + end + + def _internal_display_filename calc_ext = mimetype_to_extension(@content_type) if @filename - # Remove slashes, they mess with URLs - filename = @filename.gsub(/\//, "-") # Put right extension on if missing if !filename.match(/\.#{calc_ext}$/) && calc_ext filename + "." + calc_ext diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index b962e5707..d1738f6de 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -22,11 +22,22 @@ describe IncomingMessage, " display attachments" do it "should not show slashes in filenames" do foi_attachment = FOIAttachment.new() + # http://www.whatdotheyknow.com/request/post_commercial_manager_librarie#incoming-17233 foi_attachment.filename = "FOI/09/066 RESPONSE TO FOI REQUEST RECEIVED 21st JANUARY 2009.txt" expected_display_filename = foi_attachment.filename.gsub(/\//, "-") foi_attachment.display_filename.should == expected_display_filename end + it "should not show slashes in subject generated filenames" do + foi_attachment = FOIAttachment.new() + # http://www.whatdotheyknow.com/request/post_commercial_manager_librarie#incoming-17233 + foi_attachment.within_rfc822_subject = "FOI/09/066 RESPONSE TO FOI REQUEST RECEIVED 21st JANUARY 2009" + foi_attachment.content_type = 'text/plain' + expected_display_filename = foi_attachment.within_rfc822_subject.gsub(/\//, "-") + ".txt" + foi_attachment.display_filename.should == expected_display_filename + end + + end @@ -2,6 +2,8 @@ Next (things that will reduce admin time mainly) ==== +Check #email_subscriptions in unsubscribe link + Change text so that overdue covers qualified exemption of public interest test being valid reason for delay. |