Fix bug in LDP type assignment; better align output with FCREPO4.

lakesuperior/endpoints/ldp.py

@@ -275,7 +275,8 @@ def put_resource(uuid):
     '''
     # Parse headers.
     logger.info('Request headers: {}'.format(request.headers))
-    rsp_headers = std_headers
+
+    rsp_headers = {'Content-Type' : 'text/plain; charset=utf-8'}
 
     handling, disposition = set_post_put_params()
     stream, mimetype = bitstream_from_req()
@@ -284,6 +285,9 @@ def put_resource(uuid):
         rsrc = LdpFactory.from_provided(uuid, content_length=request.content_length,
                 stream=stream, mimetype=mimetype, handling=handling,
                 disposition=disposition)
+        if not request.content_length and rsrc.is_stored:
+            raise InvalidResourceError(
+                rsrc.uuid, 'Resource already exists and no data was provided.')
     except InvalidResourceError as e:
         return str(e), 409
     except (ServerManagedTermError, SingleSubjectError) as e:
@@ -298,6 +302,7 @@ def put_resource(uuid):
     except TombstoneError as e:
         return _tombstone_response(e, uuid)
 
+    rsp_headers.update(rsrc.head())
     if ret == Ldpr.RES_CREATED:
         rsp_code = 201
         rsp_headers['Location'] = rsp_body = rsrc.uri
@@ -315,7 +320,7 @@ def patch_resource(uuid):
     '''
     Update an existing resource with a SPARQL-UPDATE payload.
     '''
-    headers = std_headers
+    rsp_headers = {'Content-Type' : 'text/plain; charset=utf-8'}
     rsrc = LdpRs(uuid)
     if request.mimetype != 'application/sparql-update':
         return 'Provided content type is not a valid parsable format: {}'\
@@ -329,8 +334,9 @@ def patch_resource(uuid):
         return _tombstone_response(e, uuid)
     except (ServerManagedTermError, SingleSubjectError) as e:
         return str(e), 412
-
-    return '', 204, headers
+    else:
+        rsp_headers.update(rsrc.head())
+        return '', 204, rsp_headers
 
 
 @ldp.route('/<path:uuid>/fcr:metadata', methods=['PATCH'])

lakesuperior/model/ldp_factory.py

@@ -78,7 +78,7 @@ class LdpFactory:
 
         if not content_length:
             # Create empty LDPC.
-            logger.debug('No data received in request. '
+            logger.info('No data received in request. '
                     'Creating empty container.')
             inst = model.ldp_rs.Ldpc(
                     uuid, provided_imr=Resource(Graph(), urn), **kwargs)

lakesuperior/model/ldp_rs.py

@@ -20,6 +20,10 @@ class LdpRs(Ldpr):
         skips all server-managed checks. It is used for internal modifications.
         '''
         super().__init__(uuid, **kwargs)
+        self.base_types = super().base_types | {
+            nsc['fcrepo'].Container,
+            nsc['ldp'].Container,
+        }
 
         # provided_imr can be empty. If None, it is an outbound resource.
         if self.provided_imr is not None:
@@ -99,10 +103,10 @@ class Ldpc(LdpRs):
 
     def __init__(self, uuid, *args, **kwargs):
         super().__init__(uuid, *args, **kwargs)
-        self.base_types.update({
+        self.base_types = super().base_types | {
             nsc['fcrepo'].Container,
             nsc['ldp'].Container,
-        })
+        }
 
 
 
@@ -110,9 +114,9 @@ class LdpBc(Ldpc):
     '''LDP-BC (LDP Basic Container).'''
     def __init__(self, uuid, *args, **kwargs):
         super().__init__(uuid, *args, **kwargs)
-        self.base_types.update({
+        self.base_types = super().base_types | {
             nsc['ldp'].BasicContainer,
-        })
+        }
 
 
 
@@ -121,9 +125,9 @@ class LdpDc(Ldpc):
 
     def __init__(self, uuid, *args, **kwargs):
         super().__init__(uuid, *args, **kwargs)
-        self.base_types.update({
+        self.base_types = super().base_types | {
             nsc['ldp'].DirectContainer,
-        })
+        }
 
 
 
@@ -132,9 +136,9 @@ class LdpIc(Ldpc):
 
     def __init__(self, uuid, *args, **kwargs):
         super().__init__(uuid, *args, **kwargs)
-        self.base_types.update({
+        self.base_types = super().base_types | {
             nsc['ldp'].IndirectContainer,
-        })
+        }
 
 
 

lakesuperior/store_layouts/ldp_rs/default_layout.py

@@ -192,7 +192,7 @@ class DefaultLayout(BaseRdfLayout):
 
         if not types:
             # @FIXME This is terrible, but I can't get Fuseki to update the
-            # default graph without using a vaiable.
+            # default graph without using a variable.
             #target_gr = self.ds.graph(self.UNION_GRAPH_URI)
             target_gr = {
                 self.ds.graph(self.HIST_GRAPH_URI),