Find a better place for ROOT_NODE_URN (unfortunately duplicating the var).

lakesuperior/model/ldp_rs.py

@@ -229,7 +229,7 @@ class LdpRs(Ldpr):
         '''
         for s in set(g.subjects()):
             if not s == self.uri:
-                return SingleSubjectError(s, self.uuid)
+                raise SingleSubjectError(s, self.uuid)
 
 
     def _check_ref_int(self, config):

lakesuperior/model/ldpr.py

@@ -101,6 +101,7 @@ class Ldpr(metaclass=ABCMeta):
     RETURN_CHILD_RES_URI = nsc['fcrepo'].EmbedResources
     RETURN_INBOUND_REF_URI = nsc['fcrepo'].InboundReferences
     RETURN_SRV_MGD_RES_URI = nsc['fcrepo'].ServerManaged
+    ROOT_NODE_URN = nsc['fcsystem'].root
 
     _logger = logging.getLogger(__name__)
 
@@ -123,7 +124,7 @@ class Ldpr(metaclass=ABCMeta):
         self.uuid = uuid
 
         self._urn = nsc['fcres'][uuid] if self.uuid is not None \
-                else BaseRdfLayout.ROOT_NODE_URN
+                else self.ROOT_NODE_URN
 
         self._imr_options = __class__.imr_options(repr_opts)
 
@@ -331,7 +332,7 @@ class Ldpr(metaclass=ABCMeta):
         @param uuid UUID of the instance.
         '''
         rdfly = cls.load_layout('rdf')
-        imr_urn = nsc['fcres'][uuid] if uuid else rdfly.ROOT_NODE_URN
+        imr_urn = nsc['fcres'][uuid] if uuid else self.ROOT_NODE_URN
         cls._logger.debug('Representation options: {}'.format(repr_opts))
         imr_opts = cls.imr_options(repr_opts)
         imr = rdfly.extract_imr(imr_urn, **imr_opts)

lakesuperior/store_layouts/rdf/base_rdf_layout.py

@@ -61,7 +61,6 @@ class BaseRdfLayout(metaclass=ABCMeta):
     - Methods starting with `ask_` return a boolean value.
     '''
 
-    ROOT_NODE_URN = nsc['fcsystem'].root
     # N.B. This is Fuseki-specific.
     UNION_GRAPH_URI = URIRef('urn:x-arq:UnionGraph')
 

lakesuperior/toolbox.py

@@ -8,7 +8,6 @@ from flask import request, g
 from rdflib.term import Literal, URIRef, Variable
 
 from lakesuperior.dictionaries.namespaces import ns_collection as nsc
-from lakesuperior.store_layouts.rdf.base_rdf_layout import BaseRdfLayout
 
 
 class Toolbox:
@@ -18,7 +17,9 @@ class Toolbox:
 
     _logger = logging.getLogger(__name__)
 
-    def __init__():
+    ROOT_NODE_URN = nsc['fcsystem'].root
+
+    def __init__(self):
         '''
         Set the base URL for the requests. This class has to be instantiated
         within a request context.
@@ -75,7 +76,7 @@ class Toolbox:
         '''
         self._logger.debug('Input URI: {}'.format(uri))
         if uri.strip('/') == self.base_url:
-            return BaseRdfLayout.ROOT_NODE_URN
+            return self.ROOT_NODE_URN
 
         return URIRef(self.localize_string(str(uri)))
 
@@ -98,7 +99,7 @@ class Toolbox:
 
         @return rdflib.term.URIRef
         '''
-        if urn == BaseRdfLayout.ROOT_NODE_URN:
+        if urn == self.ROOT_NODE_URN:
             urn = nsc['fcres']
 
         return URIRef(self.globalize_string(str(urn)))
@@ -124,7 +125,7 @@ class Toolbox:
               STRSTARTS(str(?o), "{1}")
             ) .
           }}
-        }}'''.format(nsc['fcres'], BaseRdfLayout.ROOT_NODE_URN)
+        }}'''.format(nsc['fcres'], self.ROOT_NODE_URN)
         flt_g = g.query(q)
 
         for t in flt_g: