Merge pull request #186 from herminiogg/bug-#185

Bug #185
herminiogg · Mar 14, 2024 · f4e4805 · f4e4805
2 parents 13c3ef0 + df69370
commit f4e4805
Show file tree

Hide file tree

Showing 7 changed files with 104 additions and 5 deletions.
diff --git a/src/main/scala/com/herminiogarcia/shexml/shex/SHACLGenerator.scala b/src/main/scala/com/herminiogarcia/shexml/shex/SHACLGenerator.scala
@@ -51,8 +51,18 @@ class SHACLGenerator(dataset: Dataset, closed: Boolean) {
       val shapeName = name.split(':')(1)
       val shapeSubject = shapePrefix + shapeName
       output.add(createStatement(shapeSubject, rdfPrefix + "type", shPrefix + "NodeShape"))
-      //Class-based target, could be also implemented searching for rdf:type predicate
-      output.add(createStatement(shapeSubject, shPrefix + "targetClass", shapeSubject))
+
+      val rdfType = predicateObjects
+        .find(po => po.predicate.prefix == "rdf:" && po.predicate.localname == "type")
+        .flatMap(_.objectElement match {
+          case FixedValue(value) =>
+            val targetClassPrefix = prefixTable(value.split(':')(0) + ":")
+            val targetClassName = name.split(':')(1)
+            Some(targetClassPrefix + targetClassName)
+          case _ => None
+        })
+
+      output.add(createStatement(shapeSubject, shPrefix + "targetClass", rdfType.getOrElse(shapeSubject)))
       if(closed) {
         output.add(createStatementWithLiteral(shapeSubject, shPrefix + "closed", "true", xsdPrefix + "boolean"))
       }

diff --git a/src/main/scala/com/herminiogarcia/shexml/shex/ShExGeneratorVisitor.scala b/src/main/scala/com/herminiogarcia/shexml/shex/ShExGeneratorVisitor.scala
@@ -16,7 +16,8 @@ class ShExGeneratorVisitor(inferences: List[ShExMLInferredCardinalitiesAndDataty
 
   override def doVisit(ast: com.herminiogarcia.shexml.ast.AST, optionalArgument: HashMap[String, String]): ShExSubsetAST = ast match {
     case ShExML(declarations, graphs, shapes) => {
-      val prefixes = declarations.filter(_.declarationStatement.isInstanceOf[com.herminiogarcia.shexml.ast.Prefix])
+      val prefixes = (declarations :+ Declaration(com.herminiogarcia.shexml.ast.Prefix(Var("rdf:"), URL("http://www.w3.org/1999/02/22-rdf-syntax-ns#"))))
+        .filter(_.declarationStatement.isInstanceOf[com.herminiogarcia.shexml.ast.Prefix])
         .map(doVisit(_, optionalArgument).asInstanceOf[com.herminiogarcia.shexml.shex.Prefix])
       val shexGraphs = graphs.map(doVisit(_, optionalArgument).asInstanceOf[com.herminiogarcia.shexml.shex.Graph])
       val shexShapes = shapes.map(doVisit(_, optionalArgument).asInstanceOf[com.herminiogarcia.shexml.shex.Shape])

diff --git a/src/main/scala/com/herminiogarcia/shexml/shex/ShExPrinter.scala b/src/main/scala/com/herminiogarcia/shexml/shex/ShExPrinter.scala
@@ -19,7 +19,9 @@ class ShExPrinter {
     }
 
     case Shape(name, partialFixedValue, predicateObjects) => {
-      val partialFixedValuePrint = "IRI" //until confirmation this seems not to be working in ShEx -> print(partialFixedValue)
+      val partialFixedValuePrint =
+        if(partialFixedValue.start == "_:") "Bnode"
+        else "IRI" //until confirmation this seems not to be working in ShEx -> print(partialFixedValue)
       val predicateObjectsPrint = predicateObjects.map(print(_, indentation + 1)).mkString("\n")
       generateIndentation(indentation) + name + " " + partialFixedValuePrint + " {\n" +
         predicateObjectsPrint + "\n" + generateIndentation(indentation) + "}"

diff --git a/src/main/scala/com/herminiogarcia/shexml/visitor/RDFGeneratorVisitor.scala b/src/main/scala/com/herminiogarcia/shexml/visitor/RDFGeneratorVisitor.scala
@@ -149,7 +149,7 @@ class RDFGeneratorVisitor(dataset: Dataset, varTable: mutable.HashMap[Variable,
               ShapeMapShape(":", splittedShapeName(1))
           val node = Node(shapePrefix, normaliseURI(r))
           val shapeMap = ShapeMapInference(node, shapeMapShape)
-          shapeMapTable += shapeMap
+          if(shapePrefix != "_:") shapeMapTable += shapeMap
         })
       })
       finalActions.map(r => Result(r.id, r.rootIds, r.results.map(ir => {

diff --git a/src/test/scala/com/herminiogarcia/shexml/shacl/FilmsTest.scala b/src/test/scala/com/herminiogarcia/shexml/shacl/FilmsTest.scala
@@ -51,6 +51,7 @@ class FilmsTest extends AnyFunSuite with SHACLValidation {
       |EXPRESSION films <films_xml_file.film_xml UNION films_json_file.film_json>
       |
       |:Films :[films.id] {
+      |    a schema:Movie ;
       |    schema:name [films.name] @en ;
       |    :year dbr:[films.year] ;
       |    schema:countryOfOrigin dbr:[films.country] ;
@@ -63,11 +64,13 @@ class FilmsTest extends AnyFunSuite with SHACLValidation {
       |}
       |
       |:Actor dbr:[films.actors.name] {
+      |    a schema:Actor ;
       |    :name [films.actors.name] ;
       |    :appear_on :[films.actors.film] ;
       |}
       |
       |:Actress dbr:[films.actresses.name] {
+      |    a schema:Actor ;
       |    :name [films.actresses.name] ;
       |    :appear_on :[films.actresses.film] ;
       |}

diff --git a/src/test/scala/com/herminiogarcia/shexml/shex/FilmsWithInferredShapeMapAndBNodesTest.scala b/src/test/scala/com/herminiogarcia/shexml/shex/FilmsWithInferredShapeMapAndBNodesTest.scala
@@ -0,0 +1,82 @@
+package com.herminiogarcia.shexml.shex
+
+import com.herminiogarcia.shexml.MappingLauncher
+import org.scalatest.funsuite.AnyFunSuite
+
+class FilmsWithInferredShapeMapAndBNodesTest extends AnyFunSuite with ShExValidation {
+
+  private val example =
+    """
+      |PREFIX : <http://example.com/>
+      |PREFIX xs: <http://www.w3.org/2001/XMLSchema#>
+      |PREFIX dbr: <http://dbpedia.org/resource/>
+      |PREFIX schema: <http://schema.org/>
+      |SOURCE films_xml_file <https://shexml.herminiogarcia.com/files/films.xml>
+      |SOURCE films_json_file <https://shexml.herminiogarcia.com/files/films.json>
+      |ITERATOR film_xml <xpath: //film> {
+      |    FIELD id <@id>
+      |    FIELD name <name>
+      |    FIELD year <year>
+      |    FIELD country <country>
+      |    FIELD directors <crew/directors/director>
+      |    FIELD screenwritters <crew//screenwritter>
+      |    FIELD music <crew/music>
+      |    FIELD photography <crew/photography>
+      |    ITERATOR actors <cast/actor> {
+      |        FIELD name <name>
+      |        FIELD role <role>
+      |        FIELD film <../../@id>
+      |    }
+      |    ITERATOR actresses <cast/actress> {
+      |        FIELD name <name>
+      |        FIELD role <role>
+      |        FIELD film <../../@id>
+      |    }
+      |}
+      |ITERATOR film_json <jsonpath: $.films[*]> {
+      |    PUSHED_FIELD id <id>
+      |    FIELD name <name>
+      |    FIELD year <year>
+      |    FIELD country <country>
+      |    FIELD directors <crew.director>
+      |    FIELD screenwritters <crew.screenwritter>
+      |    FIELD music <crew.music>
+      |    FIELD photography <crew.cinematography>
+      |    ITERATOR actors <cast[*]> {
+      |        FIELD name <name>
+      |        FIELD role <role>
+      |        POPPED_FIELD film <id>
+      |    }
+      |}
+      |EXPRESSION films <films_xml_file.film_xml UNION films_json_file.film_json>
+      |
+      |:Films :[films.id] {
+      |    a schema:Movie ;
+      |    schema:name [films.name] @en ;
+      |    :year dbr:[films.year] ;
+      |    schema:countryOfOrigin dbr:[films.country] ;
+      |    schema:director dbr:[films.directors] ;
+      |    :screenwritter dbr:[films.screenwritters] ;
+      |    schema:musicBy dbr:[films.music] ;
+      |    :cinematographer dbr:[films.photography] ;
+      |    schema:actor @:Actor ;
+      |    schema:actor @:Actress ;
+      |}
+      |
+      |:Actor _:[films.actors.name] {
+      |    :name [films.actors.name] ;
+      |    :appear_on :[films.actors.film] ;
+      |}
+      |
+      |:Actress _:[films.actresses.name] {
+      |    :name [films.actresses.name] ;
+      |    :appear_on :[films.actresses.film] ;
+      |}
+    """.stripMargin
+
+  test("Films validate against generated schema") {
+    val shapeMap = new MappingLauncher(normaliseURIs = true).launchShapeMapGeneration(example)
+    assert(this.validate(example, shapeMap))
+  }
+
+}
diff --git a/src/test/scala/com/herminiogarcia/shexml/shex/FilmsWithInferredShapeMapTest.scala b/src/test/scala/com/herminiogarcia/shexml/shex/FilmsWithInferredShapeMapTest.scala
@@ -51,6 +51,7 @@ class FilmsWithInferredShapeMapTest extends AnyFunSuite with ShExValidation {
       |EXPRESSION films <films_xml_file.film_xml UNION films_json_file.film_json>
       |
       |:Films :[films.id] {
+      |    a schema:Movie ;
       |    schema:name [films.name] @en ;
       |    :year dbr:[films.year] ;
       |    schema:countryOfOrigin dbr:[films.country] ;