Merge pull request #167 from metabase/tweak_http_client

Tweak http client

src/metabase/middleware/format.clj

@@ -21,8 +21,8 @@
 (defn- remove-fns-and-delays
   "Remove values that are fns or delays from map M."
   [m]
-  (filter-vals #(and (not (fn? %))
-                     (not (delay? %)))
+  (filter-vals #(not (or (delay? %)
+                         (fn? %)))
                m))
 
 (defn- clob? [obj]
@@ -31,7 +31,7 @@
 (defn- -format-response [obj]
   (cond
     (map? obj)  (->> (remove-fns-and-delays obj)   ; recurse over all vals in the map
-                    (map-vals -format-response))
+                     (map-vals -format-response))
     (coll? obj) (map -format-response obj)        ; recurse over all items in the collection
     (clob? obj) (util/jdbc-clob->str obj)
     :else       obj))

test/metabase/http_client.clj

@@ -143,8 +143,9 @@
   (cond (sequential? response) (map auto-deserialize-dates response)
         (map? response) (->> response
                              (map (fn [[k v]]
-                                    {k (if (contains? auto-deserialize-dates-keys k)
-                                         (deserialize-date v)
-                                         (auto-deserialize-dates v))}))
+                                    {k (cond
+                                         (contains? auto-deserialize-dates-keys k) (deserialize-date v)
+                                         (coll? v) (auto-deserialize-dates v)
+                                         :else v)}))
                              (into {}))
         :else response))