Code changes from editing.

ardan-bkennedy · ardan-bkennedy · commit 4eecdc6efd26 · 2015-05-22T22:10:32.000-04:00
diff --git a/chapter9/listing03/listing03_test.go b/chapter9/listing03/listing03_test.go
@@ -40,33 +40,6 @@ func mockServer() *httptest.Server {
 	return httptest.NewServer(http.HandlerFunc(f))
 }
 
-// Item defines the fields associated with the item tag in
-// the buoy RSS document.
-type Item struct {
-	XMLName     xml.Name `xml:"item"`
-	Title       string   `xml:"title"`
-	Description string   `xml:"description"`
-	Link        string   `xml:"link"`
-}
-
-// Channel defines the fields associated with the channel tag in
-// the buoy RSS document.
-type Channel struct {
-	XMLName     xml.Name `xml:"channel"`
-	Title       string   `xml:"title"`
-	Description string   `xml:"description"`
-	Link        string   `xml:"link"`
-	PubDate     string   `xml:"pubDate"`
-	Items       []Item   `xml:"item"`
-}
-
-// Document defines the fields associated with the buoy RSS document.
-type Document struct {
-	XMLName xml.Name `xml:"rss"`
-	Channel Channel  `xml:"channel"`
-	URI     string
-}
-
 // TestDownload validates the http Get function can download content
 // and the content can be unmarshaled and clean.
 func TestDownload(t *testing.T) {
@@ -115,3 +88,30 @@ func TestDownload(t *testing.T) {
 		}
 	}
 }
+
+// Item defines the fields associated with the item tag in
+// the buoy RSS document.
+type Item struct {
+	XMLName     xml.Name `xml:"item"`
+	Title       string   `xml:"title"`
+	Description string   `xml:"description"`
+	Link        string   `xml:"link"`
+}
+
+// Channel defines the fields associated with the channel tag in
+// the buoy RSS document.
+type Channel struct {
+	XMLName     xml.Name `xml:"channel"`
+	Title       string   `xml:"title"`
+	Description string   `xml:"description"`
+	Link        string   `xml:"link"`
+	PubDate     string   `xml:"pubDate"`
+	Items       []Item   `xml:"item"`
+}
+
+// Document defines the fields associated with the buoy RSS document.
+type Document struct {
+	XMLName xml.Name `xml:"rss"`
+	Channel Channel  `xml:"channel"`
+	URI     string
+}
diff --git a/chapter9/listing04/handlers/handlers.go b/chapter9/listing04/handlers/handlers.go
@@ -3,10 +3,7 @@ package handlers
 
 import (
 	"encoding/json"
-	"fmt"
-	"log"
 	"net/http"
-	"strconv"
 )
 
 // Routes sets the routes for the web service.
@@ -24,19 +21,7 @@ func SendJSON(rw http.ResponseWriter, r *http.Request) {
 		Email: "bill@ardanstudios.com",
 	}
 
-	data, err := json.Marshal(&u)
-	if err != nil {
-		// We want this error condition to panic so we get a
-		// stack trace. This should never happen. The http
-		// package will catch the panic and provide logging
-		// and return a 500 back to the caller.
-		log.Panic("Unable to unmarshal response", err)
-	}
-
-	datalen := len(data) + 1 // account for trailing LF
-	h := rw.Header()
-	h.Set("Content-Type", "application/json")
-	h.Set("Content-Length", strconv.Itoa(datalen))
+	rw.Header().Set("Content-Type", "application/json")
 	rw.WriteHeader(200)
-	fmt.Fprintf(rw, "%s\n", data)
+	json.NewEncoder(rw).Encode(&u)
 }
diff --git a/chapter9/listing04/handlers/handlers_test.go b/chapter9/listing04/handlers/handlers_test.go
@@ -22,19 +22,19 @@ func init() {
 func TestSendJSON(t *testing.T) {
 	t.Log("Given the need to test the SendJSON endpoint.")
 	{
-		r, err := http.NewRequest("GET", "/sendjson", nil)
+		req, err := http.NewRequest("GET", "/sendjson", nil)
 		if err != nil {
 			t.Fatal("\tShould be able to create a request.",
 				ballotX, err)
 		}
 		t.Log("\tShould be able to create a request.",
 			checkMark)
 
-		w := httptest.NewRecorder()
-		http.DefaultServeMux.ServeHTTP(w, r)
+		rw := httptest.NewRecorder()
+		http.DefaultServeMux.ServeHTTP(rw, req)
 
-		if w.Code != 200 {
-			t.Fatal("\tShould receive \"200\"", ballotX, w.Code)
+		if rw.Code != 200 {
+			t.Fatal("\tShould receive \"200\"", ballotX, rw.Code)
 		}
 		t.Log("\tShould receive \"200\"", checkMark)
 
@@ -43,7 +43,7 @@ func TestSendJSON(t *testing.T) {
 			Email string
 		}{}
 
-		if err := json.NewDecoder(w.Body).Decode(&u); err != nil {
+		if err := json.NewDecoder(rw.Body).Decode(&u); err != nil {
 			t.Fatal("\tShould decode the response.", ballotX)
 		}
 		t.Log("\tShould decode the response.", checkMark)
