From a18401ae49f35805f9d719c3f08043b50443f240 Mon Sep 17 00:00:00 2001 From: "Yoshihide Taniguchi (ravelll)" Date: Mon, 27 Feb 2017 12:41:35 +0900 Subject: [PATCH 1/4] Add tests --- tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php b/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php index 7fbbe21..596456d 100644 --- a/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php +++ b/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php @@ -18,6 +18,13 @@ public function testCreateHeaderRows() $this->assertEquals($expected, $this->copyAsMarkdown->createHeaderRows(array('hoge', 'fuga'))); } + public function testCreateHeaderRows_WhenHasOneColumn() + { + $expected = 'hoge| +---|'; + $this->assertEquals($expected, $this->copyAsMarkdown->createHeaderRows(array('hoge'))); + } + public function testCalculateColumnCount() { @@ -34,6 +41,14 @@ public function testCreateDataRows() ))); } + public function testCreateDataRows_WhenHasOneColumn() + { + $expected = 'a|'; + $this->assertEquals($expected, $this->copyAsMarkdown->createDataRows(array( + array('a'), + ))); + } + public function testCreateDataRows_ReturnLineFeedRemovedData_WhenHasLineFeedInData() { $expected = 'a|b1
b2
b3|c'; From 53d300903ef8afc4d95cfb562e510ca59362eaeb Mon Sep 17 00:00:00 2001 From: "Yoshihide Taniguchi (ravelll)" Date: Mon, 27 Feb 2017 12:51:22 +0900 Subject: [PATCH 2/4] Add / Fix tests --- tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php b/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php index 596456d..04e76e5 100644 --- a/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php +++ b/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php @@ -13,15 +13,15 @@ public function setUp() public function testCreateHeaderRows() { - $expected = 'hoge|fuga ----|---'; + $expected = '|hoge|fuga +|---|---'; $this->assertEquals($expected, $this->copyAsMarkdown->createHeaderRows(array('hoge', 'fuga'))); } public function testCreateHeaderRows_WhenHasOneColumn() { - $expected = 'hoge| ----|'; + $expected = '|hoge +|---'; $this->assertEquals($expected, $this->copyAsMarkdown->createHeaderRows(array('hoge'))); } @@ -33,8 +33,8 @@ public function testCalculateColumnCount() public function testCreateDataRows() { - $expected = 'a|b|c -d|e|f'; + $expected = '|a|b|c +|d|e|f'; $this->assertEquals($expected, $this->copyAsMarkdown->createDataRows(array( array('a', 'b', 'c'), array('d', 'e', 'f'), @@ -43,7 +43,7 @@ public function testCreateDataRows() public function testCreateDataRows_WhenHasOneColumn() { - $expected = 'a|'; + $expected = '|a'; $this->assertEquals($expected, $this->copyAsMarkdown->createDataRows(array( array('a'), ))); @@ -51,7 +51,7 @@ public function testCreateDataRows_WhenHasOneColumn() public function testCreateDataRows_ReturnLineFeedRemovedData_WhenHasLineFeedInData() { - $expected = 'a|b1
b2
b3|c'; + $expected = '|a|b1
b2
b3|c'; $this->assertEquals($expected, $this->copyAsMarkdown->createDataRows(array( array('a', 'b1 b2 From 86f105800b2f20eb3637910086009240a41f1caf Mon Sep 17 00:00:00 2001 From: "Yoshihide Taniguchi (ravelll)" Date: Mon, 27 Feb 2017 12:56:10 +0900 Subject: [PATCH 3/4] Fix implementation --- copyAsMarkdown.spBundle/command.plist | 15 +++------------ lib/CopyAsMarkdown/CopyAsMarkdown.php | 15 +++------------ 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/copyAsMarkdown.spBundle/command.plist b/copyAsMarkdown.spBundle/command.plist index 4f7d178..d426cb5 100644 --- a/copyAsMarkdown.spBundle/command.plist +++ b/copyAsMarkdown.spBundle/command.plist @@ -48,19 +48,13 @@ class CopyAsMarkdown $result = []; $str = ''; foreach ($columns as $column) { - if (!empty($str)) { - $str .= "|"; - } - $str .= $column; + $str .= "|" . $column; } $result[] = $str; $str = ''; for($i=0; $i<count($columns); $i++) { - if (!empty($str)) { - $str .= "|"; - } - $str .= "---"; + $str .= "|---"; } $result[] = $str; @@ -85,10 +79,7 @@ class CopyAsMarkdown foreach ($rows as $row) { $str = ''; foreach ($row as $val) { - if (!empty($str)) { - $str .= "|"; - } - $str .= str_replace(array("\n", "\r"), '', nl2br($val)); + $str .= "|" . str_replace(array("\n", "\r"), '', nl2br($val)); } $result[] = $str; } diff --git a/lib/CopyAsMarkdown/CopyAsMarkdown.php b/lib/CopyAsMarkdown/CopyAsMarkdown.php index 623f819..e400b50 100644 --- a/lib/CopyAsMarkdown/CopyAsMarkdown.php +++ b/lib/CopyAsMarkdown/CopyAsMarkdown.php @@ -41,19 +41,13 @@ protected function _createHeaderRows(array $columns) $result = []; $str = ''; foreach ($columns as $column) { - if (!empty($str)) { - $str .= "|"; - } - $str .= $column; + $str .= "|" . $column; } $result[] = $str; $str = ''; for($i=0; $i Date: Mon, 27 Feb 2017 13:35:18 +0900 Subject: [PATCH 4/4] rm unnecessary line --- tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php b/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php index 04e76e5..134c6e6 100644 --- a/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php +++ b/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php @@ -25,7 +25,6 @@ public function testCreateHeaderRows_WhenHasOneColumn() $this->assertEquals($expected, $this->copyAsMarkdown->createHeaderRows(array('hoge'))); } - public function testCalculateColumnCount() { $this->assertEquals(3, $this->copyAsMarkdown->calculateColumnCount(array(array('a', 'b', 'c'))));