catch up the idea of map-class-spec

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

@@ -1,6 +1,7 @@
 (ns org.domaindrivenarchitecture.activity-pub-poc.activitystreams2
   (:require [clojure.spec.alpha :as s]
             [orchestra.core :refer [defn-spec]]
+            [org.domaindrivenarchitecture.activity-pub-poc.spec-helper :as sh]
             [org.domaindrivenarchitecture.activity-pub-poc.owl :as owl]
             [org.domaindrivenarchitecture.activity-pub-poc.xsd :as xsd]))
 
@@ -10,16 +11,6 @@
   [spec keyword?]
   (some #(clojure.string/includes? % "FunctionalProperty") (s/describe spec)))
 
-(defn-spec map-class-spec s/spec?
-  "Spec which checks whether a value is a ::Class 
-   and if it is a map, if it validates the given map-spec."
-  [map-spec s/spec?]
-  (s/and
-   ::Class
-   (s/or
-    :no-map #(not (map? %))
-    :map map-spec)))
-
 ;=======================
 
 ;TODO: There is no as:Class! Why do we need this?
@@ -33,47 +24,46 @@
 ;http://www.w3.org/ns/activitystreams#object
 (s/def ::Object
   (s/and
-   ::Class
+   ::owl/Class
-   (s/keys :opt-un [::id ::type ::attachment])))
+   (sh/map-spec (s/keys :opt-un [::id ::type ::attachment]))))
 
 ;http://www.w3.org/ns/activitystreams#Link
 (s/def ::Link 
   (s/and
-   ::Class
+   ::owl/Class
-   (s/keys :opt-un [::id ::type])))
+   (sh/map-spec (s/keys :opt-un [::id ::type]))))
 
 ;http://www.w3.org/ns/activitystreams#Activity
 ;TODO: Define more properties necessary for Like
 (s/def ::Activity 
   (s/and
-   ::Class
+   ::owl/Class
    ::Object
-   (s/keys :opt-un [::result ::object])))
+   (sh/map-spec (s/keys :opt-un [::result ::object]))))
 
 ;http://www.w3.org/ns/activitystreams#Relationship
 ;We only have this class, since the property "object" is in the domain "Activity" and "Relationship"
 ; TODO: What means: "as:Relationship a rdf:Statement". Relevant for spec?
 (s/def ::Relationship
   (s/and
-   ::Class
+   ::owl/Class
    ::Object
-   (s/keys :opt-un [::object])))
+   (sh/map-spec (s/keys :opt-un [::object]))))
 
 ;http://www.w3.org/ns/activitystreams#Like
 (s/def ::Like
   (s/and
-   ::Class
+   ::owl/Class
    ::Activity))
 
 ;http://www.w3.org/ns/activitystreams#attachment
 ; TODO: Why do we need to model this? Is this necessary for a Like-Activity?
 (s/def ::attachment
   (s/and 
+   ::owl/Class
    ::owl/ObjectProperty
-   (map-class-spec
+   ::Object
-    (s/or
+   ::Link))
-     :object ::Object
-     :link ::Link))))
 
 ;http://www.w3.org/ns/activitystreams#id
 (s/def ::id
@@ -92,38 +82,29 @@
 ;http://www.w3.org/ns/activitystreams#result
 (s/def ::result 
   (s/and 
+   ::owl/Class
    ::owl/ObjectProperty
-   (map-class-spec
+   ::Object
-    (s/or :object ::Object
+   ::Link))
-          :link ::Link))))
 
 ;http://www.w3.org/ns/activitystreams#object
 (s/def ::object 
   (s/and
+   ::owl/Class
    ::owl/ObjectProperty
-   (map-class-spec
+   ::Object
-      (s/or
+   ::Link))
-       :object ::Object
-       :link ::Link))))
 
 ;http://www.w3.org/ns/activitystreams#object
-(defmulti object-type map?)
+(s/def ::Object 
-(defmethod object-type true [_]
+  (s/and ::owl/Class
-  (s/and ::Class 
+         (sh/map-spec (s/keys :opt-un [::id]))))
-         (s/keys :opt-un [::id])))
-(defmethod object-type false [_]
-  (s/and ::Class))
-(s/def ::Object object-type)
 
 ;http://www.w3.org/ns/activitystreams#Link
 ;TODO: definition in progress
-(defmulti link-type map?)
+(s/def ::Link 
-(defmethod link-type true [_]
+  (s/and ::owl/Class
-  (s/and ::Class
+         (sh/map-spec (s/keys :opt-un [::id]))))
-         (s/keys :opt-un [::id])))
-(defmethod link-type false [_]
-  (s/and ::Class))
-(s/def ::Link link-type)
 
 
 

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

@@ -15,8 +15,7 @@
 (defn-spec owl-class? boolean?
   [elem any?]
   (or (p/uri-string? elem)
-      (map? elem)
+      (coll? elem)))
-      (vector? elem)))
 (s/def ::Class owl-class?)
 
 ;http://www.w3.org/2002/07/owl#DatatypeProperty

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

@@ -0,0 +1,14 @@
+(ns org.domaindrivenarchitecture.activity-pub-poc.spec-helper
+  "A swallow spec translation implementation of owl. Inheritance of FunctionalProperty 
+   is realized in deep implemented."
+  (:require
+   [clojure.spec.alpha :as s]
+   [orchestra.core :refer [defn-spec]]))
+
+(defn-spec map-spec s/spec?
+  "Spec that applies only for map values."
+  [spec s/spec?]
+  (s/and
+   (s/or
+    :no-map #(not (map? %))
+    :map spec)))

src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2_test.clj

@@ -16,7 +16,6 @@
   (is (not (s/valid? ::sut/id "no-uri")))
   (is (not (s/valid? ::sut/id ["https://social.bla/alyssa/status/RANDOMHASH", "https://social.bla/alyssa/status/RANDOMHASH2"]))))
 
-;TODO: where does the ability for a link reference come from ?
 (deftest object-test
   (is (s/valid? ::sut/object "http://example.org/posts/1"))
   (is (s/valid? ::sut/object {:type "Note",