add JoinURL() to httputil

httputil/httputil.go

@@ -103,3 +103,17 @@ func PostMultiPart(uri string, files map[string]string) ([]byte, error) {
 	}
 	return ioutil.ReadAll(resp.Body)
 }
+
+func JoinURL(s1, s2 string) string {
+	if strings.HasSuffix(s1, "/") {
+		if strings.HasPrefix(s2, "/") {
+			return s1 + s2[1:]
+		}
+		return s1 + s2
+	}
+
+	if strings.HasPrefix(s2, "/") {
+		return s1 + s2
+	}
+	return s1 + "/" + s2
+}

httputil/httputil_test.go

@@ -0,0 +1,22 @@
+package httputil
+
+import (
+	"testing"
+
+	"github.com/kjk/common/assert"
+)
+
+func TestJoinURL(t *testing.T) {
+	tests := []string{
+		"foo", "bar", "foo/bar",
+		"foo", "/bar", "foo/bar",
+		"foo/", "bar", "foo/bar",
+		"foo/", "/bar", "foo/bar",
+	}
+	n := len(tests)
+	for i := 0; i < n; i += 3 {
+		got := JoinURL(tests[i], tests[i+1])
+		exp := tests[i+2]
+		assert.Equal(t, exp, got)
+	}
+}