Merge branch 'release/0.5.9'

Author: BeritJanssen

backend/README.md

@@ -36,6 +36,8 @@ You can set `/absolute/path/to/datadir` to any directory of your choosing, as lo
 
 While the Fuseki server is running, you can access its web interface at http://localhost:3030. This lets you upload and download data, try out queries and review statistics about the dataset. The server can be stopped by typing `ctrl-c`.
 
+In order to support the unittests, visit the Fuseki web interface and create an additional dataset by the name `readit-test`.
+
 If you are new to Fuseki but not to READ-IT, i.e., you have previously deployed READ-IT version 0.4.0 or older, or done local development work on any commit that did not descend from `0063b21`, then you should also read the following section about migrating your triples from the rdflib-django store to Fuseki.
 
 [jena-download]: https://jena.apache.org/download/

backend/conftest.py

@@ -1,12 +1,32 @@
 import pytest
 
+HAS_TRIPLES = '''
+ASK {
+    GRAPH ?g {
+        ?s ?p ?o
+    }
+}
+'''
+
+
+@pytest.fixture
+def credentials():
+    return 'tester', 'testing123'
+
 
 @pytest.fixture
-def auth_client(client, django_user_model):
-    username = 'tester'
-    password = 'testing123'
+def auth_client(client, django_user_model, credentials):
+    username, password = credentials
     django_user_model.objects.create_user(username=username, password=password)
     client.login(username=username, password=password)
     yield client
     client.logout()
     django_user_model.objects.get(username=username).delete()
+
+
+@pytest.fixture
+def sparqlstore(settings):
+    store = settings.RDFLIB_STORE
+    assert not store.query(HAS_TRIPLES)
+    yield store
+    store.update('CLEAR ALL')

backend/items/conftest.py

@@ -73,7 +73,7 @@ def itemgraph():
 
 
 @pytest.fixture
-def itemgraph_db(db, itemgraph):
+def itemgraph_db(db, itemgraph, sparqlstore):
     g = graph()
     g += itemgraph
     yield

backend/items/views_test.py

@@ -82,7 +82,7 @@ def submit_data(client, input_graph, method, serial=None):
     return response, output_graph
 
 
-def test_post_item(auth_client):
+def test_post_item(auth_client, sparqlstore):
     bnode = BNode()
     muppet = URIRef('https://muppets.disney.com/')
     pork = URIRef('https://en.wikipedia.org/wiki/Pork')

backend/nlp_ontology/conftest.py

@@ -22,7 +22,7 @@
     PREFIX dctypes: <http://purl.org/dc/dcmitype/>
     PREFIX ns3: <http://schema.org/>
 
