Issue #13: [breaking] Column attribute interface changes

src/Cell/ShadowCell.php

@@ -27,6 +27,14 @@ function addClasses(array $classes) {
     return $this;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  function setAttribute($key, $value) {
+    // Do nothing.
+    return $this;
+  }
+
   /**
    * @param int $rowspan
    *

src/Columns/ColumnAttributes.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Donquixote\Cellbrush\Columns;
+
+/**
+ * This class is not used anywhere.
+ *
+ * It only exists to prove that ColumnAttributesTrait is complete.
+ *
+ * @internal
+ */
+class ColumnAttributes implements ColumnAttributesInterface {
+
+  use ColumnAttributesTrait;
+
+}

src/Columns/ColumnAttributesInterface.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Donquixote\Cellbrush\Columns;
+
+interface ColumnAttributesInterface {
+
+  /**
+   * @param string $colName
+   * @param string $name
+   * @param string $value
+   *
+   * @return $this
+   */
+  public function setColAttribute($colName, $name, $value);
+
+}

src/Columns/ColumnAttributesTrait.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Donquixote\Cellbrush\Columns;
+
+/**
+ * @see ColumnAttributesInterface
+ */
+trait ColumnAttributesTrait {
+
+  use ColumnClassesTrait;
+
+  function __constructColumnAttributes() {
+    $this->__constructColumnClasses();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setColAttribute($colName, $name, $value) {
+    $this->colAttributes->nameSetAttribute($colName, $name, $value);
+    return $this;
+  }
+
+}

src/Html/AttributesBuilderInterface.php

@@ -18,4 +18,12 @@ function addClass($class);
    */
   function addClasses(array $classes);
 
+  /**
+   * @param string $key
+   * @param string $value
+   *
+   * @return static
+   */
+  function setAttribute($key, $value);
+
 }

src/Html/Multiple/StaticAttributesMap.php

@@ -32,7 +32,13 @@ public function enhanceAttributes(array &$rowCells) {
         $rowCells[$name] = $rowCells[$name]->addClasses($classes);
       }
     }
