Merge pull request #3 from ravelll/fix-1column-tabling

Fix 1 column tabling
hypermkt · Feb 27, 2017 · a54936a · a54936a
2 parents afb29fd + ef81ebd
commit a54936a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 29 deletions.
diff --git 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&lt;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
@@ -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<count($columns); $i++) {
-      if (!empty($str)) {
-        $str .= "|";
-      }
-      $str .= "---";
+      $str .= "|---";
     }
     $result[] = $str;
 
@@ -78,10 +72,7 @@ protected function _createDataRows(array $rows)
     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/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php b/tests/lib/CopyAsMarkdown/CopyAsMarkdownTest.php
@@ -13,11 +13,17 @@ 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
+|---';
+    $this->assertEquals($expected, $this->copyAsMarkdown->createHeaderRows(array('hoge')));
+  }
 
   public function testCalculateColumnCount()
   {
@@ -26,17 +32,25 @@ 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'),
         )));
   }
 
+  public function testCreateDataRows_WhenHasOneColumn()
+  {
+    $expected = '|a';
+    $this->assertEquals($expected, $this->copyAsMarkdown->createDataRows(array(
+          array('a'),
+        )));
+  }
+
   public function testCreateDataRows_ReturnLineFeedRemovedData_WhenHasLineFeedInData()
   {
-    $expected = 'a|b1<br />b2<br />b3|c';
+    $expected = '|a|b1<br />b2<br />b3|c';
     $this->assertEquals($expected, $this->copyAsMarkdown->createDataRows(array(
           array('a', 'b1
 b2