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

@@ -1,30 +1,22 @@
 (ns org.domaindrivenarchitecture.activity-pub-poc.core
   (:require [clojure.spec.alpha :as s]
-            [clojure.walk :as walk] 
             [orchestra.core :refer [defn-spec]]
             [org.domaindrivenarchitecture.activity-pub-poc.spec-helper :as sh]
+            [org.domaindrivenarchitecture.activity-pub-poc.activitystreams2 :as as]
             [clojure.data.json :as json]))
 
-(defn normalize-value [v]
+( defn serialize-element [elem]
-  (cond (map? v)
+ (if (and (sh/is-functional-property? (key elem))
-        (walk/walk normalize-functional-property identity v)
+            (sequential? (val elem)))
-        (sequential? v)
+   {(key elem) (first (val elem))}
-        (map normalize-value v)
+   {(key elem) (val elem)}))
-        :else v))
-
-(defn normalize-functional-property [elem]
- (let [k (first elem)
-       v (second elem)]
-   (cond (and
-          (sequential? v)
-          (sh/is-functional-property? k))
-         {k (first (normalize-value v))}
-         :else {k (normalize-value v)})))
 
 (defn serialize
   [as-map]
   (json/write-str
+   (map
+    serialize-element
     (merge
      {(keyword "@context") "https://www.w3.org/ns/activitystreams"}
-    (walk/walk normalize-functional-property identity as-map))
+     as-map))
    :escape-slash false))

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

@@ -17,8 +17,4 @@
   is-functional-property? boolean?
   "Checks whether spec is a FunctionalProperty."
   [spec s/spec?]
-  (if ( s/get-spec spec)
+  (some #(clojure.string/includes? % "FunctionalProperty") (s/describe spec)))
-    (some
-     #(clojure.string/includes? % "FunctionalProperty")
-     (s/describe spec))
-    false))

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

@@ -3,16 +3,14 @@
    [clojure.test :refer [deftest is are testing run-tests]]
    [clojure.spec.alpha :as s]
    [clojure.string :as str]
-   [org.domaindrivenarchitecture.activity-pub-poc.activitystreams2 :as as]
    [org.domaindrivenarchitecture.activity-pub-poc.core :as sut]))
 
-(deftest should-serialize
+(deftest should-serailize
   (is (=  (str "{\"@context\":\"https://www.w3.org/ns/activitystreams\","
                "\"id\":\"http://example.org/likes/1\","
                "\"summary\":\"Sally liked a note\","
                "\"type\":\"Like\","
                "\"actor\":{"
-               "\"id\":\"http://example.org/persons/1\","
                "\"type\":\"Person\","
                "\"name\":\"Sally\"},"
                "\"object\":\"http://example.org/notes/1\"}")
@@ -20,7 +18,6 @@
            {::as/id ["http://example.org/likes/1"]
             ::as/summary "Sally liked a note",
             ::as/type "Like",
-            ::as/actor {::as/id ["http://example.org/persons/1"]
+            ::as/actor {::as/type "Person",
-                        ::as/type "Person",
                         ::as/name "Sally"},
             ::as/object "http://example.org/notes/1"}))))

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

@@ -8,5 +8,4 @@
 
 (deftest shoult-test-spec-for-having-functional-property
   (is (sut/is-functional-property? ::as2/id))
-  (is (not (sut/is-functional-property? ::as2/Like)))
+  (is (not (sut/is-functional-property? ::as2/Like))))
-  (is (not (sut/is-functional-property? ::as2/NotExisting))))