From faf2f62612c381ab270cda55f34d14fc31487ace Mon Sep 17 00:00:00 2001
From: Martin Polden <martin.polden@gmail.com>
Date: Wed, 16 Nov 2016 20:00:03 +0100
Subject: [PATCH] Send plain response for Accept: text/plain

Fixes #24
---
 api/api.go      |  6 +++++-
 api/api_test.go | 30 ++++++++++++++++--------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/api/api.go b/api/api.go
index f0a6f0f..b7c397c 100644
--- a/api/api.go
+++ b/api/api.go
@@ -19,7 +19,10 @@ import (
 	"github.com/gorilla/mux"
 )
 
-const jsonMediaType = "application/json"
+const (
+	jsonMediaType = "application/json"
+	textMediaType = "text/plain"
+)
 
 var userAgentPattern = regexp.MustCompile(
 	`^(?:curl|Wget|fetch\slibfetch|ddclient|Go-http-client|HTTPie)\/.*|Go\s1\.1\spackage\shttp$`,
@@ -243,6 +246,7 @@ func (a *API) Router() http.Handler {
 
 	// CLI
 	r.Handle("/", appHandler(a.CLIHandler)).Methods("GET").MatcherFunc(cliMatcher)
+	r.Handle("/", appHandler(a.CLIHandler)).Methods("GET").Headers("Accept", textMediaType)
 	r.Handle("/ip", appHandler(a.CLIHandler)).Methods("GET")
 	r.Handle("/country", appHandler(a.CLICountryHandler)).Methods("GET")
 	r.Handle("/city", appHandler(a.CLICityHandler)).Methods("GET")
diff --git a/api/api_test.go b/api/api_test.go
index ddbaca4..bb92ea5 100644
--- a/api/api_test.go
+++ b/api/api_test.go
@@ -25,13 +25,13 @@ func newTestAPI() *API {
 	return &API{oracle: &mockOracle{}}
 }
 
-func httpGet(url string, json bool, userAgent string) (string, int, error) {
+func httpGet(url string, acceptMediaType string, userAgent string) (string, int, error) {
 	r, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return "", 0, err
 	}
-	if json {
-		r.Header.Set("Accept", "application/json")
+	if acceptMediaType != "" {
+		r.Header.Set("Accept", acceptMediaType)
 	}
 	r.Header.Set("User-Agent", userAgent)
 	res, err := http.DefaultClient.Do(r)
@@ -51,20 +51,22 @@ func TestCLIHandlers(t *testing.T) {
 	s := httptest.NewServer(newTestAPI().Router())
 
 	var tests = []struct {
-		url       string
-		out       string
-		status    int
-		userAgent string
+		url             string
+		out             string
+		status          int
+		userAgent       string
+		acceptMediaType string
 	}{
-		{s.URL, "127.0.0.1\n", 200, "curl/7.43.0"},
-		{s.URL + "/ip", "127.0.0.1\n", 200, ""},
-		{s.URL + "/country", "Elbonia\n", 200, ""},
-		{s.URL + "/city", "Bornyasherk\n", 200, ""},
-		{s.URL + "/foo", "404 page not found", 404, ""},
+		{s.URL, "127.0.0.1\n", 200, "curl/7.43.0", ""},
+		{s.URL, "127.0.0.1\n", 200, "foo/bar", textMediaType},
+		{s.URL + "/ip", "127.0.0.1\n", 200, "", ""},
+		{s.URL + "/country", "Elbonia\n", 200, "", ""},
+		{s.URL + "/city", "Bornyasherk\n", 200, "", ""},
+		{s.URL + "/foo", "404 page not found", 404, "", ""},
 	}
 
 	for _, tt := range tests {
-		out, status, err := httpGet(tt.url /* json = */, false, tt.userAgent)
+		out, status, err := httpGet(tt.url, tt.acceptMediaType, tt.userAgent)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -95,7 +97,7 @@ func TestJSONHandlers(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		out, status, err := httpGet(tt.url /* json = */, true, "curl/7.2.6.0")
+		out, status, err := httpGet(tt.url, jsonMediaType, "curl/7.2.6.0")
 		if err != nil {
 			t.Fatal(err)
 		}