Merge pull request #184 from ponzu-cms/ponzu-dev

[core] update Omittable, Pushable interfaces and implementations to take res/req pair and hydrate item for caller

1 files changed, 8 insertions, 4 deletions

diff --git a/system/api/omit.go b/system/api/omit.go
index 909e3ad..e8960bb 100644
--- a/system/api/omit.go
+++ b/system/api/omit.go
@@ -3,6 +3,7 @@ package api
 import (
 	"fmt"
 	"log"
+	"net/http"
 
 	"github.com/ponzu-cms/ponzu/system/item"
 
@@ -10,19 +11,22 @@ import (
 	"github.com/tidwall/sjson"
 )
 
-func omit(it interface{}, data []byte) ([]byte, error) {
+func omit(res http.ResponseWriter, req *http.Request, it interface{}, data []byte) ([]byte, error) {
 	// is it Omittable
 	om, ok := it.(item.Omittable)
 	if !ok {
 		return data, nil
 	}
 
-	return omitFields(om, data, "data")
+	return omitFields(res, req, om, data, "data")
 }
 
-func omitFields(om item.Omittable, data []byte, pathPrefix string) ([]byte, error) {
+func omitFields(res http.ResponseWriter, req *http.Request, om item.Omittable, data []byte, pathPrefix string) ([]byte, error) {
 	// get fields to omit from json data
-	fields := om.Omit()
+	fields, err := om.Omit(res, req)
+	if err != nil {
+		return nil, err
+	}
 
 	// remove each field from json, all responses contain json object(s) in top-level "data" array
 	n := int(gjson.GetBytes(data, pathPrefix+".#").Int())