Merge branch 'mpolden:master' into master

Author: jopdorp

README.md

@@ -40,6 +40,9 @@ Bornyasherk
 
 $ curl ifconfig.co/asn
 AS59795
+
+$ curl ifconfig.co/asn-org
+Hosting4Real
 ```
 
 As JSON:
@@ -107,6 +110,11 @@ Hub](https://hub.docker.com/r/mpolden/echoip), which can be downloaded with:
 
 `docker pull mpolden/echoip`
 
+## [GeoIP](https://www.maxmind.com/en/geoip2-databases)/[GeoLite](https://dev.maxmind.com/geoip/geolite2-free-geolocation-data?) Database (MaxMind)
+To utilise MaxMind [GeoIP](https://www.maxmind.com/en/geoip2-databases)/[GeoLite](https://dev.maxmind.com/geoip/geolite2-free-geolocation-data?) database to enhance the information provided to end users, you can download the relevant **binary** databases (`.mmdb` format) directly from MaxMind using the above links.
+
+**Please Note**: This has only been tested using the free, GeoLite database.
+
 ### Usage
 
 ```

cmd/echoip/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"flag"
 	"log"
+	"strings"
 
 	"os"
 
@@ -14,14 +15,7 @@ import (
 type multiValueFlag []string
 
 func (f *multiValueFlag) String() string {
-	vs := ""
-	for i, v := range *f {
-		vs += v
-		if i < len(*f)-1 {
-			vs += ", "
-		}
-	}
-	return vs
+	return strings.Join([]string(*f), ", ")
 }
 
 func (f *multiValueFlag) Set(v string) error {

cmd/echoip/main_test.go

@@ -0,0 +1,42 @@
+package main
+
+import "testing"
+
+func TestMultiValueFlagString(t *testing.T) {
+	var xmvf = []struct {
+		values multiValueFlag
+		expect string
+	}{
+		{
+			values: multiValueFlag{
+				"test",
+				"with multiples",
+				"flags",
+			},
+			expect: `test, with multiples, flags`,
+		},
+		{
+			values: multiValueFlag{
+				"test",
+			},
+			expect: `test`,
+		},
+		{
+			values: multiValueFlag{
+				"",
+			},
+			expect: ``,
+		},
+		{
+			values: nil,
+			expect: ``,
+		},
+	}
+
+	for _, mvf := range xmvf {
+		got := mvf.values.String()
+		if got != mvf.expect {
+			t.Errorf("\nFor: %#v\nExpected: %v\nGot: %v", mvf.values, mvf.expect, got)
+		}
+	}
+}

http/http.go

@@ -240,6 +240,15 @@ func (s *Server) CLIASNHandler(w http.ResponseWriter, r *http.Request) *appError
 	return nil
 }
 
+func (s *Server) CLIASNOrgHandler(w http.ResponseWriter, r *http.Request) *appError {
+	response, err := s.newResponse(r)
+	if err != nil {
+		return badRequest(err).WithMessage(err.Error()).AsJSON()
+	}
+	fmt.Fprintf(w, "%s\n", response.ASNOrg)
+	return nil
+}
+
 func (s *Server) JSONHandler(w http.ResponseWriter, r *http.Request) *appError {
 	response, err := s.newResponse(r)
 	if err != nil {
@@ -431,6 +440,7 @@ func (s *Server) Handler() http.Handler {
 		r.Route("GET", "/city", s.CLICityHandler)
 		r.Route("GET", "/coordinates", s.CLICoordinatesHandler)
 		r.Route("GET", "/asn", s.CLIASNHandler)
+		r.Route("GET", "/asn-org", s.CLIASNOrgHandler)
 	}
 
 	// Browser

http/http_test.go

@@ -94,6 +94,7 @@ func TestCLIHandlers(t *testing.T) {
 		{s.URL + "/city", "Bornyasherk\n", 200, "", ""},
 		{s.URL + "/foo", "404 page not found", 404, "", ""},
 		{s.URL + "/asn", "AS59795\n", 200, "", ""},
+		{s.URL + "/asn-org", "Hosting4Real\n", 200, "", ""},
 	}
 
 	for _, tt := range tests {