From f47826071f1e6d7b048d1304d8435a347f9b412a Mon Sep 17 00:00:00 2001 From: Steve Manuel Date: Mon, 13 Feb 2017 09:18:36 -0800 Subject: adding item.Omittable interface for field-level omission of data in responses, implementation in handler and separating source into individual files for other interface impls --- system/api/omit.go | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 system/api/omit.go (limited to 'system/api/omit.go') diff --git a/system/api/omit.go b/system/api/omit.go new file mode 100644 index 0000000..46e172c --- /dev/null +++ b/system/api/omit.go @@ -0,0 +1,34 @@ +package api + +import ( + "log" + "net/http" + + "github.com/ponzu-cms/ponzu/system/item" + + "github.com/tidwall/sjson" +) + +func omit(it interface{}, res http.ResponseWriter, req *http.Request, data *[]byte) ([]byte, error) { + // is it Omittable + om, ok := it.(item.Omittable) + if !ok { + return *data, nil + } + + // get fields to omit from json data + fields := om.Omit() + + // remove each field from json, all responses contain json object(s) in top-level "data" array + var omitted []byte + for i := range fields { + var err error + omitted, err = sjson.DeleteBytes(*data, "data."+fields[i]) + if err != nil { + log.Println("Erorr omitting field:", fields[i], "from item.Omittable:", it) + return nil, err + } + } + + return omitted, nil +} -- cgit v1.2.3 From d2240b2ea40a3073e12c4c4ab529d486fa2b99d9 Mon Sep 17 00:00:00 2001 From: Steve Manuel Date: Mon, 13 Feb 2017 09:44:32 -0800 Subject: updating omit implementation --- system/api/omit.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'system/api/omit.go') diff --git a/system/api/omit.go b/system/api/omit.go index 46e172c..d907712 100644 --- a/system/api/omit.go +++ b/system/api/omit.go @@ -2,30 +2,33 @@ package api import ( "log" - "net/http" "github.com/ponzu-cms/ponzu/system/item" "github.com/tidwall/sjson" ) -func omit(it interface{}, res http.ResponseWriter, req *http.Request, data *[]byte) ([]byte, error) { +func omit(it interface{}, data []byte) ([]byte, error) { // is it Omittable om, ok := it.(item.Omittable) if !ok { - return *data, nil + return data, nil } + return omitFields(om, data, "data.0.") +} + +func omitFields(om item.Omittable, data []byte, pathPrefix string) ([]byte, error) { // get fields to omit from json data fields := om.Omit() // remove each field from json, all responses contain json object(s) in top-level "data" array - var omitted []byte + var omitted = data for i := range fields { var err error - omitted, err = sjson.DeleteBytes(*data, "data."+fields[i]) + omitted, err = sjson.DeleteBytes(omitted, pathPrefix+fields[i]) if err != nil { - log.Println("Erorr omitting field:", fields[i], "from item.Omittable:", it) + log.Println("Erorr omitting field:", fields[i], "from item.Omittable:", om) return nil, err } } -- cgit v1.2.3