-    INSERT DATA { 
+    INSERT DATA {
         my:icecream         a               ns3:Food        ;
                             ns3:color       "#f9e5bc"       .
         ns3:Cat             my:meow         "loud"          .
@@ -36,15 +36,15 @@
     }
 '''
 
-ASK_QUERY = '''PREFIX my: <http://testserver/nlp-ontology#> 
+ASK_QUERY = '''PREFIX my: <http://testserver/nlp-ontology#>
 ASK { ?x my:meow  "loud" }'''
-ASK_QUERY_FALSE = '''PREFIX my: <http://testserver/nlp-ontology#> 
+ASK_QUERY_FALSE = '''PREFIX my: <http://testserver/nlp-ontology#>
 ASK { ?x my:meow  "silent" }'''
 
 CONSTRUCT_QUERY = '''
     PREFIX my: <http://testserver/nlp-ontology#>
     PREFIX ns3: <http://schema.org/>
-    CONSTRUCT WHERE { ?x my:meow ?name } 
+    CONSTRUCT WHERE { ?x my:meow ?name }
 '''
 
 
@@ -55,7 +55,7 @@ def ontologygraph():
 
 
 @pytest.fixture
-def ontologygraph_db(db, ontologygraph):
+def ontologygraph_db(db, ontologygraph, sparqlstore):
     g = graph()
     g += ontologygraph
     yield

backend/nlp_ontology/views.py

@@ -1,4 +1,3 @@
-import rdflib.plugins.sparql as rdf_sparql
 from django.http.response import HttpResponseBase
 from pyparsing import ParseException
 from rdflib import BNode, Literal
@@ -7,6 +6,7 @@
 from rest_framework.exceptions import APIException
 from rest_framework.response import Response
 from rest_framework.views import APIView
+from SPARQLWrapper.SPARQLExceptions import QueryBadFormed
 
 from rdf.ns import HTTP, HTTPSC, RDF
 from rdf.renderers import TurtleRenderer
@@ -26,12 +26,15 @@ def get_exception_handler(self):
         return turtle_exception_handler
 
     def execute_update(self, updatestring):
+        graph = self.graph()
         try:
-            return self.graph().update(updatestring)
-        except ParseException as p_e:
+            return graph.update(updatestring)
+        except (ParseException, QueryBadFormed) as p_e:
             # Raised when SPARQL syntax is not valid, or parsing fails
+            graph.rollback()
             raise ParseSPARQLError(p_e)
         except Exception as e:
+            graph.rollback()
             raise APIException(e)
 
     def post(self, request, **kwargs):
@@ -107,7 +110,7 @@ def execute_query(self, querystring):
             self.request.data['query_type'] = query_type
             return query_results
 
-        except ParseException as p_e:
+        except (ParseException, QueryBadFormed) as p_e:
             # Raised when SPARQL syntax is not valid, or parsing fails
             raise ParseSPARQLError(p_e)
         except Exception as n_e:

backend/nlp_ontology/views_test.py

@@ -42,23 +42,23 @@ def test_construct(client, test_queries, ontologygraph_db):
     assert response.status_code == 200
 
 
-def test_authorized(admin_client, test_queries):
+def test_authorized(admin_client, test_queries, sparqlstore):
     response = admin_client.post(UPDATE_URL, {'update': test_queries.INSERT})
     assert response.status_code == 200
 
 
-def test_unauthorized(client):
+def test_unauthorized(client, sparqlstore):
     response = client.post(UPDATE_URL)
     assert response.status_code == 403
 
 
-def test_malformed_update(admin_client):
+def test_malformed_update(admin_client, sparqlstore):
     response = admin_client.post(
         UPDATE_URL, {'update': 'this is no SPARQL update!'})
     assert response.status_code == 400
 
 
-def test_malformed_query(admin_client):
+def test_malformed_query(admin_client, sparqlstore):
     response = admin_client.post(
         QUERY_URL, {'query': 'this is no SPARQL query!'})
     assert response.status_code == 400

backend/ontology/rdf_migrations.py

@@ -55,7 +55,7 @@ def delete_cascade(graph, predicate, _object):
     Delete all triples in the item graph with the combination of `predicate` and `_object`.
     """
     obsolete = list(graph.quads((None, predicate, _object)))
-    prune_triples_cascade(graph, obsolete, [item_graph], [OA.hasBody])
+    prune_triples_cascade(graph, obsolete, [item_graph()], [OA.hasBody])
 
 
 def delete_predicate(graph, predicate):

backend/readit/index.py

@@ -1,17 +1,19 @@
 from django.http import HttpResponse
 from django.contrib.staticfiles import finders
 from django.views.decorators.csrf import ensure_csrf_cookie
+from django.conf import settings
 
 
 def html_view(filename):
     """ Return a view function that loads `filename` from the static files. """
     def fetch_html(request):
-        return HttpResponse(content=open(finders.find(filename)))
+        with open(finders.find(filename)) as html_file:
+            return HttpResponse(content=html_file)
     return fetch_html
 
 
 """ Thin wrapper for the static index.html that adds the CSRF cookie."""
-index = ensure_csrf_cookie(html_view('index.html'))
+index = ensure_csrf_cookie(html_view(settings.INDEX_FILE_PATH))
 
 """ Helper view for injecting a Jasmine runner from a frontend. """
-specRunner = html_view('specRunner.html')
+specRunner = html_view(settings.TESTRUNNER_FILE_PATH)

backend/readit/index_test.py

@@ -0,0 +1,2 @@
+def test_index_available(client):
+    assert client.get('/').status_code == 200