Update to delimit deflated output with newlines

pkg/ghcomp/deflate_test.go

@@ -18,6 +18,9 @@ func TestDeflater_Deflate(t *testing.T) {
 	out = bytes.NewBuffer(nil)
 	err = Inflate(in, out)
 	assert.NoError(t, err)
+
+	inflatedElements := strings.Split(inflated, "\n")
+	assert.Equal(t, len(strings.Split(out.String(), "\n")), len(inflatedElements))
 	for _, e := range strings.Split(inflated, "\n") {
 		assert.Contains(t, out.String(), e)
 	}

pkg/ghcomp/ghcomp.go

@@ -13,7 +13,7 @@ var (
 
 const (
 	GlobalStart = '!'
-	SegmentStop = '.'
+	SegmentStop = '\n'
 )
 
 // Tree is the receiver for publicly exported methods.
@@ -57,7 +57,6 @@ func (t *Tree) Entree(value []byte) error {
 // EntreeDeflated adds deflated geohash values to the tree.
 func (t *Tree) EntreeDeflated(in io.Reader) error {
 	scanner := bufio.NewScanner(in)
-	scanner.Split(ScanSegment)
 	if !scanner.Scan() {
 		return fmt.Errorf("failed to scan input source")
 	}
@@ -83,23 +82,3 @@ func (t *Tree) EntreeDeflated(in io.Reader) error {
 
 	return nil
 }
-
-// ScanSegment reads a chunk of deflated geohash data delimited by SegmentStop.
-var ScanSegment bufio.SplitFunc = func(data []byte, atEOF bool) (advance int, token []byte, err error) {
-	if atEOF {
-		return
-	}
-
-	advance = 0
-	token = make([]byte, 0)
-	for i := range data {
-		advance++
-		if data[i] == SegmentStop {
-			return
-		}
-
-		token = append(token, data[i])
-	}
-
-	return
-}

pkg/ghcomp/ghcomp_test.go

@@ -10,7 +10,7 @@ import (
 const (
 	precision = 12
 	inflated  = "bdvkhunfnc90\nbdvkj7vyvtz5\nbdvkjkjbpr1t\nbdvkjkjbremh\nbdvkjkn00jdn\n"
-	deflated  = "bdvkhunfnc90.j7vyvtz5.kjbpr1t.remh.n00jdn."
+	deflated  = "bdvkhunfnc90\nj7vyvtz5\nkjbpr1t\nremh\nn00jdn\n"
 )
 
 func TestTree_Entree(t *testing.T) {

pkg/ghcomp/inflate.go

@@ -10,7 +10,6 @@ import (
 // can inflate the deflated values directly without using a tree.
 func Inflate(in io.Reader, out io.Writer) error {
 	scanner := bufio.NewScanner(in)
-	scanner.Split(ScanSegment)
 	if !scanner.Scan() {
 		return fmt.Errorf("failed to scan input source")
 	}

pkg/ghcomp/inflate_test.go

@@ -13,7 +13,10 @@ func TestInflater_Inflate(t *testing.T) {
 
 	err := Inflate(in, out)
 	assert.NoError(t, err)
-	for _, e := range strings.Split(inflated, "\n") {
+
+	inflatedElements := strings.Split(inflated, "\n")
+	assert.Equal(t, len(strings.Split(out.String(), "\n")), len(inflatedElements))
+	for _, e := range inflatedElements {
 		assert.Contains(t, out.String(), e)
 	}
 }