Add support for sets when form-encoding maps

Author: weavejester

src/ring/util/codec.clj

@@ -96,13 +96,14 @@
   Map
   (form-encode* [params encoding]
     (letfn [(encode [x] (form-encode* x encoding))
-            (encode-param [[k v]] (str (encode (name k)) "=" (encode v)))]
+            (encode-param [k v] (str (encode (name k)) "=" (encode v)))]
       (->> params
            (mapcat
             (fn [[k v]]
-              (if (or (seq? v) (sequential? v) )
-                (map #(encode-param [k %]) v)
-                [(encode-param [k v])])))
+              (cond
+                (sequential? v) (map #(encode-param k %) v)
+                (set? v)        (sort (map #(encode-param k %) v))
+                :else           (list (encode-param k v)))))
            (str/join "&"))))
   Object
   (form-encode* [x encoding]

test/ring/util/test/codec.clj

@@ -39,12 +39,16 @@
     (is (= (form-encode "foo/bar" "UTF-16") "foo%FE%FF%00%2Fbar")))
   (testing "maps"
     (are [x y] (= (form-encode x) y)
-      {"a" "b"} "a=b"
-      {:a "b"}  "a=b"
-      {"a" 1}   "a=1"
-      {"a" nil} "a="
+      {"a" "b"}         "a=b"
+      {:a "b"}          "a=b"
+      {"a" 1}           "a=1"
+      {"a" nil}         "a="
       {"a" "b" "c" "d"} "a=b&c=d"
-      {"a" "b c"}       "a=b+c")
+      {"a" "b c"}       "a=b+c"
+      {"a" ["b" "c"]}   "a=b&a=c"
+      {"a" ["c" "b"]}   "a=c&a=b"
+      {"a" (seq [1 2])} "a=1&a=2"
+      {"a" #{"c" "b"}}  "a=b&a=c")
     (is (= (form-encode {"a" "foo/bar"} "UTF-16") "a=foo%FE%FF%00%2Fbar"))))
 
 (deftest test-form-decode-str