luciano/pods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[#33] Allow pods to register transit handlers for reading and writing

Browse source
This commit is contained in:
Michiel Borkent 2021-05-17 11:41:01 +02:00
parent df6e6cbb29
commit 0307cecace
9 changed files with 42 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
script/test
View file

@ -1,5 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eou pipefail
export BABASHKA_POD_TEST_FORMAT export BABASHKA_POD_TEST_FORMAT
export BABASHKA_POD_TEST_SOCKET export BABASHKA_POD_TEST_SOCKET

6
src/babashka/pods.clj
View file

@ -14,3 +14,9 @@
(defn invoke (defn invoke
([pod-id-or-pod sym args] (invoke pod-id-or-pod sym args {})) ([pod-id-or-pod sym args] (invoke pod-id-or-pod sym args {}))
([pod-id-or-pod sym args opts] (jvm/invoke pod-id-or-pod sym args opts))) ([pod-id-or-pod sym args opts] (jvm/invoke pod-id-or-pod sym args opts)))
(defn add-transit-read-handler [tag fn]
(jvm/add-transit-read-handler tag fn))
(defn add-transit-write-handler [tag fn classes]
(jvm/add-transit-write-handler tag fn classes))

7
src/babashka/pods/impl.clj
View file

@ -43,7 +43,7 @@
(defn transit-json-read [^String s] (defn transit-json-read [^String s]
(with-open [bais (java.io.ByteArrayInputStream. (.getBytes s "UTF-8"))] (with-open [bais (java.io.ByteArrayInputStream. (.getBytes s "UTF-8"))]
(let [r (transit/reader bais :json @transit-read-handlers)] (let [r (transit/reader bais :json {:handlers @transit-read-handlers})]
(transit/read r)))) (transit/read r))))
;; https://www.cognitect.com/blog/2015/9/10/extending-transit ;; https://www.cognitect.com/blog/2015/9/10/extending-transit
@ -54,9 +54,10 @@
(defonce transit-write-handlers (atom {})) (defonce transit-write-handlers (atom {}))
;; https://www.cognitect.com/blog/2015/9/10/extending-transit ;; https://www.cognitect.com/blog/2015/9/10/extending-transit
(defn add-transit-write-handler [class tag fn] (defn add-transit-write-handler [tag fn classes]
(let [rh (transit/write-handler tag fn)] (let [rh (transit/write-handler tag fn)]
(swap! transit-write-handlers assoc class rh))) (doseq [class classes]
(swap! transit-write-handlers assoc class rh))))
(defn transit-json-write [^String s] (defn transit-json-write [^String s]
(with-open [baos (java.io.ByteArrayOutputStream. 4096)] (with-open [baos (java.io.ByteArrayOutputStream. 4096)]

4
src/babashka/pods/jvm.clj
View file

@ -73,5 +73,5 @@
(defn add-transit-read-handler [tag fn] (defn add-transit-read-handler [tag fn]
(impl/add-transit-read-handler tag fn)) (impl/add-transit-read-handler tag fn))
(defn add-transit-write-handler [class tag fn] (defn add-transit-write-handler [tag fn classes]
(impl/add-transit-write-handler class tag fn)) (impl/add-transit-write-handler tag fn classes))

4
src/babashka/pods/sci.clj
View file

@ -83,5 +83,5 @@
(defn add-transit-read-handler [tag fn] (defn add-transit-read-handler [tag fn]
(impl/add-transit-read-handler tag fn)) (impl/add-transit-read-handler tag fn))
(defn add-transit-write-handler [class tag fn] (defn add-transit-write-handler [tag fn classes]
(impl/add-transit-write-handler class tag fn)) (impl/add-transit-write-handler tag fn classes))

24
test-pod/pod/test_pod.clj
View file

@ -37,20 +37,19 @@
(defn transit-json-read [^String s] (defn transit-json-read [^String s]
(with-open [bais (java.io.ByteArrayInputStream. (.getBytes s "UTF-8"))] (with-open [bais (java.io.ByteArrayInputStream. (.getBytes s "UTF-8"))]
(let [r (transit/reader bais :json {:handlers (let [r (transit/reader bais :json {:handlers
{(str ::local-date-time) {"pod.test-pod/local-date-time"
(transit/read-handler (transit/read-handler
(fn [s] (fn [s]
(java.time.LocalDateTime/parse s)))}})] (java.time.LocalDateTime/parse s)))}})]
(transit/read r)))) (transit/read r))))
(defn transit-json-write [^String s] (defn transit-json-write [s]
(with-open [baos (java.io.ByteArrayOutputStream. 4096)] (with-open [baos (java.io.ByteArrayOutputStream. 4096)]
(let [w (transit/writer baos :json {:handlers (let [w (transit/writer baos :json {:handlers
{java.time.LocalDateTime {java.time.LocalDateTime
(transit/write-handler (transit/write-handler
(str ::local-date-time) "pod.test-pod/local-date-time"
(fn [s] str)}})]
(java.time.LocalDateTime/parse s)))}})]
(transit/write w s) (transit/write w s)
(str baos)))) (str baos))))
@ -120,7 +119,16 @@
{"name" "other-tag"} {"name" "other-tag"}
;; reads thing with other tag ;; reads thing with other tag
{"name" "read-other-tag" {"name" "read-other-tag"
"code" "(defn read-other-tag [x] [x x])"}] "code" "(defn read-other-tag [x] [x x])"}
{"name" "-local-date-time"}
{"name" "local-date-time"
"code" "
(babashka.pods/add-transit-read-handler \"pod.test-pod/local-date-time\"
(fn [s] (java.time.LocalDateTime/parse s)))
(babashka.pods/add-transit-write-handler \"pod.test-pod/local-date-time\"
str #{java.time.LocalDateTime})
(defn local-date-time [x]
(-local-date-time x))"}]
dependents)} dependents)}
{"name" "pod.test-pod.loaded" {"name" "pod.test-pod.loaded"
"defer" "true"} "defer" "true"}
@ -203,11 +211,11 @@
{"status" ["done"] {"status" ["done"]
"id" id "id" id
"value" "#my/other-tag[1]"}) "value" "#my/other-tag[1]"})
pod.test-pod/local-date-time pod.test-pod/-local-date-time
(write out (write out
{"status" ["done"] {"status" ["done"]
"id" id "id" id
"value" (write-fn (java.time.LocalDateTime/now))})) "value" (write-fn (first args))}))
(recur)) (recur))
:shutdown (System/exit 0) :shutdown (System/exit 0)
:load-ns (let [ns (-> (get message "ns") :load-ns (let [ns (-> (get message "ns")

6
test-resources/test_program.clj
View file

@ -64,9 +64,11 @@
(def fn-called (pod.test-pod/fn-call inc 2)) (def fn-called (pod.test-pod/fn-call inc 2))
;; (.println System/err (str :fmt " " fmt))
(def local-date-time (def local-date-time
(when (= "transit+json" fmt) (if (= "transit+json" fmt)
(pod.test-pod/local-date-time))) (instance? java.time.LocalDateTime (pod.test-pod/local-date-time (java.time.LocalDateTime/now)))
true))
(require '[pod.test-pod.only-code :as only-code]) (require '[pod.test-pod.only-code :as only-code])
(def should-be-1 (only-code/foo)) (def should-be-1 (only-code/foo))

7
test/babashka/pods/sci_test.clj
View file

@ -13,8 +13,11 @@
{'load-pod (fn [& args] {'load-pod (fn [& args]
(apply pods/load-pod @ctx-ref args)) (apply pods/load-pod @ctx-ref args))
'invoke pods/invoke 'invoke pods/invoke
'unload-pod pods/unload-pod}} 'unload-pod pods/unload-pod
:classes {'System System}}) 'add-transit-read-handler pods/add-transit-read-handler
'add-transit-write-handler pods/add-transit-write-handler}}
:classes {'System System
'java.time.LocalDateTime java.time.LocalDateTime}})
_ (vreset! ctx-ref ctx) _ (vreset! ctx-ref ctx)
ret (sci/binding [sci/out out ret (sci/binding [sci/out out
sci/err err] sci/err err]

1
test/babashka/pods/test_common.clj
View file

@ -23,6 +23,7 @@
[[1] [1]] [[1] [1]]
2 2
3 3
true
1] 1]
(concat ret (repeat ::nil)))] (concat ret (repeat ::nil)))]
(if (instance? java.util.regex.Pattern expected) (if (instance? java.util.regex.Pattern expected)