dep: internalize and improve JSON handling

manifest and lock's MarshalJSON methods were previously returning
HTML-escaped, unindented byte streams. Now they do that work internally,
and more gracefully via a json.Encoder.

Author: sdboyer

lock.go

@@ -5,6 +5,7 @@
 package main
 
 import (
+	"bytes"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
@@ -120,5 +121,12 @@ func (l *lock) MarshalJSON() ([]byte, error) {
 	}
 
 	// TODO sort output - #15
-	return json.Marshal(raw)
+
+	var buf bytes.Buffer
+	enc := json.NewEncoder(&buf)
+	enc.SetIndent("", "    ")
+	enc.SetEscapeHTML(false)
+	err := enc.Encode(raw)
+
+	return buf.Bytes(), err
 }

lock_test.go

@@ -5,9 +5,7 @@
 package main
 
 import (
-	"bytes"
 	"encoding/hex"
-	"encoding/json"
 	"reflect"
 	"strings"
 	"testing"
@@ -16,33 +14,35 @@ import (
 )
 
 const le = `{
-	"memo": "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e",
-	"projects": [
-		{
-			"name": "github.com/sdboyer/gps",
-			"branch": "master",
-			"version": "v0.12.0",
-			"revision": "d05d5aca9f895d19e9265839bffeadd74a2d2ecb",
-			"packages": [
-				"."
-			]
-		}
-	]
-}`
+    "memo": "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e",
+    "projects": [
+        {
+            "name": "github.com/sdboyer/gps",
+            "branch": "master",
+            "version": "v0.12.0",
+            "revision": "d05d5aca9f895d19e9265839bffeadd74a2d2ecb",
+            "packages": [
+                "."
+            ]
+        }
+    ]
+}
+`
 
 const lg = `{
-	"memo": "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e",
-	"projects": [
-		{
-			"name": "github.com/sdboyer/gps",
-			"branch": "master",
-			"revision": "d05d5aca9f895d19e9265839bffeadd74a2d2ecb",
-			"packages": [
-				"."
-			]
-		}
-	]
-}`
+    "memo": "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e",
+    "projects": [
+        {
+            "name": "github.com/sdboyer/gps",
+            "branch": "master",
+            "revision": "d05d5aca9f895d19e9265839bffeadd74a2d2ecb",
+            "packages": [
+                "."
+            ]
+        }
+    ]
+}
+`
 
 func TestReadLock(t *testing.T) {
 	_, err := readLock(strings.NewReader(le))
@@ -87,16 +87,12 @@ func TestWriteLock(t *testing.T) {
 		},
 	}
 
-	b, err := json.Marshal(l)
+	b, err := l.MarshalJSON()
 	if err != nil {
 		t.Fatalf("Error while marshaling valid lock to JSON: %q", err)
 	}
 
-	var out bytes.Buffer
-	json.Indent(&out, b, "", "\t")
-
-	s := out.String()
-	if s != lg {
-		t.Errorf("Valid lock did not marshal to JSON as expected:\n\t(GOT): %s\n\t(WNT): %s", s, lg)
+	if string(b) != lg {
+		t.Errorf("Valid lock did not marshal to JSON as expected:\n\t(GOT): %s\n\t(WNT): %s", string(b), lg)
 	}
 }

manifest.go

@@ -118,16 +118,13 @@ func (m *manifest) MarshalJSON() ([]byte, error) {
 		raw.Overrides[string(n)] = toPossible(pp)
 	}
 
-	b, err := json.Marshal(raw)
-	if err != nil {
-		return nil, err
-	}
+	var buf bytes.Buffer
+	enc := json.NewEncoder(&buf)
+	enc.SetIndent("", "    ")
+	enc.SetEscapeHTML(false)
+	err := enc.Encode(raw)
 
-	// Semver range ops, > and <, get turned into unicode code points. This is a
-	// nice example of why using JSON for files like this is not the best
-	b = bytes.Replace(b, []byte("\\u003c"), []byte("<"), -1)
-	b = bytes.Replace(b, []byte("\\u003e"), []byte(">"), -1)
-	return b, nil
+	return buf.Bytes(), err
 }
 
 func toPossible(pp gps.ProjectProperties) (p possibleProps) {

manifest_test.go

@@ -5,8 +5,6 @@
 package main
 
 import (
-	"bytes"
-	"encoding/json"
 	"reflect"
 	"strings"
 	"testing"
@@ -34,7 +32,8 @@ const je = `{
     "ignores": [
         "github.com/foo/bar"
     ]
-}`
+}
+`
 
 const jg = `{
     "dependencies": {
@@ -54,7 +53,8 @@ const jg = `{
     "ignores": [
         "github.com/foo/bar"
     ]
-}`
+}
+`
 
 func TestReadManifest(t *testing.T) {
 	_, err := readManifest(strings.NewReader(je))
@@ -119,20 +119,12 @@ func TestWriteManifest(t *testing.T) {
 		Ignores: []string{"github.com/foo/bar"},
 	}
 
-	b, err := json.Marshal(m)
+	b, err := m.MarshalJSON()
 	if err != nil {
 		t.Fatalf("Error while marshaling valid manifest to JSON: %q", err)
 	}
 
-	var out bytes.Buffer
-	json.Indent(&out, b, "", "    ")
-	b = out.Bytes()
-	// uuuuuughhhhh
-	b = bytes.Replace(b, []byte("\\u003c"), []byte("<"), -1)
-	b = bytes.Replace(b, []byte("\\u003e"), []byte(">"), -1)
-
-	s := string(b)
-	if s != jg {
-		t.Errorf("Valid manifest did not marshal to JSON as expected:\n\t(GOT): %s\n\t(WNT): %s", s, jg)
+	if string(b) != jg {
+		t.Errorf("Valid manifest did not marshal to JSON as expected:\n\t(GOT): %s\n\t(WNT): %s", string(b), jg)
 	}
 }