Remove old worksheet.go and worksheet_test.go files.

sheet.go

@@ -24,7 +24,24 @@ func (s *Sheet) AddRow() *Row {
 	return row
 }
 
-// Dump sheet to it's XML representation
+// Get a Cell by passing it's cartesian coordinates (zero based) as
+// row and column integer indexes.
+//
+// For example:
+//
+//    cell := sheet.Cell(0,0)
+//
+// ... would set the variable "cell" to contain a Cell struct
+// containing the data from the field "A1" on the spreadsheet.
+func (sh *Sheet) Cell(row, col int) *Cell {
+
+	if len(sh.Rows) > row && sh.Rows[row] != nil && len(sh.Rows[row].Cells) > col {
+		return sh.Rows[row].Cells[col]
+	}
+	return new(Cell)
+}
+
+// Dump sheet to it's XML representation, intended for internal use only
 func (s *Sheet) makeXLSXSheet(refTable *RefTable) *xlsxWorksheet {
 	worksheet := &xlsxWorksheet{}
 	xSheet := xlsxSheetData{}

worksheet.go

@@ -1,74 +0,0 @@
-package xlsx
-
-import (
-	"encoding/xml"
-)
-
-// xlsxWorksheet directly maps the worksheet element in the namespace
-// http://schemas.openxmlformats.org/spreadsheetml/2006/main -
-// currently I have not checked it for completeness - it does as much
-// as I need.
-type xlsxWorksheet struct {
-	XMLName   xml.Name      `xml:"http://schemas.openxmlformats.org/spreadsheetml/2006/main worksheet"`
-	Dimension xlsxDimension `xml:"dimension"`
-	Cols      xslxCols      `xml:"cols,omitempty"`
-	SheetData xlsxSheetData `xml:"sheetData"`
-}
-
-type xslxCols struct {
-	Col []xlsxCol `xml:"col"`
-}
-
-type xlsxCol struct {
-	Min    int  `xml:"min,attr"`
-	Max    int  `xml:"max,attr"`
-	Hidden bool `xml:"hidden,attr,omitempty"`
-}
-
-// xlsxDimension directly maps the dimension element in the namespace
-// http://schemas.openxmlformats.org/spreadsheetml/2006/main -
-// currently I have not checked it for completeness - it does as much
-// as I need.
-type xlsxDimension struct {
-	Ref string `xml:"ref,attr"`
-}
-
-// xlsxSheetData directly maps the sheetData element in the namespace
-// http://schemas.openxmlformats.org/spreadsheetml/2006/main -
-// currently I have not checked it for completeness - it does as much
-// as I need.
-type xlsxSheetData struct {
-	XMLName xml.Name  `xml:"sheetData"`
-	Row     []xlsxRow `xml:"row"`
-}
-
-// xlsxRow directly maps the row element in the namespace
-// http://schemas.openxmlformats.org/spreadsheetml/2006/main -
-// currently I have not checked it for completeness - it does as much
-// as I need.
-type xlsxRow struct {
-	R      int     `xml:"r,attr"`
-	Spans  string  `xml:"spans,attr,omitempty"`
-	Hidden bool    `xml:"hidden,attr,omitempty"`
-	C      []xlsxC `xml:"c"`
-}
-
-// xlsxC directly maps the c element in the namespace
-// http://schemas.openxmlformats.org/sprceadsheetml/2006/main -
-// currently I have not checked it for completeness - it does as much
-// as I need.
-type xlsxC struct {
-	R string `xml:"r,attr"`           // Cell ID, e.g. A1
-	S int    `xml:"s,attr,omitempty"` // Style reference.
-	T string `xml:"t,attr"`           // Type.
-	V string `xml:"v"`                // Value
-}
-
-// get cell
-func (sh *Sheet) Cell(row, col int) *Cell {
-
-	if len(sh.Rows) > row && sh.Rows[row] != nil && len(sh.Rows[row].Cells) > col {
-		return sh.Rows[row].Cells[col]
-	}
-	return new(Cell)
-}

worksheet_test.go

@@ -1,141 +0,0 @@
-package xlsx
-
-import (
-	"bytes"
-	"encoding/xml"
-	. "gopkg.in/check.v1"
-)
-
-type WorksheetSuite struct{}
-
-var _ = Suite(&WorksheetSuite{})
-
-// Test we can succesfully unmarshal the sheetN.xml files within and
-// XLSX file into an xlsxWorksheet struct (and it's related children).
-func (w *WorksheetSuite) TestUnmarshallWorksheet(c *C) {
-	var sheetxml = bytes.NewBufferString(
-		`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-        <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"
-                   xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
-          <sheetPr filterMode="false">
-            <pageSetUpPr fitToPage="false"/>
-          </sheetPr>
-          <dimension ref="A1:B2"/>
-          <sheetViews>
-            <sheetView colorId="64"
-                       defaultGridColor="true"
-                       rightToLeft="false"
-                       showFormulas="false"
-                       showGridLines="true"
-                       showOutlineSymbols="true"
-                       showRowColHeaders="true"
-                       showZeros="true"
-                       tabSelected="true"
-                       topLeftCell="A1"
-                       view="normal"
-                       windowProtection="false"
-                       workbookViewId="0"
-                       zoomScale="100"
-                       zoomScaleNormal="100"
-                       zoomScalePageLayoutView="100">
-              <selection activeCell="B2"
-                         activeCellId="0"
-                         pane="topLeft"
-                         sqref="B2"/>
-            </sheetView>
-          </sheetViews>
-          <sheetFormatPr defaultRowHeight="15">
-          </sheetFormatPr>
-          <cols>
-            <col collapsed="false"
-                 hidden="false"
-                 max="1025"
-                 min="1"
-                 style="0"
-                 width="10.5748987854251"/>
-          </cols>
-          <sheetData>
-            <row collapsed="false"
-                 customFormat="false"
-                 customHeight="false"
-                 hidden="false"
-                 ht="14.9"
-                 outlineLevel="0"
-                 r="1">
-              <c r="A1"
-                 s="1"
-                 t="s">
-                <v>0</v>
-              </c>
-              <c r="B1"
-                 s="0"
-                 t="s">
-                <v>1</v>
-              </c>
-            </row>
-            <row collapsed="false"
-                 customFormat="false"
-                 customHeight="false"
-                 hidden="false"
-                 ht="14.9"
-                 outlineLevel="0"
-                 r="2">
-              <c r="A2"
-                 s="0"
-                 t="s">
-                <v>2</v>
-              </c>
-              <c r="B2"
-                 s="2"
-                 t="s">
-                <v>3</v>
-              </c>
-            </row>
-          </sheetData>
-          <printOptions headings="false"
-                        gridLines="false"
-                        gridLinesSet="true"
-                        horizontalCentered="false"
-                        verticalCentered="false"/>
-          <pageMargins left="0.7"
-                       right="0.7"
-                       top="0.7875"
-                       bottom="0.7875"
-                       header="0.511805555555555"
-                       footer="0.511805555555555"/>
-          <pageSetup blackAndWhite="false"
-                     cellComments="none"
-                     copies="1"
-                     draft="false"
-                     firstPageNumber="0"
-                     fitToHeight="1"
-                     fitToWidth="1"
-                     horizontalDpi="300"
-                     orientation="portrait"
-                     pageOrder="downThenOver"
-                     paperSize="9"
-                     scale="100"
-                     useFirstPageNumber="false"
-                     usePrinterDefaults="false"
-                     verticalDpi="300"/>
-          <headerFooter differentFirst="false"
-                        differentOddEven="false">
-            <oddHeader>
-            </oddHeader>
-            <oddFooter>
-            </oddFooter>
-          </headerFooter>
-        </worksheet>`)
-	worksheet := new(xlsxWorksheet)
-	err := xml.NewDecoder(sheetxml).Decode(worksheet)
-	c.Assert(err, IsNil)
-	c.Assert(worksheet.Dimension.Ref, Equals, "A1:B2")
-	c.Assert(worksheet.SheetData.Row, HasLen, 2)
-	row := worksheet.SheetData.Row[0]
-	c.Assert(row.R, Equals, 1)
-	c.Assert(row.C, HasLen, 2)
-	cell := row.C[0]
-	c.Assert(cell.R, Equals, "A1")
-	c.Assert(cell.T, Equals, "s")
-	c.Assert(cell.V, Equals, "0")
-}