luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2026-02-19 01:05:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Undo ensure-slash

Browse source
This commit is contained in:
Unknown 2018-10-29 09:11:52 +09:00
parent 33582b4c1c
commit 46254975d9
2 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
modules/reitit-core/src/reitit/core.cljc
View file

@ -30,12 +30,6 @@
nil
(expand [_ _]))
(defn ensure-slash
[^String string]
(if (.endsWith string "/")
(str/replace string #"/+$" "")
string))
(defn walk [raw-routes {:keys [path data routes expand]
:or {data [], routes [], expand expand}
:as opts}]
@ -55,9 +49,7 @@
[maybe-arg (rest args)])
macc (into macc (expand data opts))
child-routes (walk-many (str pacc path) macc (keep identity childs))]
(if (seq childs)
(seq child-routes)
[[(str pacc (ensure-slash path)) macc]])))))]
(if (seq childs) (seq child-routes) [[(str pacc path) macc]])))))]
(walk-one path (mapv identity data) raw-routes)))
(defn map-data [f routes]
@ -208,13 +200,8 @@
(match-by-path [_ path]
(reduce
(fn [_ ^Route route]
(let [slashed-path (ensure-slash path)]
(if-let [path-params ((:matcher route) slashed-path)]
(reduced (->Match (:path route)
(:data route)
(:result route)
(impl/url-decode-coll path-params)
slashed-path)))))
(if-let [path-params ((:matcher route) path)]
(reduced (->Match (:path route) (:data route) (:result route) (impl/url-decode-coll path-params) path))))
nil pl))
(match-by-name [_ name]
(if-let [match (impl/fast-get lookup name)]
@ -260,7 +247,7 @@
(route-names [_]
names)
(match-by-path [_ path]
(impl/fast-get data (ensure-slash path)))
(impl/fast-get data path))
(match-by-name [_ name]
(if-let [match (impl/fast-get lookup name)]
(match nil)))
@ -301,11 +288,10 @@
(route-names [_]
names)
(match-by-path [_ path]
(let [slashed-path (ensure-slash path)]
(if-let [match (segment/lookup pl slashed-path)]
(-> (:data match)
(assoc :path-params (impl/url-decode-coll (:path-params match)))
(assoc :path slashed-path)))))
(if-let [match (segment/lookup pl path)]
(-> (:data match)
(assoc :path-params (impl/url-decode-coll (:path-params match)))
(assoc :path path))))
(match-by-name [_ name]
(if-let [match (impl/fast-get lookup name)]
(match nil)))
@ -342,7 +328,7 @@
(route-names [_]
names)
(match-by-path [_ path]
(if (#?(:clj .equals :cljs =) p (ensure-slash path))
(if (#?(:clj .equals :cljs =) p path)
match))
(match-by-name [_ name]
(if (= n name)

4
test/cljc/reitit/core_test.cljc
View file

@ -230,8 +230,8 @@
true [["/a/1/2"]
["/*b"]]
true [["/a"]
["/a/"]]
false [["/a"]
["/a/"]]
false [["/a"]
["/a/1"]]