Merge pull request #4 from alicebob/reallynodep

really no deps

Author: alicebob

bench_test.go renamed to bench_test.nogo

@@ -1,3 +1,4 @@
+// file has a weird filename to avoid dragging in a go.mod dependency
 package streamxlsx_test
 
 import (

go.mod

@@ -1,8 +1,3 @@
 module github.com/alicebob/streamxlsx
 
 go 1.14
-
-require (
-	github.com/stretchr/testify v1.5.1
-	github.com/tealeg/xlsx/v2 v2.0.1
-)

go.sum

@@ -1,23 +0,0 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/frankban/quicktest v1.5.0 h1:Tb4jWdSpdjKzTUicPnY61PZxKbDoGa7ABbrReT3gQVY=
-github.com/frankban/quicktest v1.5.0/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
-github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/tealeg/xlsx/v2 v2.0.1 h1:RP+VEscpPFjH2FnpKh1p9HVLAk1htqb9Urcxi2AU1ns=
-github.com/tealeg/xlsx/v2 v2.0.1/go.mod h1:l9GvhCCjdaIGkAyZcFedDALcYcXUOei55f6umRMOz9c=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

readxlsx.go

@@ -0,0 +1,98 @@
+package streamxlsx
+
+import (
+	"archive/zip"
+	"bytes"
+	"encoding/xml"
+	"errors"
+	"fmt"
+)
+
+// TestFile is used to test the package.
+// It doesn't implement a full reader.
+type TestFile struct {
+	Sheets []TestSheet
+}
+
+type TestSheet struct {
+	Name  string
+	Cells []TestCell
+}
+
+type TestCell struct {
+	Ref   string
+	Type  string
+	Value string
+	Style int
+}
+
+func TestParse(b []byte) (*TestFile, error) {
+	z, err := zip.NewReader(bytes.NewReader(b), int64(len(b)))
+	if err != nil {
+		return nil, err
+	}
+
+	file := TestFile{}
+
+	var rels relationshipsXML
+	if err := readXML(z, "xl/_rels/workbook.xml.rels", &rels); err != nil {
+		return nil, err
+	}
+	var workbook workbookXML
+	if err := readXML(z, "xl/workbook.xml", &workbook); err != nil {
+		return nil, err
+	}
+
+	for i, sheet := range workbook.Sheets {
+		s, err := readSheet(z, i+1, sheet.Name)
+		if err != nil {
+			return nil, err
+		}
+		file.Sheets = append(file.Sheets, *s)
+	}
+
+	return &file, nil
+}
+
+func readSheet(z *zip.Reader, id int, name string) (*TestSheet, error) {
+	var s worksheetXML
+	if err := readXML(z, fmt.Sprintf("xl/worksheets/sheet%d.xml", id), &s); err != nil {
+		return nil, err
+	}
+	var cells []TestCell
+	for _, row := range s.Rows {
+		for _, cell := range row.Cells {
+			v := cell.Value
+			if cell.InlineString != nil {
+				v = *cell.InlineString
+			}
+			style := 0
+			if cell.Style != nil {
+				style = *cell.Style
+			}
+			cells = append(cells, TestCell{
+				Ref:   cell.Ref,
+				Type:  cell.Type,
+				Value: v,
+				Style: style,
+			})
+		}
+	}
+	return &TestSheet{
+		Name:  name,
+		Cells: cells,
+	}, nil
+}
+
+func readXML(z *zip.Reader, filename string, dest interface{}) error {
+	for _, f := range z.File {
+		if f.Name == filename {
+			fh, err := f.Open()
+			if err != nil {
+				return err
+			}
+			return xml.NewDecoder(fh).Decode(dest)
+		}
+	}
+	return errors.New("file not found")
+}

sheet_test.go

@@ -2,30 +2,35 @@ package streamxlsx
 
 import (
 	"testing"
-
-	"github.com/stretchr/testify/assert"
 )
 
 func TestAsRef(t *testing.T) {
-	assert.Equal(t, "A1", AsRef(0, 0))
-	assert.Equal(t, "B1", AsRef(1, 0))
-	assert.Equal(t, "C1", AsRef(2, 0))
-	assert.Equal(t, "A2", AsRef(0, 1))
-	assert.Equal(t, "B2", AsRef(1, 1))
-	assert.Equal(t, "C2", AsRef(2, 1))
-	assert.Equal(t, "Z1", AsRef(25, 0))
-	assert.Equal(t, "AA1", AsRef(1*26, 0))
-	assert.Equal(t, "AZ1", AsRef(1*26+25, 0))
-	assert.Equal(t, "BA1", AsRef(2*26, 0))
-	assert.Equal(t, "ZA1", AsRef(26*26, 0))
-	assert.Equal(t, "ZZ1", AsRef(26*26+25, 0))
+	mustEq(t, "A1", AsRef(0, 0))
+	mustEq(t, "B1", AsRef(1, 0))
+	mustEq(t, "C1", AsRef(2, 0))
+	mustEq(t, "A2", AsRef(0, 1))
+	mustEq(t, "B2", AsRef(1, 1))
+	mustEq(t, "C2", AsRef(2, 1))
+	mustEq(t, "Z1", AsRef(25, 0))
+	mustEq(t, "AA1", AsRef(1*26, 0))
+	mustEq(t, "AZ1", AsRef(1*26+25, 0))
+	mustEq(t, "BA1", AsRef(2*26, 0))
+	mustEq(t, "ZA1", AsRef(26*26, 0))
+	mustEq(t, "ZZ1", AsRef(26*26+25, 0))
+
+	mustEq(t, "A9", AsRef(0, 8))
+	mustEq(t, "A10", AsRef(0, 9))
+	mustEq(t, "AA10", AsRef(26, 9))
 
-	assert.Equal(t, "A9", AsRef(0, 8))
-	assert.Equal(t, "A10", AsRef(0, 9))
-	assert.Equal(t, "AA10", AsRef(26, 9))
+	mustEq(t, "AAA1", AsRef(27*26, 0))
+	mustEq(t, "AAB1", AsRef(27*26+1, 0))
+	mustEq(t, "AAZ1", AsRef(27*26+25, 0))
+	mustEq(t, "ABA1", AsRef(27*26+26, 0))
+}
 
-	assert.Equal(t, "AAA1", AsRef(27*26, 0))
-	assert.Equal(t, "AAB1", AsRef(27*26+1, 0))
-	assert.Equal(t, "AAZ1", AsRef(27*26+25, 0))
-	assert.Equal(t, "ABA1", AsRef(27*26+26, 0))
+func mustEq(t *testing.T, want, have string) {
+	t.Helper()
+	if have != want {
+		t.Fatalf("have %q, want %q", have, want)
+	}
 }