-    // @todo Implement for attributes.
+    foreach ($this->attributes as $name => $attributes) {
+      if (isset($rowCells[$name])) {
+        foreach ($attributes as $key => $value) {
+          $rowCells[$name] = $rowCells[$name]->setAttribute($key, $value);
+        }
+      }
+    }
   }
 
   /**

src/TSection/TableSection.php

@@ -6,7 +6,7 @@
 use Donquixote\Cellbrush\Axis\DynamicAxis;
 use Donquixote\Cellbrush\BuildContainer\BuildContainer;
 use Donquixote\Cellbrush\BuildContainer\BuildContainerBase;
-use Donquixote\Cellbrush\Columns\ColumnClassesTrait;
+use Donquixote\Cellbrush\Columns\ColumnAttributesTrait;
 use Donquixote\Cellbrush\Handle\RowHandle;
 use Donquixote\Cellbrush\Handle\SectionColHandle;
 use Donquixote\Cellbrush\Html\Multiple\DynamicAttributesMap;
@@ -15,7 +15,7 @@
 
 class TableSection implements TableSectionInterface {
 
-  use MutableAttributesTrait, ColumnClassesTrait;
+  use MutableAttributesTrait, ColumnAttributesTrait;
 
   /**
    * @var string
@@ -83,7 +83,7 @@ class TableSection implements TableSectionInterface {
    */
   function __construct($tagName) {
     $this->__constructMutableAttributes();
-    $this->__constructColumnClasses();
+    $this->__constructColumnAttributes();
     $this->tagName = $tagName;
     $this->rows = new DynamicAxis();
     $this->colAttributes = new DynamicAttributesMap();

src/TSection/TableSectionInterface.php

@@ -2,11 +2,12 @@
 
 namespace Donquixote\Cellbrush\TSection;
 
+use Donquixote\Cellbrush\Columns\ColumnClassesInterface;
 use Donquixote\Cellbrush\Html\MutableAttributesInterface;
 
 /**
  * Interface for a table section element.
  */
-interface TableSectionInterface extends MutableAttributesInterface, TableSectionStructureInterface {
+interface TableSectionInterface extends ColumnClassesInterface, MutableAttributesInterface, TableSectionStructureInterface {
 
 }

src/Table/Table.php

@@ -2,7 +2,7 @@
 
 namespace Donquixote\Cellbrush\Table;
 
-use Donquixote\Cellbrush\Columns\ColumnClassesTrait;
+use Donquixote\Cellbrush\Columns\ColumnAttributesTrait;
 use Donquixote\Cellbrush\Columns\TableColumnsTrait;
 use Donquixote\Cellbrush\Handle\RowHandle;
 use Donquixote\Cellbrush\Html\Multiple\DynamicAttributesMap;
@@ -11,7 +11,7 @@
 
 class Table extends TBodyWrapper implements TableInterface {
 
-  use MutableAttributesTrait, TableColumnsTrait, ColumnClassesTrait;
+  use MutableAttributesTrait, TableColumnsTrait, ColumnAttributesTrait;
 
   /**
    * @var TableSection
@@ -37,7 +37,7 @@ class Table extends TBodyWrapper implements TableInterface {
   function __construct() {
     $this->__constructMutableAttributes();
     $this->__constructTableColumns();
-    $this->__constructColumnClasses();
+    $this->__constructColumnAttributes();
     $this->columns;
     $this->thead = new TableSection('thead');
     parent::__construct(new TableSection('tbody'));

src/Table/TableInterface.php

@@ -2,7 +2,7 @@
 
 namespace Donquixote\Cellbrush\Table;
 
-use Donquixote\Cellbrush\Columns\ColumnClassesInterface;
+use Donquixote\Cellbrush\Columns\ColumnAttributesInterface;
 use Donquixote\Cellbrush\Columns\TableColumnsInterface;
 use Donquixote\Cellbrush\Html\MutableAttributesInterface;
 use Donquixote\Cellbrush\TSection\TableSectionStructureInterface;
@@ -11,6 +11,6 @@ interface TableInterface extends
   MutableAttributesInterface,
   TableSectionStructureInterface,
   TableColumnsInterface,
-  ColumnClassesInterface {
+  ColumnAttributesInterface {
 
 }

tests/src/CellbrushTest.php

@@ -934,14 +934,15 @@ function testCellAttributes() {
       ->td('row2', 'col2', 'Diag 2')
       ->setCellAttribute('row0', 'col1', 'attr', 'testattr')
       ->setCellAttribute('row2', 'col2', 'attr2', 'testattr2')
+      ->setColAttribute('col1', 'title', 'col 1 title')
     ;
 
     $expected = <<<EOT
 <table>
   <tbody>
-    <tr><td>Diag 0</td><td attr="testattr"></td><td></td></tr>
-    <tr><td></td><td>Diag 1</td><td></td></tr>
-    <tr><td></td><td></td><td attr2="testattr2">Diag 2</td></tr>
+    <tr><td>Diag 0</td><td title="col 1 title" attr="testattr"></td><td></td></tr>
+    <tr><td></td><td title="col 1 title">Diag 1</td><td></td></tr>
+    <tr><td></td><td title="col 1 title"></td><td attr2="testattr2">Diag 2</td></tr>
   </tbody>
 </table>
 
@@ -971,7 +972,10 @@ function testRowAndColGroupsWithAttributes() {
       ->setCellAttribute('banana', 'name', 'title', 'banana name')
       ->setCellAttribute('banana.description', 'info', 'title', 'banana description')
       ->setCellAttribute('banana.info', 'info.price', 'title', 'banana price')
+      ->setColAttribute('info', 'col-attr', 'info col')
+      ->setColAttribute('info.price', 'col-attr', 'price col')
     ;
+    $table->tbody()->setColAttribute('info.color', 'col-attr', 'color tbody col');
     $table->headRow()
       ->th('name', 'Name')
       ->th('info.color', 'Color')
@@ -981,13 +985,13 @@ function testRowAndColGroupsWithAttributes() {
     $expected = <<<EOT
 <table>
   <thead>
-    <tr><th>Name</th><th>Color</th><th>Price</th></tr>
+    <tr><th>Name</th><th>Color</th><th col-attr="price col">Price</th></tr>
   </thead>
   <tbody>
-    <tr><th title="banana name" rowspan="2">Banana</th><td title="banana description" colspan="2">A yellow fruit.</td></tr>
-    <tr><td>yellow</td><td title="banana price">60 cent</td></tr>
-    <tr><th rowspan="2">Coconut</th><td colspan="2">Has liquid inside.</td></tr>
-    <tr><td>brown</td><td>3 dollar</td></tr>
+    <tr><th title="banana name" rowspan="2">Banana</th><td title="banana description" col-attr="info col" colspan="2">A yellow fruit.</td></tr>
+    <tr><td col-attr="color tbody col">yellow</td><td title="banana price" col-attr="price col">60 cent</td></tr>
+    <tr><th rowspan="2">Coconut</th><td col-attr="info col" colspan="2">Has liquid inside.</td></tr>
+    <tr><td col-attr="color tbody col">brown</td><td col-attr="price col">3 dollar</td></tr>
   </tbody>
 </table>