tbl: rewrite Table.add_column()

Steve Canny · Steve Canny · commit 7541f201c44d · 2015-02-21T14:11:36.000-08:00
Add width parameter.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -7,6 +7,7 @@ NEXT
 ++++++++++++++++++
 
 - Fix #149: KeyError on Document.add_table()
+- Fix #78: feature: add_table() sets cell widths
 
 
 0.8.4 (2015-02-20)
diff --git a/docx/table.py b/docx/table.py
@@ -20,14 +20,17 @@ def __init__(self, tbl, parent):
         super(Table, self).__init__(parent)
         self._element = self._tbl = tbl
 
-    def add_column(self):
+    def add_column(self, width):
         """
-        Return a |_Column| instance, newly added rightmost to the table.
+        Return a |_Column| object of *width*, newly added rightmost to the
+        table.
         """
         tblGrid = self._tbl.tblGrid
         gridCol = tblGrid.add_gridCol()
+        gridCol.w = width
         for tr in self._tbl.tr_lst:
-            tr.add_tc()
+            tc = tr.add_tc()
+            tc.width = width
         return _Column(gridCol, self)
 
     def add_row(self):
diff --git a/features/tbl-add-row-or-col.feature b/features/tbl-add-row-or-col.feature
@@ -12,7 +12,6 @@ Feature: Add a row or column to a table
        And the width of each cell is 3.0 inches
 
 
-  @wip
   Scenario: Add a column to a table
      Given a 2 x 2 table
       When I add a 1.0 inch column to the table
diff --git a/tests/test_files/snippets/add-row-col.txt b/tests/test_files/snippets/add-row-col.txt
@@ -89,3 +89,55 @@
     </w:tc>
   </w:tr>
 </w:tbl>
+
+<w:tbl xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
+  <w:tblPr>
+    <w:tblW w:type="auto" w:w="0"/>
+    <w:tblLook w:firstColumn="1" w:firstRow="1" w:lastColumn="0" w:lastRow="0" w:noHBand="0" w:noVBand="1" w:val="04A0"/>
+  </w:tblPr>
+  <w:tblGrid>
+    <w:gridCol w:w="720"/>
+    <w:gridCol w:w="1440"/>
+    <w:gridCol w:w="2160"/>
+  </w:tblGrid>
+  <w:tr>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="720"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="1440"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="2160"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+  </w:tr>
+  <w:tr>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="720"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="1440"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="2160"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+  </w:tr>
+</w:tbl>
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -105,11 +105,12 @@ def it_can_add_a_row(self, add_row_fixture):
         assert row._parent is table
 
     def it_can_add_a_column(self, add_column_fixture):
-        table, expected_xml = add_column_fixture
-        column = table.add_column()
+        table, width, expected_xml = add_column_fixture
+        column = table.add_column(width)
         assert table._tbl.xml == expected_xml
         assert isinstance(column, _Column)
-        assert column._gridCol is table._tbl.tblGrid.gridCol_lst[1]
+        assert column._gridCol is table._tbl.tblGrid.gridCol_lst[-1]
+        assert column._parent is table
 
     def it_provides_access_to_its_cells_to_help(self, cells_fixture):
         table, cell_count, unique_count, matches = cells_fixture
@@ -125,10 +126,12 @@ def it_provides_access_to_its_cells_to_help(self, cells_fixture):
 
     @pytest.fixture
     def add_column_fixture(self):
-        tbl = _tbl_bldr(2, 1).element
+        snippets = snippet_seq('add-row-col')
+        tbl = parse_xml(snippets[0])
         table = Table(tbl, None)
-        expected_xml = _tbl_bldr(2, 2).xml()
-        return table, expected_xml
+        width = Inches(1.5)
+        expected_xml = snippets[2]
+        return table, width, expected_xml
 
     @pytest.fixture
     def add_row_fixture(self):
