Put toolbox instance in app globals.

lakesuperior/endpoints/ldp.py

@@ -19,7 +19,6 @@ from lakesuperior.exceptions import *
 from lakesuperior.model.ldpr import Ldpr
 from lakesuperior.model.ldp_nr import LdpNr
 from lakesuperior.model.ldp_rs import Ldpc, LdpDc, LdpIc, LdpRs
-from lakesuperior.toolbox import Toolbox
 
 
 logger = logging.getLogger(__name__)
@@ -78,6 +77,11 @@ def bp_url_value_preprocessor(endpoint, values):
     g.webroot = request.host_url + g.url_prefix
 
 
+@ldp.before_request
+def instantiate_toolbox():
+    g.tbox = Toolbox()
+
+
 @ldp.before_request
 def request_timestamp():
     g.timestamp = arrow.utcnow()
@@ -102,7 +106,7 @@ def get_resource(uuid, force_rdf=False):
     out_headers = std_headers
     repr_options = defaultdict(dict)
     if 'prefer' in request.headers:
-        prefer = Toolbox().parse_rfc7240(request.headers['prefer'])
+        prefer = g.tbox.parse_rfc7240(request.headers['prefer'])
         logger.debug('Parsed Prefer header: {}'.format(pformat(prefer)))
         if 'return' in prefer:
             repr_options = parse_repr_options(prefer['return'])
@@ -248,7 +252,7 @@ def delete_resource(uuid):
             if current_app.config['store']['ldp_rs']['referential_integrity'] \
             else {}
     if 'prefer' in request.headers:
-        prefer = Toolbox().parse_rfc7240(request.headers['prefer'])
+        prefer = g.tbox.parse_rfc7240(request.headers['prefer'])
         leave_tstone = 'no-tombstone' not in prefer
     else:
         leave_tstone = True
@@ -300,7 +304,7 @@ def uuid_for_post(parent_uuid=None, slug=None):
     '''
     def split_if_legacy(uuid):
         if current_app.config['store']['ldp_rs']['legacy_ptree_split']:
-            uuid = Toolbox().split_uuid(uuid)
+            uuid = g.tbox.split_uuid(uuid)
         return uuid
 
     # Shortcut!
@@ -392,13 +396,13 @@ def set_post_put_params():
     '''
     handling = None
     if 'prefer' in request.headers:
-        prefer = Toolbox().parse_rfc7240(request.headers['prefer'])
+        prefer = g.tbox.parse_rfc7240(request.headers['prefer'])
         logger.debug('Parsed Prefer header: {}'.format(prefer))
         if 'handling' in prefer:
             handling = prefer['handling']['value']
 
     try:
-        disposition = Toolbox().parse_rfc7240(
+        disposition = g.tbox.parse_rfc7240(
                 request.headers['content-disposition'])
     except KeyError:
         disposition = None

lakesuperior/model/ldpr.py

@@ -21,7 +21,6 @@ from lakesuperior.dictionaries.srv_mgd_terms import  srv_mgd_subjects, \
         srv_mgd_predicates, srv_mgd_types
 from lakesuperior.exceptions import *
 from lakesuperior.store_layouts.ldp_rs.base_rdf_layout import BaseRdfLayout
-from lakesuperior.toolbox import Toolbox
 
 
 def atomic(fn):
@@ -183,7 +182,7 @@ class Ldpr(metaclass=ABCMeta):
                     format=mimetype, publicID=urn)
             logger.debug('Provided graph: {}'.format(
                     pformat(set(provided_gr))))
-            local_gr = Toolbox().localize_graph(provided_gr)
+            local_gr = g.tbox.localize_graph(provided_gr)
             logger.debug('Parsed local graph: {}'.format(
                     pformat(set(local_gr))))
             provided_imr = Resource(local_gr, urn)
