feat(ds.get_body): return None on empty body, support optional defaul…

…t body

Merge pull request #31 from qri-io/xlsx

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="0.2.1"></a>
+# [0.2.1](https://github.com/qri-io/startf/compare/v0.2.0...v0.2.1) (2019-02-05)
+
+
+### Features
+
+* **ds.get_body:** return None on empty body, support optional default body ([85fa909](https://github.com/qri-io/startf/commit/85fa909))
+
+
+
 <a name="0.2.0"></a>
 # [0.2.0](https://github.com/qri-io/startf/compare/v0.1.0...v0.2.0) (2019-01-22)
 

ds/dataset.go

@@ -113,8 +113,13 @@ func (d *Dataset) GetBody(thread *starlark.Thread, _ *starlark.Builtin, args sta
 		return d.body, nil
 	}
 
+	var valx starlark.Value
+	if err := starlark.UnpackArgs("get_body", args, kwargs, "default?", &valx); err != nil {
+		return nil, err
+	}
+
 	if d.ds.BodyFile() == nil {
-		return starlark.None, fmt.Errorf("this dataset has no body")
+		return valx, nil
 	}
 	if d.ds.Structure == nil {
 		return starlark.None, fmt.Errorf("error: no structure for previous dataset")

ds/dataset_test.go

@@ -12,7 +12,7 @@ func TestCheckFields(t *testing.T) {
 	allErrCheck := func(fields ...string) error {
 		return fieldErr
 	}
-	ds := NewDataset(nil, nil, allErrCheck)
+	ds := NewDataset(nil, allErrCheck)
 	thread := &starlark.Thread{}
 
 	if _, err := ds.SetBody(thread, nil, starlark.Tuple{starlark.String("data")}, nil); err != fieldErr {

ds/entry_reader.go

@@ -18,6 +18,8 @@ type EntryReader struct {
 	data starlark.Value
 }
 
+var _ dsio.EntryReader = (*EntryReader)(nil)
+
 // NewEntryReader creates a new Entry Reader
 func NewEntryReader(st *dataset.Structure, iter starlark.Iterable) *EntryReader {
 	return &EntryReader{
@@ -75,3 +77,8 @@ func (r *EntryReader) ReadEntry() (e dsio.Entry, err error) {
 	}
 	return
 }
+
+// Close finalizes the reader
+func (r *EntryReader) Close() error {
+	return nil
+}

entry_reader.go

@@ -74,3 +74,9 @@ func (r *EntryReader) ReadEntry() (e dsio.Entry, err error) {
 	}
 	return
 }
+
+// Close finalizes the reader
+func (r *EntryReader) Close() error {
+	// TODO (b5): consume & close iterator
+	return nil
+}

startf.go

@@ -2,4 +2,4 @@ package startf
 
 // Version is the current version of this startf, this version number will be written
 // with each transformation exectution
-const Version = "0.2.1-dev"
+const Version = "0.2.1"