make visible_text strip extra new lines

allow header line to have spaces before the dashes

Author: Drew Batshaw

lib/email_reply_parser.rb

@@ -58,7 +58,7 @@ def initialize
 
 
     def visible_text
-      fragments.select{|f| !f.hidden?}.map{|f| f.to_s}.join("\n")
+      fragments.select{|f| !f.hidden?}.map{|f| f.to_s}.join("\n").rstrip
     end
 
     # Splits the given text into a list of Fragments.  This is roughly done by
@@ -127,7 +127,7 @@ def scan_line(line)
       # Mark the current Fragment as a signature if the current line is empty
       # and the Fragment starts with a common signature indicator.
       if @fragment && line == EMPTY
-        if @fragment.lines.last =~ /[\-\_]$/
+        if @fragment.lines.last =~ /[\-\_]\s*$/
           @fragment.signature = true
           finish_fragment
         end

test/email_reply_parser_test.rb

@@ -78,8 +78,13 @@ def test_does_not_modify_input_string
   end
 
   def test_returns_only_the_visible_fragments_as_a_string
-    reply = email(:email_1_2)
-    assert_equal reply.fragments.select{|r| !r.hidden?}.map{|r| r.to_s}.join("\n"), reply.visible_text
+    reply = email(:email_2_1)
+    assert_equal reply.fragments.select{|r| !r.hidden?}.map{|r| r.to_s}.join("\n").rstrip, reply.visible_text
+  end
+
+  def test_parse_out_just_top_for_outlook_reply
+    body = IO.read EMAIL_FIXTURE_PATH.join("email_2_1.txt").to_s
+    assert_equal "Outlook with a reply", EmailReplyParser.parse_reply(body)
   end
 
   def test_parse_reply

test/emails/email_2_1.txt

@@ -0,0 +1,25 @@
+Outlook with a reply
+
+
+ ------------------------------
+
+*From:* Google Apps Sync Team [mailto:mail-noreply@google.com]
+*Sent:* Thursday, February 09, 2012 1:36 PM
+*To:* jow@xxxx.com
+*Subject:* Google Apps Sync was updated!
+
+
+
+Dear Google Apps Sync user,
+
+Google Apps Sync for Microsoft Outlook® was recently updated. Your computer
+now has the latest version (version 2.5). This release includes bug fixes
+to improve product reliability. For more information about these and other
+changes, please see the help article here:
+
+http://www.google.com/support/a/bin/answer.py?answer=153463
+
+Sincerely,
+
+The Google Apps Sync Team.
+