@@ -278,11 +277,11 @@ class Ldpr(metaclass=ABCMeta):
         operations isuch as `PUT` or `POST`, serialized as a string. This sets
         the `provided_imr` property.
         '''
-        self.uuid = Toolbox().uri_to_uuid(uuid) \
+        self.uuid = g.tbox.uri_to_uuid(uuid) \
                 if isinstance(uuid, URIRef) else uuid
         self.urn = nsc['fcres'][uuid] \
                 if self.uuid else self.ROOT_NODE_URN
-        self.uri = Toolbox().uuid_to_uri(self.uuid)
+        self.uri = g.tbox.uuid_to_uri(self.uuid)
 
         self.rdfly = current_app.rdfly
         self.nonrdfly = current_app.nonrdfly
@@ -379,7 +378,7 @@ class Ldpr(metaclass=ABCMeta):
                 self._logger.debug('Removing type: {}'.format(t))
                 self.imr.remove(RDF.type, t)
 
-        out_gr = Toolbox().globalize_graph(self.imr.graph)
+        out_gr = g.tbox.globalize_graph(self.imr.graph)
         # Clear IMR because it's been pruned. In the rare case it is needed
         # after this method, it will be retrieved again.
         delattr(self, 'imr')
@@ -501,7 +500,7 @@ class Ldpr(metaclass=ABCMeta):
 
         for child_uri in children:
             child_rsrc = Ldpr.outbound_inst(
-                Toolbox().uri_to_uuid(child_uri.identifier),
+                g.tbox.uri_to_uuid(child_uri.identifier),
                 repr_opts={'incl_children' : False})
             child_rsrc._delete_rsrc(inbound, leave_tstone,
                     tstone_pointer=self.urn)
@@ -765,7 +764,7 @@ class Ldpr(metaclass=ABCMeta):
             self.provided_imr.add(RDF.type, t)
 
         # Message digest.
-        cksum = Toolbox().rdf_cksum(self.provided_imr.graph)
+        cksum = g.tbox.rdf_cksum(self.provided_imr.graph)
         self.provided_imr.set(nsc['premis'].hasMessageDigest,
                 URIRef('urn:sha1:{}'.format(cksum)))
 
@@ -886,7 +885,7 @@ class Ldpr(metaclass=ABCMeta):
 
         @param cont_uri (rdflib.term.URIRef)  The container URI.
         '''
-        cont_uuid = Toolbox().uri_to_uuid(cont_uri)
+        cont_uuid = g.tbox.uri_to_uuid(cont_uri)
         cont_rsrc = Ldpr.outbound_inst(cont_uuid,
                 repr_opts={'incl_children' : False})
         cont_p = set(cont_rsrc.imr.graph.predicates())
@@ -896,7 +895,7 @@ class Ldpr(metaclass=ABCMeta):
         self._logger.debug('Parent predicates: {}'.format(cont_p))
 
         if self.MBR_RSRC_URI in cont_p and self.MBR_REL_URI in cont_p:
