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

@@ -20,18 +20,20 @@
 ;http://www.w3.org/ns/activitystreams#attachment
 (s/def ::attachment 
   (s/and 
-   ::owl/ObjectProperty
    ::Class
    ::Link
-   ::Object))
+   ::Object
+   ::owl/ObjectProperty))
 
 ;http://www.w3.org/ns/activitystreams#result
+;TODO: definition in progress
+;How should we translate this?
+;rdfs:range [
+;    a owl:Class ;
+;    owl:unionOf ( as:Object as:Link )
+;  ]
 (s/def ::result 
-  (s/and 
+  (s/and ::owl/ObjectProperty))
-   ::owl/ObjectProperty
-   ::Class
-   ::Object
-   ::Link))
 
 ;http://www.w3.org/ns/activitystreams#Activity
 ;TODO: definition in progress

src/test/clj/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2_legacy_test.clj

@@ -5,6 +5,13 @@
    [clojure.spec.alpha :as s]
    [org.domaindrivenarchitecture.activity-pub-poc.activitystreams2-legacy :as sut]))
 
+(deftest id-test
+  (is (s/valid? ::sut/id "https://social.bla/alyssa/status/RANDOMHASH")))
+
+
+
+
+
 
 ;(deftest Note-test
 ;  (is (s/valid?

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

@@ -8,10 +8,3 @@
 (deftest shoult-test-spec-for-having-functional-property
   (is (sut/is-functional-property? ::sut/id))
   (is (not (sut/is-functional-property? ::sut/Like))))
-
-(deftest id-test
-  (is (s/valid? ::sut/id "https://social.bla/alyssa/status/RANDOMHASH"))
-  (is (not (s/valid? ::sut/id nil)))
-  (is (not (s/valid? ::sut/id 2)))
-  (is (not (s/valid? ::sut/id "no-uri")))
-  )

src/test/resources/like.json

@@ -1,11 +1 @@
-{
+{"@context":"https://www.w3.org/ns/activitystreams","id":"https://social.bla/alyssa#likes/RANDOMHASH","type":"Like","to":["https://chatty.bla/ben","https://chatty.bla/gen"],"actor":"https://social.bla/alyssa","object":"https://chatty.bla/ben/posts/234s23-2g34234-2hhj536"}
-    "@context": "https://www.w3.org/ns/activitystreams",
-    "id": "https://social.bla/alyssa#likes/RANDOMHASH",
-    "type": "Like",
-    "to": [
-        "https://chatty.bla/ben",
-        "https://chatty.bla/gen"
-    ],
-    "actor": "https://social.bla/alyssa",
-    "object": "https://chatty.bla/ben/posts/234s23-2g34234-2hhj536"
-}