luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2025-12-18 17:01:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

form-encode & form-decode

Browse source
This commit is contained in:
Tommi Reiman 2018-08-01 18:57:17 +03:00
parent 303b124973
commit 6c23a5562a
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/reitit-core/src/reitit/impl.cljc
View file

@ -201,6 +201,23 @@
s) s)
:cljs (js/decodeURIComponent s)))) :cljs (js/decodeURIComponent s))))
(defn form-encode [s]
(if s
#?(:clj (-> s
(str/replace #"[^A-Za-z0-9\!'\(\)\*_~.-\\\ ]+" percent-encode)
(^String .replace " " "+"))
:cljs (str/replace (js/encodeURIComponent s) "%20" "+"))))
(defn form-decode [s]
(if s
#?(:clj (let [s (if (.contains ^String s "+")
(.replace ^String s "+" " ")
s)]
(if (.contains ^String s "%")
(URLDecoder/decode s "UTF-8")
s))
:cljs (js/decodeURIComponent (str/replace s "+" " ")))))
(defprotocol IntoString (defprotocol IntoString
(into-string [_])) (into-string [_]))

12
test/cljc/reitit/impl_test.cljc
View file

@ -157,3 +157,15 @@
"a//" "a//" "a//" "a//"
"/path/%C2%ABk%C3%BC%C3%9F%C3%AE%C2%BB" "/path/«küßî»" "/path/%C2%ABk%C3%BC%C3%9F%C3%AE%C2%BB" "/path/«küßî»"
"/path/%E2%80%9C%D0%8C%CF%8D%D0%91%D0%87%E2%80%9D" "/path/“ЌύБЇ”")) "/path/%E2%80%9C%D0%8C%CF%8D%D0%91%D0%87%E2%80%9D" "/path/“ЌύБЇ”"))
(deftest form-encode-test
(are [in out]
(= out (impl/form-encode in))
"+632 905 123 4567" "%2B632+905+123+4567"))
(deftest form-decode-test
(are [in out]
(= out (impl/form-decode in))
"%2B632+905+123+4567" "+632 905 123 4567"))