use local graph struct with etags

GET.go

@@ -33,7 +33,7 @@ func (c *Context) getRDF(w web.ResponseWriter, req *web.Request, mime string) {
 		w.Write([]byte(err.Error()))
 		return
 	}
-	// TODO replace with something better for ETag generation
-	w.Header().Add("ETag", newETag([]byte(graph.String())))
-	graph.Serialize(w, mime)
+	w.Header().Add("ETag", graph.Etag)
+	w.Header().Set("Content-Type", mime)
+	graph.Graph.Serialize(w, mime)
 }

GET_test.go

@@ -14,10 +14,9 @@ import (
 
 func Test_GET_RDF(t *testing.T) {
 	mime := "text/turtle"
-	URI := testServer.URL + "/rdf"
+	URI := testServer.URL + "/foo.ttl"
 	graph := rdf.NewGraph(URI)
-	graph.AddTriple(rdf.NewResource(URI), rdf.NewResource("pred"), rdf.NewLiteral("obj"))
-
+	graph.AddTriple(rdf.NewResource(URI), rdf.NewResource("http://test.com/foo"), rdf.NewLiteral("obj"))
 	buf := new(bytes.Buffer)
 	graph.Serialize(buf, mime)
 
@@ -34,6 +33,13 @@ func Test_GET_RDF(t *testing.T) {
 	res, err = testClient.Do(req)
 	assert.NoError(t, err)
 	assert.Equal(t, 200, res.StatusCode)
+	assert.Equal(t, mime, res.Header.Get("Content-Type"))
+
+	graph = rdf.NewGraph(URI)
+	graph.Parse(res.Body, res.Header.Get("Content-Type"))
+	res.Body.Close()
+	assert.Equal(t, 1, graph.Len())
+	assert.NotNil(t, graph.One(rdf.NewResource(URI), rdf.NewResource("http://test.com/foo"), rdf.NewLiteral("obj")))
 }
 
 func Test_GET_Static(t *testing.T) {

POST.go

@@ -17,9 +17,9 @@ func (c *Context) PostHandler(w web.ResponseWriter, req *web.Request) {
 
 func (c *Context) postRDF(w web.ResponseWriter, req *web.Request) {
 	URI := absoluteURI(req.Request)
-	graph := rdf.NewGraph(URI)
-	graph.Parse(req.Body, req.Header.Get("Content-Type"))
-	if graph.Len() == 0 {
+	g := rdf.NewGraph(URI)
+	g.Parse(req.Body, req.Header.Get("Content-Type"))
+	if g.Len() == 0 {
 		w.WriteHeader(400)
 		w.Write([]byte("Empty request body"))
 		return
@@ -30,10 +30,16 @@ func (c *Context) postRDF(w web.ResponseWriter, req *web.Request) {
 		w.Write([]byte("Cannot create new graph if it aready exists"))
 		return
 	}
+
+	// add graph
+	// TODO: move this into a go routine
+	graph := NewGraph()
+	graph.Graph = g
+	graph.Etag = newETag([]byte(g.String()))
 	c.addGraph(URI, graph)
 
 	// add ETag
-	w.Header().Add("ETag", newETag([]byte(graph.String())))
+	w.Header().Add("ETag", graph.Etag)
 
 	w.WriteHeader(201)
 }

rdf.go

@@ -21,6 +21,15 @@ var rdfMimes = []string{
 	"application/ld+json",
 }
 
+type Graph struct {
+	*rdf.Graph
+	Etag string
+}
+
+func NewGraph() *Graph {
+	return &Graph{}
+}
+
 func canParse(ctype string) bool {
 	if len(mimeParser[ctype]) > 0 {
 		return true
@@ -35,11 +44,11 @@ func canSerialize(ctype string) bool {
 	return false
 }
 
-func (c *Context) addGraph(URI string, graph *rdf.Graph) {
+func (c *Context) addGraph(URI string, graph *Graph) {
 	c.Store[URI] = graph
 }
 
-func (c *Context) getGraph(URI string) (*rdf.Graph, error) {
+func (c *Context) getGraph(URI string) (*Graph, error) {
 	if c.Store[URI] == nil {
 		return nil, errors.New("Cannot find graph that matches URI: " + URI)
 	}

rdf_test.go

@@ -29,11 +29,13 @@ func Test_RDF_AddRemoveGraph(t *testing.T) {
 	var err error
 	c := NewContext()
 	URI := "https://example.org"
-	graph := rdf.NewGraph(URI)
+	g := rdf.NewGraph(URI)
+	graph := NewGraph()
+	graph.Graph = g
 	c.addGraph(URI, graph)
 	graph, err = c.getGraph(URI)
 	assert.NoError(t, err)
-	assert.Equal(t, URI, graph.URI())
+	assert.Equal(t, URI, graph.Graph.URI())
 	err = c.delGraph(URI)
 	assert.NoError(t, err)
 	graph, err = c.getGraph(URI)

server.go

@@ -9,7 +9,6 @@ import (
 	"path"
 
 	"github.com/boltdb/bolt"
-	rdf "github.com/deiu/rdf2go"
 	"github.com/gocraft/web"
 	"github.com/rs/zerolog"
 )
@@ -26,15 +25,20 @@ var (
 type (
 	Context struct {
 		Config *Config
-		Store  map[string]*rdf.Graph
+		Store  map[string]*Graph
 		BoltDB *bolt.DB
 	}
+
+	APIContext struct {
+		*Context
+		AccessToken string
+	}
 )
 
 func NewContext() *Context {
 	return &Context{
 		Config: NewConfig(),
-		Store:  make(map[string]*rdf.Graph),
+		Store:  make(map[string]*Graph),
 		BoltDB: &bolt.DB{},
 	}
 }