Merge pull request #4 from mimiro-io/improvement/expose-context-on-return-ec

expects and returns context

Author: gra-moore

sample/sample_transform.go

@@ -35,7 +35,7 @@ func (dl *SampleTransform) Transform(ec *egdm.EntityCollection) (*egdm.EntityCol
 	if err != nil {
 		return nil, ct.Err(err, 1)
 	}
-	return &egdm.EntityCollection{Entities: result}, nil
+	return &egdm.EntityCollection{Entities: result, NamespaceManager: ec.NamespaceManager}, nil
 }
 
 type Result struct {

sample/sample_transform_test.go

@@ -50,6 +50,10 @@ func TestNewSampleDataLayer(t *testing.T) {
 	// test transform, by creating entity collection with example entities
 	data := `
 		[
+			{
+				"id" : "@context",
+				"namespaces" : {}
+			},
 			{
 				"id": "http://example.com/1",
 				"props": {
@@ -67,7 +71,7 @@ func TestNewSampleDataLayer(t *testing.T) {
 	reader := strings.NewReader(data)
 
 	nsManager := egdm.NewNamespaceContext()
-	parser := egdm.NewEntityParser(nsManager).WithNoContext().WithExpandURIs()
+	parser := egdm.NewEntityParser(nsManager).WithExpandURIs()
 	ec, err := parser.LoadEntityCollection(reader)
 	if err != nil {
 		t.Error(err)
@@ -81,7 +85,7 @@ func TestNewSampleDataLayer(t *testing.T) {
 	}
 
 	// load a new entity collection from the response
-	parser = egdm.NewEntityParser(egdm.NewNamespaceContext()).WithNoContext().WithExpandURIs()
+	parser = egdm.NewEntityParser(egdm.NewNamespaceContext()).WithExpandURIs()
 	ec1, err := parser.LoadEntityCollection(resp.Body)
 	if err != nil {
 		t.Error(err)

web.go

@@ -141,7 +141,7 @@ func (ws *transformWebService) health(c echo.Context) error {
 
 func (ws *transformWebService) transform(c echo.Context) error {
 	parser := egdm.NewEntityParser(egdm.NewNamespaceContext())
-	parser.WithNoContext().WithExpandURIs()
+	parser.WithExpandURIs()
 	ec, err := parser.LoadEntityCollection(c.Request().Body)
 
 	if err != nil {
@@ -158,7 +158,6 @@ func (ws *transformWebService) transform(c echo.Context) error {
 	c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)
 	c.Response().WriteHeader(http.StatusOK)
 
-	transformed.SetOmitContextOnWrite(true)
 	err = transformed.WriteEntityGraphJSON(c.Response().Writer)
 	if err != nil {
 		ws.logger.Warn(err.Error())