Merge pull request #39

Fix bug where E438 won't evaluate correctly

comparejsonld.py

@@ -388,10 +388,20 @@ def calculate_necessity(self, prop: str, shape: dict) -> str:
         :return: necessity
         """
         necessity: str = "absent"
-        if "expression" in shape and "expressions" in shape["expression"]:
+        list_of_expressions: list = []
+
+        if "expression" not in shape:
+            return necessity
+
+        if "expressions" in shape["expression"]:
             for expression in shape["expression"]["expressions"]:
-                if "predicate" in expression and expression["predicate"].endswith(prop):
-                    necessity = self.required_or_absent(expression)
+                list_of_expressions.append(expression)
+        else:
+            list_of_expressions.append(shape["expression"])
+
+        for expression in list_of_expressions:
+            if "predicate" in expression and expression["predicate"].endswith(prop):
+                necessity = self.required_or_absent(expression)
         return necessity
 
     @staticmethod

test_schemas.py

@@ -339,6 +339,17 @@ def test_entityschema_e351(self):
                                 follow_redirects=True)
         self.assertIn(response.json["properties"][0]["P31"]["response"], ["not enough correct statements"])
 
+    def test_entityschema_e438(self):
+        """
+        Tests that a schemas with only 1 expression evaluates correctly
+
+        This test tests entityschema E438 (wikimedia disambiguation page) against entity Q11645745.
+        P31 should return as present
+        """
+        response = self.app.get('/api/v2?entityschema=E438&entity=Q11645745&language=en',
+                                follow_redirects=True)
+        self.assertIn(response.json["properties"][0]["P31"]["response"], ["correct", "present"])
+
 
 if __name__ == '__main__':
     unittest.main()