tbl: reimplement _Row.cells

Steve Canny · Steve Canny · commit 3de03c880290 · 2014-11-28T21:22:22.000-05:00
Temporarily named _Row.cells_new
diff --git a/docx/table.py b/docx/table.py
@@ -67,6 +67,12 @@ def columns(self):
         """
         return _Columns(self._tbl, self)
 
+    def row_cells(self, row_idx):
+        """
+        Sequence of cells in the row at *row_idx* in this table.
+        """
+        raise NotImplementedError
+
     @lazyproperty
     def rows(self):
         """
@@ -297,6 +303,27 @@ def cells(self):
         """
         return _RowCells(self._tr, self)
 
+    @property
+    def cells_new(self):
+        """
+        Sequence of |_Cell| instances corresponding to cells in this row.
+        """
+        return tuple(self.table.row_cells(self._index))
+
+    @property
+    def table(self):
+        """
+        Reference to the |Table| object this row belongs to.
+        """
+        raise NotImplementedError
+
+    @property
+    def _index(self):
+        """
+        Index of this row in its table, starting from zero.
+        """
+        raise NotImplementedError
+
 
 class _RowCells(Parented):
     """
diff --git a/features/steps/table.py b/features/steps/table.py
@@ -269,7 +269,7 @@ def then_the_reported_width_of_the_cell_is_width(context, width):
 @then('the row cells text is {expected_text}')
 def then_the_row_cells_text_is_expected_text(context, expected_text):
     table = context.table_
-    cells_text = ' '.join(c.text for row in table.rows for c in row.cells)
+    cells_text = ' '.join(c.text for row in table.rows for c in row.cells_new)
     assert cells_text == expected_text, 'got %s' % cells_text
 
 
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -17,6 +17,7 @@
 from .oxml.unitdata.table import a_gridCol, a_tbl, a_tblGrid, a_tc, a_tr
 from .oxml.unitdata.text import a_p
 from .unitutil.cxml import element, xml
+from .unitutil.mock import instance_mock, property_mock
 
 
 class DescribeTable(object):
@@ -429,11 +430,41 @@ def columns_fixture(self):
 
 class Describe_Row(object):
 
+    def it_provides_access_to_its_cells(self, cells_fixture):
+        row, row_idx, expected_cells = cells_fixture
+        cells = row.cells_new
+        row.table.row_cells.assert_called_once_with(row_idx)
+        assert cells == expected_cells
+
     def it_provides_access_to_the_row_cells(self):
         row = _Row(element('w:tr'), None)
         cells = row.cells
         assert isinstance(cells, _RowCells)
 
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture
+    def cells_fixture(self, _index_, table_prop_, table_):
+        row = _Row(None, None)
+        _index_.return_value = row_idx = 6
+        expected_cells = (1, 2, 3)
+        table_.row_cells.return_value = list(expected_cells)
+        return row, row_idx, expected_cells
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def _index_(self, request):
+        return property_mock(request, _Row, '_index')
+
+    @pytest.fixture
+    def table_(self, request):
+        return instance_mock(request, Table)
+
+    @pytest.fixture
+    def table_prop_(self, request, table_):
+        return property_mock(request, _Row, 'table', return_value=table_)
+
 
 class Describe_RowCells(object):
 
