Move messaging to LDPR class.

lakesuperior/model/ldpr.py

@@ -567,6 +567,7 @@ class Ldpr(metaclass=ABCMeta):
 
         self.rdfly.modify_dataset(add_trp=add_gr)
 
+        # Update current resource with version relationship.
         add_gr = Graph()
         add_gr.add((
             self.urn, nsc['fcrepo'].hasVersion, ver_urn))
@@ -687,6 +688,10 @@ class Ldpr(metaclass=ABCMeta):
         '''
         Low-level method to modify a graph for a single resource.
 
+        This is a crucial point for messaging. Any write operation on the RDF
+        store that needs to be notified should be performed by invoking this
+        method.
+
         @param ev_type (string) The type of event (create, update, delete).
         @param remove_trp (rdflib.Graph) Triples to be removed.
         @param add_trp (rdflib.Graph) Triples to be added.
@@ -708,12 +713,17 @@ class Ldpr(metaclass=ABCMeta):
             type = merge_gr[self.urn : RDF.type]
             actor = merge_gr[self.urn : nsc['fcrepo'].createdBy]
 
-        return self.rdfly.modify_dataset(remove_trp, add_trp, metadata={
-            'ev_type' : ev_type,
-            'time' : g.timestamp,
-            'type' : type,
-            'actor' : actor,
-        })
+        ret = self.rdfly.modify_dataset(remove_trp, add_trp)
+
+        if current_app.config.get('messaging'):
+            request.changelog.append((set(remove_trp), set(add_trp), {
+                'ev_type' : ev_type,
+                'time' : g.timestamp,
+                'type' : type,
+                'actor' : actor,
+            }))
+
+        return ret
 
 
     def _ensure_single_subject_rdf(self, gr):

lakesuperior/store_layouts/ldp_rs/base_rdf_layout.py

@@ -123,22 +123,13 @@ class BaseRdfLayout(metaclass=ABCMeta):
     def modify_dataset(self, remove_trp=Graph(), add_trp=Graph(),
             metadata=None):
         '''
-        Adds and/or removes triples from the graph.
-
-        This is a crucial point for messaging. Any write operation on the RDF
-        store that needs to be notified must be performed by invoking this
-        method.
-
-        NOTE: This method can apply to multiple resources. However, if
-        distinct resources are undergoing different operations (e.g. resource A
-        is being deleted and resource B is being updated) this method must be
-        called once for each operation.
-
-        @param remove_trp (Iterable) Triples to be removed. This can be a graph
-        @param add_trp (Iterable) Triples to be added. This can be a graph.
-        @param metadata (dict) Metadata related to the operation. At a minimum,
-        it should contain the name of the operation (create, update, delete).
-        If no metadata are passed, no messages are enqueued.
+        Adds and/or removes triples from the persistent data set.
+
+        NOTE: This method can apply to an arbitrary graph including multiple
+        resources.
+
+        @param remove_trp (rdflib.Graph) Triples to be removed.
+        @param add_trp (rdflib.Graph) Triples to be added.
         '''
         pass
 

lakesuperior/store_layouts/ldp_rs/default_layout.py

@@ -114,8 +114,7 @@ class DefaultLayout(BaseRdfLayout):
                     's': urn, 'g': self.MAIN_GRAPH_URI}))
 
 
-    def modify_dataset(self, remove_trp=Graph(), add_trp=Graph(),
-            metadata=None):
+    def modify_dataset(self, remove_trp=Graph(), add_trp=Graph()):
         '''
         See base_rdf_layout.update_rsrc.
         '''
@@ -128,6 +127,3 @@ class DefaultLayout(BaseRdfLayout):
             self.ds.graph(self.MAIN_GRAPH_URI).remove(t)
         for t in add_trp:
             self.ds.graph(self.MAIN_GRAPH_URI).add(t)
-
-        if current_app.config.get('messaging') and metadata:
-            request.changelog.append((set(remove_trp), set(add_trp), metadata))