Return 409 on PUT or POST in a pairtree.

lakesuperior/endpoints/ldp.py

@@ -168,6 +168,8 @@ def put_resource(uuid):
         rsrc = Ldpr.inbound_inst(uuid, content_length=request.content_length,
                 stream=stream, mimetype=mimetype, handling=handling,
                 disposition=disposition)
+    except InvalidResourceError as e:
+        return str(e), 409
     except ServerManagedTermError as e:
         return str(e), 412
     except IncompatibleLdpTypeError as e:
@@ -281,6 +283,10 @@ def uuid_for_post(parent_uuid=None, slug=None):
 
     parent = Ldpr.outbound_inst(parent_uuid, repr_opts={'incl_children' : False})
 
+    if nsc['fcrepo'].Pairtree in parent.types:
+        raise InvalidResourceError(parent.uuid,
+                'Resources cannot be created under a pairtree.')
+
     # Set prefix.
     if parent_uuid:
         parent_types = { t.identifier for t in \

lakesuperior/model/ldpr.py

@@ -171,9 +171,9 @@ class Ldpr(metaclass=ABCMeta):
             logger.debug('No data received in request. '
                     'Creating empty container.')
 
-            return Ldpc(uuid, provided_imr=Resource(Graph(), urn), **kwargs)
+            inst = Ldpc(uuid, provided_imr=Resource(Graph(), urn), **kwargs)
 
-        if __class__.is_rdf_parsable(mimetype):
+        elif __class__.is_rdf_parsable(mimetype):
             # Create container and populate it with provided RDF data.
             provided_g = Graph().parse(data=stream.read().decode('utf-8'),
                     format=mimetype, publicID=urn)
@@ -210,6 +210,13 @@ class Ldpr(metaclass=ABCMeta):
         logger.info('Creating resource of type: {}'.format(
                 inst.__class__.__name__))
 
+        try:
+            types = inst.types
+        except:
+            types = set()
+        if nsc['fcrepo'].Pairtree in types:
+            raise InvalidResourceError(inst.uuid)
+
         return inst
 
 
@@ -804,8 +811,9 @@ class Ldpr(metaclass=ABCMeta):
         '''
         path_components = uuid.split('/')
 
+         # If there is only on element, the parent is the root node.
         if len(path_components) < 2:
-            return None
+            return self.ROOT_NODE_URN
 
         # Build search list, e.g. for a/b/c/d/e would be a/b/c/d, a/b/c, a/b, a
         self._logger.info('Path components: {}'.format(path_components))
@@ -825,7 +833,7 @@ class Ldpr(metaclass=ABCMeta):
                 self._create_path_segment(cparent_uri, cur_child_uri)
                 cur_child_uri = cparent_uri
 
-        return None
+        return self.ROOT_NODE_URN
 
 
     def _dedup_deltas(self, remove_g, add_g):
@@ -855,6 +863,7 @@ class Ldpr(metaclass=ABCMeta):
         imr.add(RDF.type, nsc['ldp'].Container)
         imr.add(RDF.type, nsc['ldp'].BasicContainer)
         imr.add(RDF.type, nsc['ldp'].RDFSource)
+        imr.add(RDF.type, nsc['fcrepo'].Pairtree)
         imr.add(nsc['fcrepo'].contains, child_uri)
 
         # If the path segment is just below root

tests/endpoints/test_ldp.py

@@ -41,8 +41,10 @@ class TestLdp:
         '''
         Check response headers for a PUT operation with empty payload.
         '''
-        res = self.client.put('/ldp/{}'.format(random_uuid))
-        assert res.status_code == 201
+        resp = self.client.put('/ldp/new_resource')
+        assert resp.status_code == 201
+        assert resp.data == bytes(
+                '{}/new_resource'.format(Toolbox().base_url), 'utf-8')
 
 
     def test_put_existing_resource(self, random_uuid):
@@ -51,9 +53,14 @@ class TestLdp:
         is empty.
         '''
         path = '/ldp/nonidempotent01'
-        assert self.client.put(path).status_code == 201
+        put1_resp = self.client.put(path)
+        assert put1_resp.status_code == 201
+
         assert self.client.get(path).status_code == 200
-        assert self.client.put(path).status_code == 204
+
+        put2_resp = self.client.put(path)
+        assert put2_resp.status_code == 204
+        assert put2_resp.data == b''
 
 
     def test_put_tree(self, client):
@@ -61,12 +68,16 @@ class TestLdp:
         PUT a resource with several path segments.
 
         The test should create intermediate path segments that are not
-        accessible to PUT but allow POST.
+        accessible to PUT or POST.
         '''
         path = '/ldp/test_tree/a/b/c/d/e/f/g'
         self.client.put(path)
 
-        assert self.client.get(path).resp.status_code == 200
+        assert self.client.get(path).status_code == 200
+
+        assert self.client.put('/ldp/test_tree/a').status_code == 409
+        assert self.client.post('/ldp/test_tree/a').status_code == 409
+
 
     def test_put_nested_tree(self, client):
         '''