Merge pull request #4 from Konboi/feature/support-form-urleccoded

Support content-type:application/x-www-form-urlencoded #3

ghooks.go

@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	VERSION = 0.1
+	VERSION = 0.2
 )
 
 type Server struct {
@@ -69,13 +69,28 @@ func Reciver(w http.ResponseWriter, req *http.Request) {
 	defer req.Body.Close()
 
 	var payload interface{}
-	decoder := json.NewDecoder(req.Body)
+	var decoder *json.Decoder
+
+	if strings.Contains(req.Header.Get("Content-Type"), "application/json") {
+
+		decoder = json.NewDecoder(req.Body)
+
+	} else if strings.Contains(req.Header.Get("Content-Type"), "application/x-www-form-urlencoded") {
+
+		err := req.ParseForm()
+		if err != nil {
+			http.Error(w, "Bad Request", http.StatusBadRequest)
+			return
+		}
+		p := req.FormValue("payload")
+		decoder = json.NewDecoder(strings.NewReader(p))
+	}
+
 	err := decoder.Decode(&payload)
 	if err != nil {
 		http.Error(w, "Bad Request", http.StatusBadRequest)
 		return
 	}
-
 	Emmit(event, payload)
 	w.WriteHeader(http.StatusOK)
 }

ghooks_test.go

@@ -84,6 +84,7 @@ func TestReciver(t *testing.T) {
 	json_string := `{"fuga": "hoge", "foo": { "bar": "boo" }}`
 	req, _ = http.NewRequest("POST", "/", strings.NewReader(json_string))
 	req.Header.Set("X-GitHub-Event", "hoge")
+	req.Header.Set("Content-Type", "application/json")
 	w = httptest.NewRecorder()
 	Reciver(w, req)
 	if w.Code != 200 {
@@ -93,9 +94,21 @@ func TestReciver(t *testing.T) {
 	json_string = `{"fuga": "hoge", "foo": { "bar", "boo" }}`
 	req, _ = http.NewRequest("POST", "/", strings.NewReader(json_string))
 	req.Header.Set("X-GitHub-Event", "hoge")
+	req.Header.Set("Content-Type", "application/json")
 	w = httptest.NewRecorder()
 	Reciver(w, req)
 	if w.Code == 200 {
 		t.Fatalf("Should not be 200; received %d", w.Code)
 	}
+
+	json_string = `{"fuga": "hoge", "foo": { "bar": "boo" }}`
+	req, _ = http.NewRequest("POST", "/", strings.NewReader("payload="+json_string))
+	req.Header.Set("X-GitHub-Event", "hoge")
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	w = httptest.NewRecorder()
+	Reciver(w, req)
+	if w.Code != 200 {
+		t.Fatalf("Not return 200; received %d", w.Code)
+	}
+
 }