Added normalize
This commit is contained in:
parent
69d93a99ff
commit
7ae7c9b070
3 changed files with 51 additions and 22 deletions
|
@ -54,7 +54,7 @@ Maps to
|
||||||
(s/def ::id
|
(s/def ::id
|
||||||
(s/and
|
(s/and
|
||||||
...
|
...
|
||||||
::xsd/anyURI))
|
(sh/seq-spec ::xsd/anyURI)))
|
||||||
```
|
```
|
||||||
|
|
||||||
## **rdfs:domain**
|
## **rdfs:domain**
|
||||||
|
|
|
@ -24,12 +24,21 @@
|
||||||
{k (first (normalize-value v))}
|
{k (first (normalize-value v))}
|
||||||
:else {k (normalize-value v)})))
|
:else {k (normalize-value v)})))
|
||||||
|
|
||||||
(defn-spec serialize string?
|
(defn-spec normalize string?
|
||||||
[spec s/spec?
|
[spec s/spec?
|
||||||
as-map map?]
|
as-map map?]
|
||||||
(let [speced-map (assert (s/valid? spec as-map))]
|
(let [normalized-map (walk/walk normalize-functional-property identity as-map)]
|
||||||
|
(do
|
||||||
|
(assert (s/valid? spec normalized-map))
|
||||||
|
normalized-map)))
|
||||||
|
|
||||||
|
(defn-spec serialize string?
|
||||||
|
[spec s/spec?
|
||||||
|
normalized-map map?]
|
||||||
|
(do
|
||||||
|
(assert (s/valid? spec normalized-map))
|
||||||
(json/write-str
|
(json/write-str
|
||||||
(merge
|
(merge
|
||||||
{(keyword "@context") "https://www.w3.org/ns/activitystreams"}
|
{(keyword "@context") "https://www.w3.org/ns/activitystreams"}
|
||||||
(walk/walk normalize-functional-property identity speced-map))
|
normalized-map)
|
||||||
:escape-slash false)))
|
:escape-slash false)))
|
|
@ -6,22 +6,42 @@
|
||||||
[org.domaindrivenarchitecture.activity-pub-poc.activitystreams2 :as as]
|
[org.domaindrivenarchitecture.activity-pub-poc.activitystreams2 :as as]
|
||||||
[org.domaindrivenarchitecture.activity-pub-poc.core :as sut]))
|
[org.domaindrivenarchitecture.activity-pub-poc.core :as sut]))
|
||||||
|
|
||||||
|
(def tmp )
|
||||||
|
|
||||||
|
(deftest should-normalize
|
||||||
|
(is (= {::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/type "Person",
|
||||||
|
::as/name "Sally"},
|
||||||
|
::as/object "http://example.org/notes/1"}
|
||||||
|
(sut/normalize
|
||||||
|
::as/Like
|
||||||
|
{::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/type "Person",
|
||||||
|
::as/name "Sally"},
|
||||||
|
::as/object "http://example.org/notes/1"}))))
|
||||||
|
|
||||||
(deftest should-serialize
|
(deftest should-serialize
|
||||||
(is (= (str "{\"@context\":\"https://www.w3.org/ns/activitystreams\","
|
(is (= (str "{\"@context\":\"https://www.w3.org/ns/activitystreams\","
|
||||||
"\"id\":\"http://example.org/likes/1\","
|
"\"id\":\"http://example.org/likes/1\","
|
||||||
"\"summary\":\"Sally liked a note\","
|
"\"summary\":\"Sally liked a note\","
|
||||||
"\"type\":\"Like\","
|
"\"type\":[\"Like\"],"
|
||||||
"\"actor\":{"
|
"\"actor\":{"
|
||||||
"\"id\":\"http://example.org/persons/1\","
|
"\"id\":\"http://example.org/persons/1\","
|
||||||
"\"type\":\"Person\","
|
"\"type\":\"Person\","
|
||||||
"\"name\":\"Sally\"},"
|
"\"name\":\"Sally\"},"
|
||||||
"\"object\":\"http://example.org/notes/1\"}")
|
"\"object\":\"http://example.org/notes/1\"}")
|
||||||
(sut/serialize
|
(sut/serialize
|
||||||
::as/Like
|
::as/Like
|
||||||
{::as/id ["http://example.org/likes/1"]
|
{::as/id "http://example.org/likes/1"
|
||||||
::as/summary "Sally liked a note",
|
::as/summary "Sally liked a note",
|
||||||
::as/type "Like",
|
::as/type ["Like"],
|
||||||
::as/actor {::as/id ["http://example.org/persons/1"]
|
::as/actor {::as/id "http://example.org/persons/1"
|
||||||
::as/type "Person",
|
::as/type "Person",
|
||||||
::as/name "Sally"},
|
::as/name "Sally"},
|
||||||
::as/object "http://example.org/notes/1"}))))
|
::as/object "http://example.org/notes/1"}))))
|
Loading…
Reference in a new issue