Harmonizing output formats

This adds the IP address to the first column of the CSV output. Closes #85.
fiorix · Nov 18, 2014 · cc079e0 · cc079e0
1 parent 7a6500c
commit cc079e0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/encoder.go b/encoder.go
@@ -137,6 +137,7 @@ func (f *CSVEncoder) Encode(w http.ResponseWriter, r *http.Request, q Query, ip
 	cw := csv.NewWriter(w)
 	cw.UseCRLF = f.UseCRLF
 	err := cw.Write([]string{
+		ip.String(),
 		record.CountryCode,
 		record.CountryName,
 		record.RegionCode,

diff --git a/encoder_test.go b/encoder_test.go
@@ -34,7 +34,7 @@ func TestCSVEncoder(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if row[0] != "US" {
+	if row[1] != "US" {
 		t.Fatalf("Unexpected country code in record: %#v", row)
 	}
 }

diff --git a/freegeoip_test.go b/freegeoip_test.go
@@ -137,7 +137,7 @@ func TestLookupXForwardedFor(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if row[0] != "US" {
+	if row[1] != "US" {
 		t.Fatalf("Unexpected country code in record: %#v", row)
 	}
 }