Remove UnmarshalParams, it was just a temporary fix for accepting json data

hoisie · hoisie · commit 013d0f919fc2 · 2012-01-23T10:00:21.000-08:00
diff --git a/request.go b/request.go
@@ -1,11 +1,11 @@
 package web
 
 import (
+    "bytes"
     "fmt"
     "http"
     "io"
     "io/ioutil"
-    "json"
     "mime"
     "mime/multipart"
     "net"
@@ -164,12 +164,12 @@ func parseForm(m map[string][]string, query string) (err os.Error) {
 // ParseForm parses the request body as a form for POST requests, or the raw query for GET requests.
 // It is idempotent.
 func (r *Request) parseParams() (err os.Error) {
+
     if r.Params != nil {
         return
     }
     r.FullParams = make(map[string][]string)
     queryParams := r.URL.RawQuery
-    var bodyParams string
     switch r.Method {
     case "POST":
         if r.Body == nil {
@@ -179,21 +179,11 @@ func (r *Request) parseParams() (err os.Error) {
         ct := r.Headers.Get("Content-Type")
         switch strings.SplitN(ct, ";", 2)[0] {
         case "text/plain", "application/x-www-form-urlencoded", "":
-            var b []byte
-            if b, err = ioutil.ReadAll(r.Body); err != nil {
-                return err
-            }
-            bodyParams = string(b)
-        case "application/json":
-            //if we get JSON, do the best we can to convert it to a map[string]string
-            //we make the body available as r.ParamData
             var b []byte
             if b, err = ioutil.ReadAll(r.Body); err != nil {
                 return err
             }
             r.ParamData = b
-            r.Params = map[string]string{}
-            json.Unmarshal(b, r.Params)
         case "multipart/form-data":
             _, params := mime.ParseMediaType(ct)
             boundary, ok := params["boundary"]
@@ -246,11 +236,12 @@ func (r *Request) parseParams() (err os.Error) {
         }
     }
 
-    if bodyParams != "" {
-        err = parseForm(r.FullParams, bodyParams)
+    if len(r.ParamData) > 0 {
+        err = parseForm(r.FullParams, string(r.ParamData))
         if err != nil {
             return err
         }
+        r.Body = bytes.NewBuffer(r.ParamData)
     }
 
     r.Params = flattenParams(r.FullParams)
@@ -349,16 +340,3 @@ func (r *Request) writeToContainer(val reflect.Value) os.Error {
     }
     return nil
 }
-
-func (r *Request) UnmarshalParams(val interface{}) os.Error {
-    if strings.HasPrefix(r.Headers.Get("Content-Type"), "application/json") {
-        return json.Unmarshal(r.ParamData, val)
-    } else {
-        err := r.writeToContainer(reflect.ValueOf(val))
-        if err != nil {
-            return err
-        }
-    }
-
-    return nil
-}
diff --git a/web_test.go b/web_test.go
@@ -171,6 +171,12 @@ func init() {
         return string(data)
     })
 
+    Post("/parsejson", func(ctx *Context) string {
+        var tmp = struct{ A string; B string }{}
+        json.NewDecoder(ctx.Request.Body).Decode(&tmp)
+        return tmp.A + " " + tmp.B
+    })
+
     //s := &StructHandler{"a"}
     //Get("/methodhandler", MethodHandler(s, "method"))
     //Get("/methodhandler2", MethodHandler(s, "method2"))
@@ -204,6 +210,7 @@ var tests = []Test{
     //{"GET", "/methodhandler", "", 200, `a`},
     //{"GET", "/methodhandler2?b=b", "", 200, `ab`},
     //{"GET", "/methodhandler3/b", "", 200, `ab`},
+    {"POST", "/parsejson", `{"a":"hello", "b":"world"}`, 200, "hello world"},
 }
 
 func buildTestRequest(method string, path string, body string, headers map[string][]string, cookies []*http.Cookie) *Request {
@@ -213,15 +220,17 @@ func buildTestRequest(method string, path string, body string, headers map[strin
     url_, _ := url.Parse(rawurl)
 
     proto := "HTTP/1.1"
-    useragent := "web.go test framework"
+    useragent := "web.go test"
 
     if headers == nil {
         headers = map[string][]string{}
     }
 
     if method == "POST" {
         headers["Content-Length"] = []string{fmt.Sprintf("%d", len(body))}
-        headers["Content-Type"] = []string{"text/plain"}
+        if headers["Content-Type"] == nil {
+            headers["Content-Type"] = []string{"text/plain"}
+        } 
     }
 
     req := Request{Method: method,
@@ -663,6 +672,7 @@ func TestSecureCookieFcgi(t *testing.T) {
     }
 }
 
+
 //Disabled until issue 1375 is fixed
 /*
 func TestCloseServer(t *testing.T) {
