Allow for new binders to be registered with Buffalo closes #222 closes …

…#221

binding.go

@@ -0,0 +1,65 @@
+package buffalo
+
+import (
+	"encoding/json"
+	"encoding/xml"
+	"net/http"
+	"reflect"
+	"sync"
+
+	"github.com/gorilla/schema"
+	"github.com/markbates/pop/nulls"
+	"github.com/pkg/errors"
+)
+
+var binderLock = &sync.Mutex{}
+var binders = map[string]BinderFunc{}
+var schemaDecoder *schema.Decoder
+
+type BinderFunc func(*http.Request, interface{}) error
+
+func RegisterBinder(contentType string, fn BinderFunc) {
+	binderLock.Lock()
+	defer binderLock.Unlock()
+	binders[contentType] = fn
+}
+
+func init() {
+	schemaDecoder = schema.NewDecoder()
+	schemaDecoder.IgnoreUnknownKeys(true)
+	schemaDecoder.ZeroEmpty(true)
+
+	// register the types in the nulls package with the decoder
+	nulls.RegisterWithSchema(func(i interface{}, fn func(s string) reflect.Value) {
+		schemaDecoder.RegisterConverter(i, fn)
+	})
+
+	sb := func(req *http.Request, value interface{}) error {
+		err := req.ParseForm()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		return schemaDecoder.Decode(value, req.PostForm)
+	}
+	binders["application/html"] = sb
+	binders["text/html"] = sb
+	binders["application/x-www-form-urlencoded"] = sb
+}
+
+func init() {
+	jb := func(req *http.Request, value interface{}) error {
+		return json.NewDecoder(req.Body).Decode(value)
+	}
+	binders["application/json"] = jb
+	binders["text/json"] = jb
+	binders["json"] = jb
+}
+
+func init() {
+	xb := func(req *http.Request, value interface{}) error {
+		return xml.NewDecoder(req.Body).Decode(value)
+	}
+	binders["application/xml"] = xb
+	binders["text/xml"] = xb
+	binders["xml"] = xb
+}

default_context.go

@@ -3,8 +3,6 @@ package buffalo
 import (
 	"bytes"
 	"context"
-	"encoding/json"
-	"encoding/xml"
 	"fmt"
 	"io"
 	"net/http"
@@ -15,7 +13,6 @@ import (
 	"time"
 
 	"github.com/gobuffalo/buffalo/render"
-	"github.com/gorilla/schema"
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
 )
@@ -163,21 +160,11 @@ func (d *DefaultContext) Render(status int, rr render.Renderer) error {
 // is "application/xml" it will use "xml.NewDecoder". The default
 // binder is "http://www.gorillatoolkit.org/pkg/schema".
 func (d *DefaultContext) Bind(value interface{}) error {
-	switch strings.ToLower(d.Request().Header.Get("Content-Type")) {
-	case "application/json", "text/json", "json":
-		return json.NewDecoder(d.Request().Body).Decode(value)
-	case "application/xml", "text/xml", "xml":
-		return xml.NewDecoder(d.Request().Body).Decode(value)
-	default:
-		err := d.Request().ParseForm()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		dec := schema.NewDecoder()
-		dec.IgnoreUnknownKeys(true)
-		dec.ZeroEmpty(true)
-		return dec.Decode(value, d.Request().PostForm)
+	ct := strings.ToLower(d.Request().Header.Get("Content-Type"))
+	if b, ok := binders[ct]; ok {
+		return b(d.Request(), value)
 	}
+	return errors.Errorf("could not find a binder for %s", ct)
 }
 
 // LogField adds the key/value pair onto the Logger to be printed out