Extend and test configuration-aware extended-EDN serialization.

Author: llasram

src/clojure/parkour/cser.clj

@@ -1,18 +1,40 @@
 (ns parkour.cser
-  (:refer-clojure :exclude [assoc! get])
-  (:require [parkour.conf :as conf])
-  (:import [org.apache.hadoop.conf Configuration]
+  (:refer-clojure :exclude [assoc! get read-string pr-str])
+  (:require [clojure.core :as cc]
+            [parkour.conf :as conf])
+  (:import [java.io Writer]
+           [clojure.lang RT]
+           [org.apache.hadoop.conf Configuration]
            [parkour.edn EdnReader]))
 
 (def ^:internal ^:dynamic *conf*
   "Configuration of job being executed/configured during job configuration
 de/serialization."
   nil)
 
+(defmacro ^:private with-conf
+  "Enter dynamic cser context of `conf` for `body` forms."
+  [conf & body] `(binding [*conf* (conf/ig ~conf)] ~@body))
+
+(defn ^:private read-string*
+  "Like core `edn/read-string`, but using cser/EDN reader implementation."
+  ([s] (read-string* {:eof nil, :readers *data-readers*} s))
+  ([opts s] (when s (EdnReader/readString s opts))))
+
+(defn read-string
+  "Like core `edn/read-string`, but using cser/EDN reader implementation in the
+cser context of `conf`."
+  ([conf s] (with-conf conf (read-string* s)))
+  ([conf opts s] (with-conf conf (read-string* opts s))))
+
+(defn pr-str
+  "Like core `pr-str`, but in the cser context of `conf`."
+  [conf & xs] (with-conf conf (apply cc/pr-str xs)))
+
 (defn ^:private assoc!*
   "Internal implementation for `assoc!`."
   ([conf key val]
-     (conf/assoc! conf key (pr-str val)))
+     (conf/assoc! conf key (cc/pr-str val)))
   ([conf key val & kvs]
      (let [conf (assoc!* conf key val)]
        (if (empty? kvs)
@@ -23,24 +45,15 @@ de/serialization."
   "Set `key` in `conf` to cser/EDN representation of `val`."
   {:tag `Configuration}
   ([conf] conf)
-  ([conf key val]
-     (binding [*conf* conf]
-       (assoc!* conf key val)))
-  ([conf key val & kvs]
-     (binding [*conf* conf]
-       (apply assoc!* conf key val kvs))))
-
-(defn ^:private edn-read-string
-  "Like core `edn/read-string`, but using cser/EDN reader implementation."
-  ([s] (edn-read-string {:eof nil, :readers *data-readers*} s))
-  ([opts s] (when s (EdnReader/readString s opts))))
+  ([conf key val] (with-conf conf (assoc!* conf key val)))
+  ([conf key val & kvs] (with-conf conf (apply assoc!* conf key val kvs))))
 
 (defn get
   "Clojure data value for `key` in `conf`."
   ([conf key] (get conf key nil))
   ([conf key default]
-     (binding [*conf* conf]
+     (with-conf conf
        (let [val (conf/get conf key nil)]
          (if (nil? val)
            default
-           (edn-read-string val))))))
+           (read-string* val))))))

test/parkour/cser_test.clj

@@ -0,0 +1,31 @@
+(ns parkour.cser-test
+  (:require [clojure.test :refer :all]
+            [parkour (conf :as conf) (cser :as cser)]
+            [parkour.test-helpers :as th]))
+
+(def conf-key
+  "parkour.cser-test")
+
+(defn roundtrips-conf?
+  [x]
+  (let [conf (conf/ig)]
+    (cser/assoc! conf conf-key x)
+    (= x (cser/get conf conf-key))))
+
+(defn roundtrips-raw?
+  [x]
+  (let [conf (conf/ig)]
+    (= x (cser/read-string conf (cser/pr-str conf x)))))
+
+(deftest test-cser
+  (th/with-config
+    (let [conf (conf/ig)]
+      (are [x] (and (roundtrips-conf? x)
+                    (roundtrips-raw? x))
+           (range 10)
+           [:foo 'bar "baz"]
+           {:key #'val})
+      (are [x] (and (not (roundtrips-conf? x))
+                    (not (roundtrips-raw? x)))
+           ;; Any other failing cases?
+           java.lang.String))))