From 0d999e1db6cd8736ab697de8ce848fa3a5274b9f Mon Sep 17 00:00:00 2001
From: Joshua Sjoding <joshua.sjoding@scjalliance.com>
Date: Wed, 24 Feb 2016 22:40:30 -0800
Subject: Refactor to use core.ObjectReader and core.ObjectWriter

* New function signatures provide the necessary interface to stream data from disk when using filesystem-based storage in the future
* New function signatures provide proper error handling
* ObjectReader and ObjectWriter interfaces added to avoid future refactoring, currently are type aliases for io.ReadCloser and io.WriteCloser respectively
* Object.Reader now returns (ObjectReader, error)
* Object.Writer now returns (ObjectWriter, error)
* File.Contents now returns (string, error)
* File.Lines now returns ([]string, error)
* Blob.Reader now returns (core.ObjectReader, error)
* Added internal close helper function for deferred calls to Close that need to check the return value
---
 objects_test.go | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'objects_test.go')

diff --git a/objects_test.go b/objects_test.go
index 10b9661..6826957 100644
--- a/objects_test.go
+++ b/objects_test.go
@@ -67,7 +67,10 @@ func (s *ObjectsSuite) TestParseTree(c *C) {
 	for f, err := iter.Next(); err == nil; f, err = iter.Next() {
 		count++
 		if f.Name == "go/example.go" {
-			content, _ := ioutil.ReadAll(f.Reader())
+			reader, err := f.Reader()
+			c.Assert(err, IsNil)
+			defer func() { c.Assert(reader.Close(), IsNil) }()
+			content, _ := ioutil.ReadAll(reader)
 			c.Assert(content, HasLen, 2780)
 		}
 	}
@@ -79,7 +82,12 @@ func (s *ObjectsSuite) TestBlobHash(c *C) {
 	o := &memory.Object{}
 	o.SetType(core.BlobObject)
 	o.SetSize(3)
-	o.Writer().Write([]byte{'F', 'O', 'O'})
+
+	writer, err := o.Writer()
+	c.Assert(err, IsNil)
+	defer func() { c.Assert(writer.Close(), IsNil) }()
+
+	writer.Write([]byte{'F', 'O', 'O'})
 
 	blob := &Blob{}
 	c.Assert(blob.Decode(o), IsNil)
@@ -87,7 +95,11 @@ func (s *ObjectsSuite) TestBlobHash(c *C) {
 	c.Assert(blob.Size, Equals, int64(3))
 	c.Assert(blob.Hash.String(), Equals, "d96c7efbfec2814ae0301ad054dc8d9fc416c9b5")
 
-	data, err := ioutil.ReadAll(blob.Reader())
+	reader, err := blob.Reader()
+	c.Assert(err, IsNil)
+	defer func() { c.Assert(reader.Close(), IsNil) }()
+
+	data, err := ioutil.ReadAll(reader)
 	c.Assert(err, IsNil)
 	c.Assert(string(data), Equals, "FOO")
 }
-- 
cgit