Merge pull request #2 from hypermkt/linefeed-support

Support for the linefeed
hypermkt · May 14, 2016 · afb29fd · afb29fd
2 parents 4f5bc50 + 4d3fe8c
commit afb29fd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/copyAsMarkdown.spBundle/command.plist b/copyAsMarkdown.spBundle/command.plist
@@ -88,7 +88,7 @@ class CopyAsMarkdown
         if (!empty($str)) {
           $str .= "|";
         }
-        $str .= $val;
+        $str .= str_replace(array("\n", "\r"), '', nl2br($val));
       }
       $result[] = $str;
     }

diff --git a/lib/CopyAsMarkdown/CopyAsMarkdown.php b/lib/CopyAsMarkdown/CopyAsMarkdown.php
@@ -81,10 +81,10 @@ protected function _createDataRows(array $rows)
         if (!empty($str)) {
           $str .= "|";
         }
-        $str .= $val;
+        $str .= str_replace(array("\n", "\r"), '', nl2br($val));
       }
       $result[] = $str;
     }
     return implode("\n", $result);
   }
-}
+}
diff --git a/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php b/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php
@@ -33,6 +33,16 @@ public function testCreateDataRows()
           array('d', 'e', 'f'),
         )));
   }
+
+  public function testCreateDataRows_ReturnLineFeedRemovedData_WhenHasLineFeedInData()
+  {
+    $expected = 'a|b1<br />b2<br />b3|c';
+    $this->assertEquals($expected, $this->copyAsMarkdown->createDataRows(array(
+          array('a', 'b1
+b2
+b3', 'c'),
+        )));
+  }
 }
 
 class CopyAsMarkdownExtended extends CopyAsMarkdown