oldaplib 0.4.4__tar.gz → 0.4.5__tar.gz

{oldaplib-0.4.4 → oldaplib-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.4.4
+Version: 0.4.5
 Summary: Open Media Access Server Library (Linked Open Data middleware/RESTApi)
 License: GNU Affero General Public License version 3
 Author: Lukas Rosenthaler

oldaplib-0.4.4/oldaplib/src/enums/XXXeditor.py → oldaplib-0.4.5/oldaplib/src/enums/editor.py

@@ -1,3 +1,4 @@
+import json
 from enum import Enum, unique, EnumMeta
 
 from oldaplib.src.helpers.serializer import serializer
@@ -72,7 +73,3 @@ class Editor(Enum, metaclass=_ValidateEnumMeta):
     def _as_dict(self):
         return {"value": self.value }
 
-
-if __name__ == "__main__":
-    print(Editor(value="dash:TextFieldWithLangEditor"))
-

{oldaplib-0.4.4 → oldaplib-0.4.5}/oldaplib/src/enums/haspropertyattr.py

@@ -1,6 +1,7 @@
 from enum import unique
 
 from oldaplib.src.enums.attributeclass import AttributeClass, Target
+from oldaplib.src.enums.editor import Editor
 from oldaplib.src.xsd.iri import Iri
 from oldaplib.src.xsd.xsd_decimal import Xsd_decimal
 from oldaplib.src.xsd.xsd_integer import Xsd_integer
@@ -16,5 +17,5 @@ class HasPropertyAttr(AttributeClass):
     MAX_COUNT = ('sh:maxCount', False, False, Xsd_integer)
     ORDER = ('sh:order', False, False, Xsd_decimal, Target.SHACL)
     GROUP = ('sh:group', False, False, Xsd_QName, Target.SHACL)
-    EDITOR = ('dash:editor', False, False, Xsd_QName, Target.SHACL)
+    EDITOR = ('dash:editor', False, False, Editor, Target.SHACL)
 

oldaplib-0.4.5/oldaplib/src/version.py

@@ -0,0 +1 @@
+__version__ = "0.4.5"

{oldaplib-0.4.4 → oldaplib-0.4.5}/oldaplib/test/test_hasproperty.py

@@ -4,6 +4,7 @@ from time import sleep
 
 from oldaplib.src.connection import Connection
 from oldaplib.src.dtypes.namespaceiri import NamespaceIRI
+from oldaplib.src.enums.editor import Editor
 from oldaplib.src.enums.xsd_datatypes import XsdDatatypes
 from oldaplib.src.hasproperty import HasProperty
 from oldaplib.src.helpers.context import Context
@@ -74,14 +75,14 @@ class TestHasProperty(unittest.TestCase):
                         maxCount=1,
                         group=Xsd_QName('test:group'),
                         order=1,
-                        editor=Xsd_QName("dash:TextAreaEditor")),
+                        editor=Editor.TEXT_AREA),
             HasProperty(con=self._connection,
                         project=self._project,
                         prop=Xsd_QName("test:comment"),
                         maxCount=1,
                         group=Xsd_QName('test:group'),
                         order=2,
-                        editor=Xsd_QName("dash:TextFieldEditor")),
+                        editor=Editor.TEXT_FIELD),
         ]
         r1 = ResourceClass(con=self._connection,
                            project=self._project,
@@ -100,13 +101,13 @@ class TestHasProperty(unittest.TestCase):
         self.assertEqual(r1[Xsd_QName('test:hasprop_test_A')].maxCount, Xsd_integer(1))
         self.assertEqual(r1[Xsd_QName('test:hasprop_test_A')].order, Xsd_decimal(1))
         self.assertEqual(r1[Xsd_QName('test:hasprop_test_A')].group, Xsd_QName('test:group'))
-        self.assertEqual(r1[Xsd_QName('test:hasprop_test_A')].editor, Xsd_QName("dash:TextAreaEditor"))
+        self.assertEqual(r1[Xsd_QName('test:hasprop_test_A')].editor, Editor.TEXT_AREA)
 
         self.assertIsNone(r1[Xsd_QName("test:comment")].minCount)
         self.assertEqual(r1[Xsd_QName("test:comment")].maxCount, Xsd_integer(1))
         self.assertEqual(r1[Xsd_QName("test:comment")].order, Xsd_decimal(2))
         self.assertEqual(r1[Xsd_QName("test:comment")].group, Xsd_QName('test:group'))
-        self.assertEqual(r1[Xsd_QName('test:comment')].editor, Xsd_QName("dash:TextFieldEditor"))
+        self.assertEqual(r1[Xsd_QName('test:comment')].editor, Editor.TEXT_FIELD)
 
     def test_creation_B(self):
         p1 = PropertyClass(con=self._connection,
@@ -117,9 +118,9 @@ class TestHasProperty(unittest.TestCase):
         hasproperties: list[HasProperty] = [
             HasProperty(con=self._connection, project=self._project, prop=p1,
                         minCount=1, maxCount=1, group=Xsd_QName('test:group'),
-                        order=1, editor=Xsd_QName("dash:TextAreaEditor")),
+                        order=1, editor=Editor.TEXT_AREA),
             HasProperty(con=self._connection, project=self._project, prop=Xsd_QName("test:comment"),
-                        maxCount=1, group=Xsd_QName('test:group'), order=2, editor=Xsd_QName("dash:TextFieldEditor")),
+                        maxCount=1, group=Xsd_QName('test:group'), order=2, editor=Editor.TEXT_FIELD),
         ]
         r1 = ResourceClass(con=self._connection,
                            project=self._project,
@@ -137,12 +138,12 @@ class TestHasProperty(unittest.TestCase):
         r1[Xsd_QName('test:hasprop_test_B')].maxCount = Xsd_integer(2)
         r1[Xsd_QName('test:hasprop_test_B')].order = Xsd_decimal(2)
         r1[Xsd_QName('test:hasprop_test_B')].group = Xsd_QName('test:groupB')
-        r1[Xsd_QName('test:hasprop_test_B')].editor = Xsd_QName("dash:TextFieldEditor")
+        r1[Xsd_QName('test:hasprop_test_B')].editor = Editor.TEXT_FIELD
 
         r1[Xsd_QName('test:comment')].maxCount = Xsd_integer(2)
         r1[Xsd_QName('test:comment')].order = Xsd_decimal(1)
         r1[Xsd_QName('test:comment')].group = Xsd_QName('test:groupB')
-        r1[Xsd_QName('test:comment')].editor = Xsd_QName("dash:TextAreaEditor")
+        r1[Xsd_QName('test:comment')].editor = Editor.TEXT_AREA
 
         r1.update()
         r1 = ResourceClass.read(con=self._connection,
@@ -151,11 +152,11 @@ class TestHasProperty(unittest.TestCase):
         self.assertEqual(Xsd_integer(2), r1[Xsd_QName('test:hasprop_test_B')].maxCount)
         self.assertEqual(Xsd_decimal(2), r1[Xsd_QName('test:hasprop_test_B')].order)
         self.assertEqual(Xsd_QName('test:groupB'), r1[Xsd_QName('test:hasprop_test_B')].group)
-        self.assertEqual(Xsd_QName("dash:TextFieldEditor"), r1[Xsd_QName('test:hasprop_test_B')].editor)
+        self.assertEqual(Editor.TEXT_FIELD, r1[Xsd_QName('test:hasprop_test_B')].editor)
 
         self.assertEqual(Xsd_integer(2), r1[Xsd_QName('test:comment')].maxCount)
         self.assertEqual(Xsd_decimal(1), r1[Xsd_QName('test:comment')].order)
-        self.assertEqual(Xsd_QName("dash:TextAreaEditor"), r1[Xsd_QName('test:comment')].editor)
+        self.assertEqual(Editor.TEXT_AREA, r1[Xsd_QName('test:comment')].editor)
 
     def test_modification_add(self):
         p1 = PropertyClass(con=self._connection,
@@ -169,7 +170,7 @@ class TestHasProperty(unittest.TestCase):
                         prop=p1,
                         minCount=1,
                         order=1,
-                        editor=Xsd_QName("dash:TextAreaEditor")),
+                        editor=Editor.TEXT_AREA),
             HasProperty(con=self._connection,
                         project=self._project,
                         prop=Xsd_QName("test:comment"),
@@ -194,7 +195,7 @@ class TestHasProperty(unittest.TestCase):
         r1[Xsd_QName('test:hasprop_test_C')].editor = None
         r1[Xsd_QName("test:comment")].minCount = Xsd_integer(1)
         r1[Xsd_QName("test:comment")].order = Xsd_decimal(1)
-        r1[Xsd_QName("test:comment")].editor = Xsd_QName("dash:TextFieldEditor")
+        r1[Xsd_QName("test:comment")].editor = Editor.TEXT_FIELD
 
         r1.update()
         r1 = ResourceClass.read(con=self._connection,
@@ -205,7 +206,7 @@ class TestHasProperty(unittest.TestCase):
         self.assertIsNone(r1[Xsd_QName('test:hasprop_test_C')].editor)
         self.assertEqual(Xsd_integer(1), r1[Xsd_QName("test:comment")].minCount)
         self.assertEqual(Xsd_decimal(1), r1[Xsd_QName("test:comment")].order)
-        self.assertEqual(Xsd_QName("dash:TextFieldEditor"), r1[Xsd_QName("test:comment")].editor)
+        self.assertEqual(Editor.TEXT_FIELD, r1[Xsd_QName("test:comment")].editor)
 
     def test_modification_delete(self):
         p1 = PropertyClass(con=self._connection,
@@ -216,10 +217,10 @@ class TestHasProperty(unittest.TestCase):
         hasproperties: list[HasProperty] = [
             HasProperty(con=self._connection, project=self._project, prop=p1,
                         minCount=1, maxCount=1, group=Xsd_QName('test:group'), order=1,
-                        editor=Xsd_QName("dash:TextFieldEditor")),
+                        editor=Editor.TEXT_FIELD),
             HasProperty(con=self._connection, project=self._project, prop=Xsd_QName("test:comment"),
                         maxCount=1, group=Xsd_QName('test:group'), order=2,
-                        editor=Xsd_QName("dash:TextAreaEditor")),
+                        editor=Editor.TEXT_AREA),
         ]
         r1 = ResourceClass(con=self._connection,
                            project=self._project,

{oldaplib-0.4.4 → oldaplib-0.4.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oldaplib"
-version = "0.4.4"
+version = "0.4.5"
 description = "Open Media Access Server Library (Linked Open Data middleware/RESTApi)"
 authors = ["Lukas Rosenthaler <lukas.rosenthaler@unibas.ch>"]
 license = "GNU Affero General Public License version 3"

oldaplib-0.4.4/oldaplib/ontologies/gaga.trigs

@@ -1,23 +0,0 @@
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix o: <http://www.ooo.org/ns#> .
-
-@prefix : <https://gaga.com/> .
-
-:test {
-    :Unknown o:hasName "Unknown" .
-
-    :UserA o:hasName "UserA" ;
-        o:hasRole :Unknown .
-
-    :InstanceA o:hasName "InstanceA" ;
-        o:attachedToRole :Unknown .
-
-    <<:InstanceA o:attachedToRole :Unknown>> o:hasDataPermission 2 .
-
-}
-
-

oldaplib-0.4.4/oldaplib/src/version.py

@@ -1 +0,0 @@
-__version__ = "0.4.4"