Merge pull request #40 from hkdobrev/singature-no-empty-line

Find signatures with no empty line above
willdurand · Sep 24, 2015 · b32ab72 · b32ab72
2 parents b9da621 + 9e1fea1
commit b32ab72
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 2 deletions.
diff --git a/src/EmailReplyParser/Parser/EmailParser.php b/src/EmailReplyParser/Parser/EmailParser.php
@@ -66,15 +66,15 @@ public function parse($text)
                 $line = ltrim($line);
             }
 
-            if ($fragment && empty($line)) {
+            if ($fragment) {
                 $last = end($fragment->lines);
 
                 if ($this->isSignature($last)) {
                     $fragment->isSignature = true;
                     $this->addFragment($fragment);
 
                     $fragment = null;
-                } elseif ($this->isQuoteHeader($last)) {
+                } elseif (empty($line) && $this->isQuoteHeader($last)) {
                     $fragment->isQuoted = true;
                     $this->addFragment($fragment);
 

diff --git a/tests/EmailReplyParser/Tests/Parser/EmailParserTest.php b/tests/EmailReplyParser/Tests/Parser/EmailParserTest.php
@@ -166,6 +166,25 @@ public function testReadsEmailWithCorrectSignature()
         $this->assertRegExp('/^--\nrick/', (string) $fragments[1]);
     }
 
+    public function testReadsEmailWithSignatureWithNoEmptyLineAbove()
+    {
+        $email     = $this->parser->parse($this->getFixtures('sig_no_empty_line.txt'));
+        $fragments = $email->getFragments();
+
+        $this->assertCount(2, $fragments);
+
+        $this->assertFalse($fragments[0]->isQuoted());
+        $this->assertFalse($fragments[1]->isQuoted());
+
+        $this->assertFalse($fragments[0]->isSignature());
+        $this->assertTrue($fragments[1]->isSignature());
+
+        $this->assertFalse($fragments[0]->isHidden());
+        $this->assertTrue($fragments[1]->isHidden());
+
+        $this->assertRegExp('/^--\nrick/', (string) $fragments[1]);
+    }
+
     public function testReadsEmailWithCorrectSignatureWithSpace()
     {
         // A common convention is to use "-- " as delimitor, but trailing spaces are often stripped by IDEs, so add them here
@@ -188,6 +207,28 @@ public function testReadsEmailWithCorrectSignatureWithSpace()
         $this->assertRegExp('/^-- \nrick/', (string) $fragments[1]);
     }
 
+    public function testReadsEmailWithCorrectSignatureWithNoEmptyLineWithSpace()
+    {
+        // A common convention is to use "-- " as delimitor, but trailing spaces are often stripped by IDEs, so add them here
+        $content = str_replace('--', '-- ', $this->getFixtures('sig_no_empty_line.txt'));
+
+        $email     = $this->parser->parse($content);
+        $fragments = $email->getFragments();
+
+        $this->assertCount(2, $fragments);
+
+        $this->assertFalse($fragments[0]->isQuoted());
+        $this->assertFalse($fragments[1]->isQuoted());
+
+        $this->assertFalse($fragments[0]->isSignature());
+        $this->assertTrue($fragments[1]->isSignature());
+
+        $this->assertFalse($fragments[0]->isHidden());
+        $this->assertTrue($fragments[1]->isHidden());
+
+        $this->assertRegExp('/^-- \nrick/', (string) $fragments[1]);
+    }
+
     public function testOneIsNotOn()
     {
         $email     = $this->parser->parse($this->getFixtures('email_one_is_not_on.txt'));

diff --git a/tests/Fixtures/sig_no_empty_line.txt b/tests/Fixtures/sig_no_empty_line.txt
@@ -0,0 +1,3 @@
+this is an email with a signature with no empty line above.
+--
+rick