shacl2code 0.0.15__tar.gz → 0.0.16__tar.gz

{shacl2code-0.0.15 → shacl2code-0.0.16}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.3
 Name: shacl2code
-Version: 0.0.15
+Version: 0.0.16
 Summary: Convert SHACL model file to code bindings
 Project-URL: Homepage, https://github.com/JPEWdev/shacl2code
 Project-URL: Repository, https://github.com/JPEWdev/shacl2code.git
 Project-URL: Issues, https://github.com/JPEWdev/shacl2code/issues
 Author-email: Joshua Watt <JPEWhacker@gmail.com>
-License-File: LICENSE
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -196,8 +195,9 @@ with the following turtle:
 
 <MyClass> a owl:Class, sh:NodeShape ;
     # SHACL to prevent a class from being instansiated as this exact type
-    sh:not [
-        sh:class <MyClass>
+    sh:property [
+        sh:path rdf:type ;
+        sh:not [ sh:hasValue <MyClass> ]
     ] .
 
 ```

{shacl2code-0.0.15 → shacl2code-0.0.16}/README.md

@@ -166,8 +166,9 @@ with the following turtle:
 
 <MyClass> a owl:Class, sh:NodeShape ;
     # SHACL to prevent a class from being instansiated as this exact type
-    sh:not [
-        sh:class <MyClass>
+    sh:property [
+        sh:path rdf:type ;
+        sh:not [ sh:hasValue <MyClass> ]
     ] .
 
 ```

{shacl2code-0.0.15 → shacl2code-0.0.16}/src/shacl2code/lang/templates/python.j2

@@ -1197,7 +1197,7 @@ class SHACLObjectSet(object):
 
         return SHACLObjectSet(new_objects, link=True)
 
-    def encode(self, encoder, force_list=False):
+    def encode(self, encoder, force_list=False, *, key=None):
         """
         Serialize a list of objects to a serialization encoder
 
@@ -1244,7 +1244,7 @@ class SHACLObjectSet(object):
         else:
             objects = list(self.objects)
 
-        objects.sort()
+        objects.sort(key=key)
 
         if use_list:
             # Ensure top level objects are only written in the top level graph
@@ -1265,7 +1265,7 @@ class SHACLObjectSet(object):
                     with list_s.write_list_item() as item_s:
                         o.encode(item_s, state)
 
-        else:
+        elif objects:
             objects[0].encode(encoder, state)
 
     def decode(self, decoder):

{shacl2code-0.0.15 → shacl2code-0.0.16}/src/shacl2code/model.py

@@ -165,10 +165,6 @@ class Model(object):
             if bool(self.model.value(s, SHACL2CODE.isAbstract, default=False)):
                 return True
 
-            for n in self.model.objects(s, SH["not"]):
-                if (n, SH["class"], s) in self.model:
-                    return True
-
             return False
 
         class_iris = set(self.model.subjects(RDF.type, OWL.Class))
@@ -200,6 +196,11 @@ class Model(object):
 
             for obj_prop in self.model.objects(cls_iri, SH.property):
                 prop = self.model.value(obj_prop, SH.path)
+                if prop == RDF.type:
+                    for n in self.model.objects(obj_prop, SH["not"]):
+                        if (n, SH.hasValue, cls_iri) in self.model:
+                            c.is_abstract = True
+                    continue
 
                 p = Property(
                     varname=self.model.value(

shacl2code-0.0.16/src/shacl2code/version.py

@@ -0,0 +1 @@
+VERSION = "0.0.16"

{shacl2code-0.0.15 → shacl2code-0.0.16}/tests/data/model/test.ttl

@@ -491,8 +491,9 @@
 
 <abstract-sh-class> a rdf:Class, sh:NodeShape, owl:Class ;
     rdfs:comment: "An Abstract class using SHACL validation" ;
-    sh:not [
-        sh:class <abstract-sh-class>
+    sh:property [
+        sh:path rdf:type ;
+        sh:not [ sh:hasValue <abstract-sh-class> ]
     ] .
 
 <concrete-class> a rdf:Class, sh:NodeShape, owl:Class ;

{shacl2code-0.0.15 → shacl2code-0.0.16}/tests/expect/cpp/context/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "test-context"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "0.0.15"
+PROJECT_NUMBER         = "0.0.16"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

{shacl2code-0.0.15 → shacl2code-0.0.16}/tests/expect/cpp/context/Makefile

@@ -22,9 +22,9 @@ clean:
 install: libtest-context.so libtest-context.a docs
 	# Library
 	$(INSTALL) -d $(DESTDIR)/$(PREFIX)/lib
-	$(INSTALL) -m 0755 libtest-context.so $(DESTDIR)/$(PREFIX)/lib/libtest-context.so.0.0.15
-	ln -s libtest-context.so.0.0.15 $(DESTDIR)/$(PREFIX)/lib/libtest-context.so
-	ln -s libtest-context.so.0.0.15 $(DESTDIR)/$(PREFIX)/lib/libtest-context.so.0
+	$(INSTALL) -m 0755 libtest-context.so $(DESTDIR)/$(PREFIX)/lib/libtest-context.so.0.0.16
+	ln -s libtest-context.so.0.0.16 $(DESTDIR)/$(PREFIX)/lib/libtest-context.so
+	ln -s libtest-context.so.0.0.16 $(DESTDIR)/$(PREFIX)/lib/libtest-context.so.0
 
 	$(INSTALL) -m 0644 libtest-context.a $(DESTDIR)/$(PREFIX)/lib/
 

{shacl2code-0.0.15 → shacl2code-0.0.16}/tests/expect/cpp/context/test-context-validate.cpp

@@ -108,7 +108,7 @@ int main(int argc, char* argv[]) {
         switch (opt) {
             case 'h':
                 std::cout << "Validate test-context" << std::endl
-                          << "Version 0.0.15" << std::endl
+                          << "Version 0.0.16" << std::endl
                           << std::endl;
                 showHelp(argv[0]);
                 return 0;
@@ -118,7 +118,7 @@ int main(int argc, char* argv[]) {
                 break;
 
             case 'V':
-                std::cout << "0.0.15" << std::endl;
+                std::cout << "0.0.16" << std::endl;
                 return 0;
 
             case '?':

{shacl2code-0.0.15 → shacl2code-0.0.16}/tests/expect/cpp/context/test-context.pc

@@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib
 
 Name: test-context
 Description: shacl2code generated binding test-context
-Version: 0.0.15
+Version: 0.0.16
 Cflags: -I${includedir} -DSHACL2CODE_TEST_CONTEXT_DLL
 Libs: -L${libdir} -ltest-context

{shacl2code-0.0.15 → shacl2code-0.0.16}/tests/expect/cpp/nocontext/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "test"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "0.0.15"
+PROJECT_NUMBER         = "0.0.16"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

{shacl2code-0.0.15 → shacl2code-0.0.16}/tests/expect/cpp/nocontext/Makefile

@@ -22,9 +22,9 @@ clean:
 install: libtest.so libtest.a docs
 	# Library
 	$(INSTALL) -d $(DESTDIR)/$(PREFIX)/lib
-	$(INSTALL) -m 0755 libtest.so $(DESTDIR)/$(PREFIX)/lib/libtest.so.0.0.15
-	ln -s libtest.so.0.0.15 $(DESTDIR)/$(PREFIX)/lib/libtest.so
-	ln -s libtest.so.0.0.15 $(DESTDIR)/$(PREFIX)/lib/libtest.so.0
+	$(INSTALL) -m 0755 libtest.so $(DESTDIR)/$(PREFIX)/lib/libtest.so.0.0.16
+	ln -s libtest.so.0.0.16 $(DESTDIR)/$(PREFIX)/lib/libtest.so
+	ln -s libtest.so.0.0.16 $(DESTDIR)/$(PREFIX)/lib/libtest.so.0
 
 	$(INSTALL) -m 0644 libtest.a $(DESTDIR)/$(PREFIX)/lib/
 

{shacl2code-0.0.15 → shacl2code-0.0.16}/tests/expect/cpp/nocontext/test-validate.cpp

@@ -108,7 +108,7 @@ int main(int argc, char* argv[]) {
         switch (opt) {
             case 'h':
                 std::cout << "Validate test" << std::endl
-                          << "Version 0.0.15" << std::endl
+                          << "Version 0.0.16" << std::endl
                           << std::endl;
                 showHelp(argv[0]);
                 return 0;
@@ -118,7 +118,7 @@ int main(int argc, char* argv[]) {
                 break;
 
             case 'V':
-                std::cout << "0.0.15" << std::endl;
+                std::cout << "0.0.16" << std::endl;
                 return 0;
 
             case '?':

{shacl2code-0.0.15 → shacl2code-0.0.16}/tests/expect/cpp/nocontext/test.pc

@@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib
 
 Name: test
 Description: shacl2code generated binding test
-Version: 0.0.15
+Version: 0.0.16
 Cflags: -I${includedir} -DSHACL2CODE_TEST_DLL
 Libs: -L${libdir} -ltest

{shacl2code-0.0.15 → shacl2code-0.0.16}/tests/expect/python/context/test-context.py

@@ -1197,7 +1197,7 @@ class SHACLObjectSet(object):
 
         return SHACLObjectSet(new_objects, link=True)
 
-    def encode(self, encoder, force_list=False):
+    def encode(self, encoder, force_list=False, *, key=None):
         """
         Serialize a list of objects to a serialization encoder
 
@@ -1244,7 +1244,7 @@ class SHACLObjectSet(object):
         else:
             objects = list(self.objects)
 
-        objects.sort()
+        objects.sort(key=key)
 
         if use_list:
             # Ensure top level objects are only written in the top level graph
@@ -1265,7 +1265,7 @@ class SHACLObjectSet(object):
                     with list_s.write_list_item() as item_s:
                         o.encode(item_s, state)
 
-        else:
+        elif objects:
             objects[0].encode(encoder, state)
 
     def decode(self, decoder):

{shacl2code-0.0.15 → shacl2code-0.0.16}/tests/expect/python/nocontext/test.py

@@ -1197,7 +1197,7 @@ class SHACLObjectSet(object):
 
         return SHACLObjectSet(new_objects, link=True)
 
-    def encode(self, encoder, force_list=False):
+    def encode(self, encoder, force_list=False, *, key=None):
         """
         Serialize a list of objects to a serialization encoder
 
@@ -1244,7 +1244,7 @@ class SHACLObjectSet(object):
         else:
             objects = list(self.objects)
 
-        objects.sort()
+        objects.sort(key=key)
 
         if use_list:
             # Ensure top level objects are only written in the top level graph
@@ -1265,7 +1265,7 @@ class SHACLObjectSet(object):
                     with list_s.write_list_item() as item_s:
                         o.encode(item_s, state)
 
-        else:
+        elif objects:
             objects[0].encode(encoder, state)
 
     def decode(self, decoder):

shacl2code-0.0.15/src/shacl2code/version.py

@@ -1 +0,0 @@
-VERSION = "0.0.15"