Merge branch 'object-or-refernce' of ssh://repo.prod.meissa.de:2222/meissa/activity-pub-poc into object-or-refernce

src/main/clj/org/domaindrivenarchitecture/activity_pub_poc/xsd.clj

@@ -1,7 +0,0 @@
-(ns org.domaindrivenarchitecture.activity-pub-poc.xsd
-  (:require [clojure.spec.alpha :as s]))
-
-; http://www.datypic.com/sc/xsd/t-xsd_anyURI.html
-; TODO: Find out correct definition!
-(defn anyUri? [input]
-  false)

src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2.cljc

@@ -65,8 +65,9 @@
 ;Answer jem: I do not want to enhance owl/Class inline from here.
 (s/def
   ::Class
-  (s/merge ::owl/Class
-           (s/keys :opt-un [::id ::object])))
+  (s/and ::owl/Class
+         ))
+         ;(s/keys :opt-un [::id ::object])))
 
 
 ;http://www.w3.org/ns/activitystreams#Like

src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/owl.cljc

@@ -3,6 +3,7 @@
    is realized in deep implemented."
   (:require
    [clojure.spec.alpha :as s]
+   [org.domaindrivenarchitecture.activity-pub-poc.predicates :as p]
    [orchestra.core :refer [defn-spec]]))
 
 ; Properties:https://www.w3.org/TR/owl-ref/#Property
@@ -11,7 +12,12 @@
 
 ;http://www.w3.org/2002/07/owl#Class
 ;https://www.w3.org/TR/owl-ref/#Class-def
-(s/def ::Class any?)
+(defn-spec owl-class? boolean?
+  [elem any?]
+  (or (p/uri-string? elem)
+      (map? elem)
+      (vector? elem)))
+(s/def ::Class owl-class?)
 
 ;http://www.w3.org/2002/07/owl#DatatypeProperty
 (s/def ::DatatypeProperty any?)

src/main/resources/activitystreams_2.0_owl.ttl

@@ -477,6 +477,8 @@ as:id a owl:DatatypeProperty ,
         owl:DeprecatedProperty ;
   rdfs:label "id"@en ;
   rdfs:range xsd:anyURI ;
+  rdfs:domain as:Link,
+              as:Object;
   rdfs:domain [
     a owl:Class ;
     owl:unionOf (as:Link as:Object)

src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/owl_test.cljc

@@ -11,4 +11,11 @@
   (is (sut/functional? ["str"]))
   (is (not (sut/functional? [])))
   (is (not (sut/functional? nil)))
-  (is (not (sut/functional? [1 2]))))
+  (is (not (sut/functional? [1 2]))))
+
+(deftest owl-class-predicate
+  (is (sut/owl-class? "http://some.uri"))
+  (is (sut/owl-class? {:as "class-definition"}))
+  (is (sut/owl-class? []))
+  (is (not (sut/owl-class? "str")))
+  (is (not (sut/owl-class? nil))))