-            s = Toolbox().localize_term(
+            s = self.g.tbox.localize_term(
                     cont_rsrc.imr.value(self.MBR_RSRC_URI).identifier)
             p = cont_rsrc.imr.value(self.MBR_REL_URI).identifier
 

lakesuperior/store_layouts/ldp_rs/simple_layout.py

@@ -1,7 +1,7 @@
 from copy import deepcopy
 from pprint import pformat
 
-from flask import current_app, request
+from flask import current_app, g, request
 from rdflib import Graph
 from rdflib.namespace import RDF, XSD
 from rdflib.query import ResultException
@@ -15,7 +15,6 @@ from lakesuperior.dictionaries.srv_mgd_terms import (srv_mgd_subjects,
 from lakesuperior.exceptions import (InvalidResourceError, InvalidTripleError,
         ResourceNotExistsError, TombstoneError)
 from lakesuperior.store_layouts.ldp_rs.base_rdf_layout import BaseRdfLayout
-from lakesuperior.toolbox import Toolbox
 
 
 class SimpleLayout(BaseRdfLayout):
@@ -89,11 +88,11 @@ class SimpleLayout(BaseRdfLayout):
         # Check if resource is a tombstone.
         if rsrc[RDF.type : nsc['fcsystem'].Tombstone]:
             raise TombstoneError(
-                    Toolbox().uri_to_uuid(rsrc.identifier),
+                    g.tbox.uri_to_uuid(rsrc.identifier),
                     rsrc.value(nsc['fcrepo'].created))
         elif rsrc.value(nsc['fcsystem'].tombstone):
             raise TombstoneError(
-                    Toolbox().uri_to_uuid(
+                    g.tbox.uri_to_uuid(
                             rsrc.value(nsc['fcsystem'].tombstone).identifier),
                     rsrc.value(nsc['fcrepo'].created))
 

tests/test_toolbox.py

@@ -4,60 +4,52 @@ from flask import g
 from rdflib.term import URIRef
 
 from lakesuperior.dictionaries.namespaces import ns_collection as nsc
-from lakesuperior.toolbox import Toolbox
-
-
-@pytest.fixture
-def tb(client):
-    c = client.get('/ldp')
-    return Toolbox()
-
 
 
 class TestToolbox:
     '''
     Unit tests for toolbox methods.
     '''
-    #def test_camelcase(self, tb):
+    #def test_camelcase(self):
     #    '''
     #    Test conversion from underscore notation to camelcase.
     #    '''
-    #    assert tb.camelcase('test_input_string') == 'TestInputString'
-    #    assert tb.camelcase('_test_input_string') == '_TestInputString'
-    #    assert tb.camelcase('test__input__string') == 'Test_Input_String'
+    #    assert g.tbox.camelcase('test_input_string') == 'TestInputString'
+    #    assert g.tbox.camelcase('_test_input_string') == '_TestInputString'
+    #    assert g.tbox.camelcase('test__input__string') == 'Test_Input_String'
 
 
-    def test_uuid_to_uri(self, tb):
-        assert tb.uuid_to_uri('1234') == URIRef(g.webroot + '/1234')
-        assert tb.uuid_to_uri('') == URIRef(g.webroot)
+    def test_uuid_to_uri(self):
+        assert g.tbox.uuid_to_uri('1234') == URIRef(g.webroot + '/1234')
+        assert g.tbox.uuid_to_uri('') == URIRef(g.webroot)
 
 
-    def test_uri_to_uuid(self, tb):
-        assert tb.uri_to_uuid(URIRef(g.webroot) + '/test01') == 'test01'
-        assert tb.uri_to_uuid(URIRef(g.webroot) + '/test01/test02') == \
+    def test_uri_to_uuid(self):
+        assert g.tbox.uri_to_uuid(URIRef(g.webroot) + '/test01') == 'test01'
+        assert g.tbox.uri_to_uuid(URIRef(g.webroot) + '/test01/test02') == \
                 'test01/test02'
-        assert tb.uri_to_uuid(URIRef(g.webroot)) == ''
-        assert tb.uri_to_uuid(nsc['fcsystem'].root) == None
-        assert tb.uri_to_uuid(nsc['fcres']['1234']) == '1234'
-        assert tb.uri_to_uuid(nsc['fcres']['1234/5678']) == '1234/5678'
+        assert g.tbox.uri_to_uuid(URIRef(g.webroot)) == ''
+        assert g.tbox.uri_to_uuid(nsc['fcsystem'].root) == None
+        assert g.tbox.uri_to_uuid(nsc['fcres']['1234']) == '1234'
+        assert g.tbox.uri_to_uuid(nsc['fcres']['1234/5678']) == '1234/5678'
 
 
-    def test_localize_string(self, tb):
+    def test_localize_string(self):
         '''
         Test string localization.
         '''
-        assert tb.localize_string(g.webroot + '/test/uid') == \
-                tb.localize_string(g.webroot + '/test/uid/') == \
+        assert g.tbox.localize_string(g.webroot + '/test/uid') == \
+                g.tbox.localize_string(g.webroot + '/test/uid/') == \
                 str(nsc['fcres']['test/uid'])
-        assert tb.localize_string(g.webroot) == str(nsc['fcsystem'].root)
-        assert tb.localize_string('http://bogus.org/test/uid') == \
+        assert g.tbox.localize_string(g.webroot) == str(nsc['fcsystem'].root)
+        assert g.tbox.localize_string('http://bogus.org/test/uid') == \
                 'http://bogus.org/test/uid'
 
 
-    def test_localize_term(self, tb):
+    def test_localize_term(self):
         '''
         Test term localization.
         '''
-        assert tb.localize_term(g.webroot + '/test/uid') == \
-                tb.localize_term(g.webroot + '/test/uid/') == \
+        assert g.tbox.localize_term(g.webroot + '/test/uid') == \
+                g.tbox.localize_term(g.webroot + '/test/uid/') == \
                 nsc['fcres']['test/uid']