Introduce ring.util.codec/url-encode and add tests for the rest of th…

…e namespace.

@@ -1,9 +1,15 @@
 (ns ring.util.codec
   "Encoding and decoding utilities."
   (:import java.io.File
-           java.net.URLDecoder
+           (java.net URLEncoder URLDecoder)
            org.apache.commons.codec.binary.Base64))
 
+(defn url-encode
+  "Returns the form-url-encoded ersion of the given string, using either a
+  specified encoding or UTF-8 by default."
+  [unencoded & [encoding]]
+  (URLEncoder/encode unencoded (or encoding "UTF-8")))
+
 (defn url-decode
   "Returns the form-url-decoded version of the given string, using either a
   specified encoding or UTF-8 by default."

@@ -0,0 +1,16 @@
+(ns ring.util.codec-test
+  (:use clojure.test
+        ring.util.codec)
+  (:import java.util.Arrays))
+
+(deftest test-url-encode
+  (is (= "foo%2Fbar" (url-encode "foo/bar")))
+  (is (= "foo%FE%FF%00%2Fbar") (url-encode "foo/bar" "UTF-16")))
+
+(deftest test-url-decode
+  (is (= "foo/bar" (url-decode "foo%2Fbar")))
+  (is (= "foo/bar" (url-decode "foo%FE%FF%00%2Fbar" "UTF-16"))))
+
+(deftest test-base64-encoding
+  (let [str-bytes (.getBytes "foo?/+" "UTF-8")]
+    (is (Arrays/equals str-bytes (base64-decode (base64-encode str-bytes))))))