Fix JSON scheme keywords in generator arguments (#27)

Closes GH #26.

src/nl/surf/demo_data.clj

@@ -37,7 +37,7 @@
 
 (defn load-config
   [schema]
-  (config/load (json/parse-string (slurp schema) keyword)))
+  (-> schema (slurp) (config/load-json)))
 
 (defn generate
   [schema population & [out]]

src/nl/surf/demo_data/config.clj

@@ -15,7 +15,8 @@
 
 (ns nl.surf.demo-data.config
   (:refer-clojure :exclude [load])
-  (:require [clojure.string :as s]
+  (:require [cheshire.core :as json]
+            [clojure.string :as s]
             [nl.surf.demo-data.constraints :as constraints]
             [nl.surf.demo-data.date-util :as date-util]
             [nl.surf.demo-data.generators :as gen]
@@ -131,6 +132,26 @@
                  (into (mapcat (partial load-ref name) refs))))
       attrs)))
 
+(letfn [(keywordize-keys [v depth]
+          (if (pos? depth)
+            (->> v
+                 (map (fn [[k v]]
+                        [(keyword k)
+                         (if (map? v)
+                           (keywordize-keys v (dec depth))
+                           v)]))
+                 (into {}))
+            v))]
+  (defn load-json
+    "Load configuration from JSON string and return attrs definition suitable for
+  `nl.surf.demo-data.world/gen`."
+    [data]
+    (-> data
+        (json/parse-string)
+        (keywordize-keys 1)
+        (update :types (fn [types] (mapv #(keywordize-keys % 3) types)))
+        (load))))
+
 ;;;;;;;;;;;;;;;;;;;;
 
 (defmethod generator "constantly" [_]

test/nl/surf/demo_data/config_test.clj

@@ -1,6 +1,7 @@
 (ns nl.surf.demo-data.config-test
   (:refer-clojure :exclude [load])
-  (:require [clojure.test :refer [deftest is testing]]
+  (:require [cheshire.core :as json]
+            [clojure.test :refer [deftest is testing]]
             [nl.surf.demo-data.config :as sut]))
 
 (deftest load
@@ -64,3 +65,15 @@
         (is (fn? (-> attrs first :generator)))
         (is (= #{"unique-refs" "that-other/other" "that-other/that"}
                (->> attrs (map :generator) (map meta) (map :name) set)))))))
+
+(deftest load-json
+  (testing "generator with object argument"
+    (let [attr (-> {:types [{:name       "this"
+                             :attributes {:att {:generator ["weighted" {"foo" 1, "bar" 2}]}}}]}
+                   json/generate-string
+                   sut/load-json
+                   first)]
+      (is (= :this/att (:name attr)))
+      (is (-> attr :generator fn?))
+      (is (= "weighted" (-> attr :generator meta :name)))
+      (is (= [{"foo" 1, "bar" 2}] (-> attr :generator meta :arguments))))))