Improve headers; remove message digest from RDF output.

lakesuperior/ldp/ldpr.py

@@ -605,6 +605,22 @@ class LdpRs(Ldpr):
         nsc['ldp'].RDFSource
     }
 
+    std_headers = {
+        'Accept-Post' : {
+            'text/turtle',
+            'text/rdf+n3',
+            'text/n3',
+            'application/rdf+xml',
+            'application/n-triples',
+            'application/ld+json',
+            'multipart/form-data',
+            'application/sparql-update',
+        },
+        'Accept-Patch' : {
+            'application/sparql-update',
+        },
+    }
+
     @transactional
     @must_exist
     def patch(self, data):

lakesuperior/store_strategies/rdf/base_rdf_strategy.py

@@ -103,27 +103,30 @@ class BaseRdfStrategy(metaclass=ABCMeta):
     @property
     @abstractmethod
     @needs_rsrc
-    def out_graph(self):
+    def headers(self):
         '''
-        Graph obtained by querying the triplestore and adding any abstraction
-        and filtering to make up a graph that can be used for read-only,
-        API-facing results. Different strategies can implement this in very
-        different ways, so it is an abstract method.
+        Return a dict with information for generating HTTP headers.
+
+        @retun dict
         '''
         pass
 
 
-    @property
+    ## PUBLIC METHODS ##
+
+
     @abstractmethod
     @needs_rsrc
-    def headers(self):
+    def out_graph(self, srv_mgd=True, inbound=False, embed_children=False):
         '''
-        Return minimal information for generating HTTP headers.
+        Graph obtained by querying the triplestore and adding any abstraction
+        and filtering to make up a graph that can be used for read-only,
+        API-facing results. Different strategies can implement this in very
+        different ways, so it is an abstract method.
         '''
         pass
 
 
-    ## PUBLIC METHODS ##
 
     @abstractmethod
     def ask_rsrc_exists(self):

lakesuperior/store_strategies/rdf/simple_strategy.py

@@ -34,6 +34,8 @@ class SimpleStrategy(BaseRdfStrategy):
             'Link' : [],
         }
 
+        # @NOTE: Easy with these one-by-one picks. Each one of them is a call
+        # to the triplestore.
         digest = self.rsrc.value(nsc['premis'].hasMessageDigest)
         if digest:
             etag = digest.identifier.split(':')[-1]
@@ -47,7 +49,7 @@ class SimpleStrategy(BaseRdfStrategy):
         return headers
 
 
-    def out_graph(self, inbound=False):
+    def out_graph(self, srv_mgd=True, inbound=False, embed_children=False):
         '''
         See base_rdf_strategy.out_graph.
         '''
@@ -58,6 +60,7 @@ class SimpleStrategy(BaseRdfStrategy):
             {0} ?p ?o .{1}
         }} WHERE {{
             {0} ?p ?o .{1}
+            FILTER (?p != premis:hasMessageDigest) .
         }}
         '''.format(self.base_urn.n3(), inbound_qry)
 

lakesuperior/util/digest.py

@@ -31,8 +31,8 @@ class Digest:
 
         @return string SHA1 checksum.
         '''
-        # Remove the messageDigest property, which at this point is very likely
-        # old.
+        # Remove the messageDigest property, which very likely reflects the
+        # previous state of the resource.
         g.remove((Variable('s'), nsc['premis'].messageDigest, Variable('o')))
 
         ord_g = sorted(list(g), key=lambda x : (x[0], x[1], x[2]))

server.py

@@ -17,6 +17,40 @@ from lakesuperior.ldp.ldpr import Ldpr, Ldpc, LdpNr, \
 app = Flask(__name__)
 app.config.update(config['flask'])
 
+rest_accept_patch = (
+    'application/sparql-update',
+)
+rest_accept_post = (
+    'application/ld+json',
+    'application/n-triples',
+    'application/rdf+xml',
+    'application/x-turtle',
+    'application/xhtml+xml',
+    'application/xml',
+    'text/html',
+    'text/n3',
+    'text/plain',
+    'text/rdf+n3',
+    'text/turtle',
+)
+#rest_allow = (
+#    'COPY',
+#    'DELETE',
+#    'GET',
+#    'HEAD',
+#    'MOVE',
+#    'OPTIONS',
+#    'PATCH',
+#    'POST',
+#    'PUT',
+#)
+
+rest_std_headers = {
+    'Accept-Patch' : ','.join(rest_accept_patch),
+    'Accept-Post' : ','.join(rest_accept_post),
+    #'Allow' : ','.join(rest_allow),
+}
+
 
 ## ROUTES ##
 
@@ -25,7 +59,7 @@ def index():
     '''
     Homepage.
     '''
-    return 'Hello. This is LAKEsuperior.'
+    return u'<h1>Hello. This is LAKEsuperior.</h1><p>Exciting, isn’t it?</p>'
 
 
 @app.route('/debug', methods=['GET'])
@@ -45,6 +79,7 @@ def get_resource(uuid):
     '''
     Retrieve RDF or binary content.
     '''
+    headers = rest_std_headers
     # @TODO Add conditions for LDP-NR
     rsrc = Ldpc(uuid)
     try:
@@ -63,6 +98,7 @@ def post_resource(parent):
     '''
     Add a new resource in a new URI.
     '''
+    headers = rest_std_headers
     try:
         slug = request.headers['Slug']
     except KeyError:
@@ -77,9 +113,9 @@ def post_resource(parent):
 
     rsrc.post(request.get_data().decode('utf-8'))
 
-    headers = {
-        'Location' : rsrc.uri
-    }
+    headers.update({
+        'Location' : rsrc.uri,
+    })
 
     return rsrc.uri, headers, 201
 
@@ -89,10 +125,11 @@ def put_resource(uuid):
     '''
     Add a new resource at a specified URI.
     '''
+    headers = rest_std_headers
     rsrc = Ldpc(uuid)
 
     rsrc.put(request.get_data().decode('utf-8'))
-    return '', 204
+    return '', 204, headers
 
 
 @app.route('/rest/<path:uuid>', methods=['PATCH'])
@@ -100,6 +137,7 @@ def patch_resource(uuid):
     '''
     Update an existing resource with a SPARQL-UPDATE payload.
     '''
+    headers = rest_std_headers
     rsrc = Ldpc(uuid)
 
     try:
@@ -107,7 +145,7 @@ def patch_resource(uuid):
     except ResourceNotExistsError:
         return 'Resource #{} not found.'.format(rsrc.uuid), 404
 
-    return '', 204
+    return '', 204, headers
 
 
 @app.route('/rest/<path:uuid>', methods=['DELETE'])
@@ -115,6 +153,7 @@ def delete_resource(uuid):
     '''
     Delete a resource.
     '''
+    headers = rest_std_headers
     rsrc = Ldpc(uuid)
 
     try:
@@ -122,4 +161,4 @@ def delete_resource(uuid):
     except ResourceNotExistsError:
         return 'Resource #{} not found.'.format(rsrc.uuid), 404
 
-    return '', 204
+    return '', 204, headers