Ensure that all lines of underscores have at least two preceding newlines

Author: ndbroadbent

lib/email_reply_parser.rb

@@ -83,6 +83,12 @@ def read(text)
         text.gsub! $1, $1.gsub("\n", " ")
       end
 
+      # Some users may reply directly above a line of underscores.
+      # In order to ensure that these fragments are split correctly,
+      # make sure that all lines of underscores are preceded by
+      # at least two newline characters.
+      text.gsub!(/([^\n])(?=\n_{7}_+)$/m, "\\1\n")
+
       # The text is reversed initially due to the way we check for hidden
       # fragments.
       text = text.reverse

test/email_reply_parser_test.rb

@@ -111,6 +111,11 @@ def test_parse_out_just_top_for_outlook_reply
     assert_equal "Outlook with a reply", EmailReplyParser.parse_reply(body)
   end
 
+  def test_parse_out_just_top_for_outlook_with_reply_directly_above_line
+    body = IO.read EMAIL_FIXTURE_PATH.join("email_2_2.txt").to_s
+    assert_equal "Outlook with a reply directly above line", EmailReplyParser.parse_reply(body)
+  end
+
   def test_parse_out_sent_from_iPhone
     body = IO.read EMAIL_FIXTURE_PATH.join("email_iPhone.txt").to_s
     assert_equal "Here is another email", EmailReplyParser.parse_reply(body)

test/emails/email_2_2.txt

@@ -0,0 +1,10 @@
+Outlook with a reply directly above line
+________________________________________
+From: CRM Comments [crm-comment@example.com]
+Sent: Friday, 23 March 2012 5:08 p.m.
+To: John S. Greene
+Subject: [contact:106] John Greene
+
+A new comment has been added to the Contact named 'John Greene':
+
+I am replying to a comment.