support keywords as query and form param keys, non str values (#39)

* support keywords as query and form param keys, non str values

* add test for form params

* add coerce-key

.gitignore

@@ -64,9 +64,9 @@ flycheck_*.el
 # directory configuration
 .dir-locals.el
 
-
 # End of https://www.gitignore.io/api/emacs,clojure
 
 **/.clj-kondo/.cache
 
 .idea/
+.lsp/

src/babashka/curl.clj

@@ -64,6 +64,13 @@
   [^String unencoded]
   (URLEncoder/encode unencoded "UTF-8"))
 
+(defn- coerce-key
+  "Coreces a key to str"
+  [k]
+  (if (keyword? k)
+    (-> k str (subs 1))
+    (str k)))
+
 (defn- curl-command [opts]
   (let [body (:body opts)
         opts (if body
@@ -76,23 +83,23 @@
                  (case method
                    :head ["--head"]
                    ["--request" (-> method name str/upper-case)]))
-        headers (into [] (mapcat (fn [[k v]] ["-H" (str (name k) ": " v)])) (:headers opts))
+        headers (into [] (mapcat (fn [[k v]] ["-H" (str (coerce-key k) ": " v)])) (:headers opts))
         accept-header (accept-header opts)
         form-params (when-let [form-params (:form-params opts)]
                       (loop [params* (transient [])
                              kvs (seq form-params)]
                         (if kvs
                           (let [[k v] (first kvs)
-                                v (url-encode v)
-                                param ["--data" (str (url-encode k) "=" v)]]
+                                v (url-encode (str v))
+                                param ["--data" (str (url-encode (coerce-key k)) "=" v)]]
                             (recur (reduce conj! params* param) (next kvs)))
                           (persistent! params*))))
         query-params (when-let [qp (:query-params opts)]
                        (loop [params* (transient [])
                               kvs (seq qp)]
                          (if kvs
                            (let [[k v] (first kvs)]
-                             (recur (conj! params* (str (url-encode k) "=" (url-encode v))) (next kvs)))
+                             (recur (conj! params* (str (url-encode (coerce-key k)) "=" (url-encode (str v)))) (next kvs)))
                            (str/join "&" (persistent! params*)))))
         data-raw (:data-raw opts)
         data-raw (when data-raw

test/babashka/curl_test.clj

@@ -20,8 +20,8 @@
              (json/parse-string true)
              :code)))
   (testing "query params"
-    (is (= {:foo1 "bar1", :foo2 "bar2"}
-           (-> (curl/get "https://postman-echo.com/get" {:query-params {"foo1" "bar1" "foo2" "bar2"}})
+    (is (= {:foo1 "bar1" :foo2 "bar2" :foo3 "bar3" :not-string "42" :namespaced/key "foo"}
+           (-> (curl/get "https://postman-echo.com/get" {:query-params {"foo1" "bar1" "foo2" "bar2" :foo3 "bar3" :not-string 42 :namespaced/key "foo"}})
                :body
                (json/parse-string true)
                :args)))))
@@ -59,7 +59,9 @@
          "babashka.curl")))
   (testing "form-params"
     (let [body (:body (curl/post "https://postman-echo.com/post"
-                                 {:form-params {"name" "Michiel Borkent"}}))
+                                 {:form-params {"name" "Michiel Borkent"
+                                                :location "NL"
+                                                :this-isnt-a-string 42}}))
           body (json/parse-string body true)
           headers (:headers body)
           content-type (:content-type headers)]