Add ClojureScript support

xafizoff · xafizoff · commit 68267376ffd0 · 2018-03-31T19:24:40.000+03:00
Increases minimum Clojure version to 1.7 for reader conditionals, and
updates Instaparse to 1.4.8 for ClojureScript support.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,11 @@
 language: clojure
-lein: lein2
-script: lein2 with-profile dev:dev,1.4:dev,1.5:dev,1.6:dev,1.7 test
-jdk:
-  - openjdk7
-  - openjdk6
+script:
+  - jdk_switcher use openjdk6
+  - lein with-profile dev:dev,1.7:dev,1.8:dev,1.9 test
+  - lein with-profile 1.7:1.8 doo node once
+  - jdk_switcher use openjdk7
+  - lein with-profile dev:dev,1.7:dev,1.8:dev,1.9 test
+  - lein with-profile 1.7:1.8 doo node once
+  - jdk_switcher use openjdk8
+  - lein with-profile dev:dev,1.7:dev,1.8:dev,1.9 test
+  - lein with-profile 1.7:1.8:1.9 doo node once
diff --git a/project.clj b/project.clj
@@ -2,12 +2,28 @@
   :description "A HTTP route matching library"
   :url "https://github.com/weavejester/clout"
   :license {:name "Eclipse Public License"
-            :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[org.clojure/clojure "1.5.1"]
-                 [instaparse "1.4.0" :exclusions [org.clojure/clojure]]]
+            :url  "http://www.eclipse.org/legal/epl-v10.html"}
+  :dependencies [[org.clojure/clojure "1.7.0"]
+                 [org.clojure/clojurescript "1.7.228" :scope "provided"]
+                 [instaparse "1.4.8" :exclusions [org.clojure/clojure]]]
+  :plugins [[lein-doo "0.1.7"]
+            [lein-cljsbuild "1.1.4"]]
+  :cljsbuild {:builds
+              {:test
+               {:source-paths ["src" "test"]
+                :compiler     {:main          clout.test-runner
+                               :output-dir    "target/out"
+                               :output-to     "target/test/advanced.js"
+                               :target        :nodejs
+                               :optimizations :advanced}}}}
+  :doo {:build "test"}
   :profiles
-  {:dev {:jvm-opts ^:replace []
+  {:dev {:jvm-opts     ^:replace []
          :dependencies [[ring/ring-mock "0.2.0"]
                         [criterium "0.4.2"]]}
-   :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
-   :1.7 {:dependencies [[org.clojure/clojure "1.7.0-beta2"]]}})
+   :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]
+                        [org.clojure/clojurescript "1.7.228"]]}
+   :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]
+                        [org.clojure/clojurescript "1.8.51"]]}
+   :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]
+                        [org.clojure/clojurescript "1.9.946"]]}})
diff --git a/src/clout/core.cljc b/src/clout/core.cljc
@@ -2,24 +2,36 @@
   "A small language for routing."
   (:require [clojure.string :as string]
             [clojure.set :as set]
-            [instaparse.core :as insta]))
+            [instaparse.core :as insta]
+            #?(:cljs [clout.internal.regex :refer [re-unicode-letter]])))
 
 (def ^:private re-chars (set "\\.*+|?()[]{}$^"))
+#?(:cljs (def ^:private re-char-escapes
+           (into {} (for [c re-chars] [c (str "\\" c)]))))
 
 (defn- re-escape [s]
-  (string/escape s #(if (re-chars %) (str \\ %))))
-
-(defn- re-groups* [^java.util.regex.Matcher matcher]
-  (for [i (range (.groupCount matcher))]
-    (.group matcher (int (inc i)))))
+  (string/escape s #?(:clj #(if (re-chars %) (str \\ %)) :cljs re-char-escapes)))
+
+(defn- re-match-groups [re s]
+  #?(:clj
+     (let [matcher (re-matcher re s)]
+       (when (.matches matcher)
+         (for [i (range (.groupCount matcher))]
+           (.group matcher (int (inc i))))))
+     :cljs
+     (if (string? s)
+       (let [matches (.exec re s)]
+         (when (= (first matches) s)
+           (rest matches)))
+       (throw (js/TypeError. "re-match-groups must match against string.")))))
 
 (defn- assoc-conj [m k v]
   (assoc m k
-    (if-let [cur (get m k)]
-      (if (vector? cur)
-        (conj cur v)
-        [cur v])
-      v)))
+           (if-let [cur (get m k)]
+             (if (vector? cur)
+               (conj cur v)
+               [cur v])
+             v)))
 
 (defn- assoc-keys-with-groups [groups keys]
   (reduce (fn [m [k v]] (assoc-conj m k v))
@@ -46,26 +58,26 @@
   (route-matches [_ request]
     (let [path-info (if absolute?
                       (request-url request)
-                      (path-info request))
-          matcher   (re-matcher re path-info)]
-      (if (.matches matcher)
-        (assoc-keys-with-groups (re-groups* matcher) keys))))
-  Object
-  (toString [_] source))
+                      (path-info request))]
+      (let [groups (re-match-groups re path-info)]
+        (when groups
+          (assoc-keys-with-groups groups keys)))))
+  #?@(:clj [Object
+            (toString [_] source)]))
 
 (def ^:private route-parser
   (insta/parser
-   "route    = (scheme / part) part*
-    scheme   = #'(https?:)?//'
-
-    <part>   = literal | escaped | wildcard | param
-    literal  = #'(:[^\\p{L}_*{}\\\\]|[^:*{}\\\\])+'
-    escaped  = #'\\\\.'
-    wildcard = '*'
-
-    param    = key pattern?
-    key      = <':'> #'([\\p{L}_][\\p{L}_0-9-]*)'
-    pattern  = '{' (#'(?:[^{}\\\\]|\\\\.)+' | pattern)* '}'"
+   (let [letter #?(:clj "\\p{L}" :cljs re-unicode-letter)]
+     (str
+      "route    = (scheme / part) part*
+       scheme   = #'(https?:)?//'
+       <part>   = literal | escaped | wildcard | param
+       literal  = #'(:[^" letter "_*{}\\\\]|[^:*{}\\\\])+'
+       escaped  = #'\\\\.'
+       wildcard = '*'
+       param    = key pattern?
+       key      = <':'> #'([" letter "_][" letter "_0-9-]*)'
+       pattern  = '{' (#'(?:[^{}\\\\]|\\\\.)+' | pattern)* '}'"))
    :no-slurp true))
 
 (defn- parse [parser text]
@@ -92,7 +104,7 @@
 
 (defn- route-regex [parse-tree regexs]
   (insta/transform
-   {:route    (comp re-pattern str)
+   {:route    (comp re-pattern #?(:cljs #(str "^" % "$")) str)
     :scheme   #(if (= % "//") "https?://" %)
     :literal  re-escape
     :escaped  #(re-escape (subs % 1))
@@ -108,19 +120,19 @@
 (defn route-compile
   "Compile a route string for more efficient route matching."
   ([path]
-     (route-compile path {}))
+   (route-compile path {}))
   ([path regexs]
-     (let [ast (parse route-parser path)
-           ks  (route-keys ast)]
-       (assert (set/subset? (set (keys regexs)) (set ks))
-               "unused keys in regular expression map")
-       (CompiledRoute.
-        path
-        (route-regex ast regexs)
-        (vec ks)
-        (absolute-url? path)))))
-
-(extend-type String
+   (let [ast (parse route-parser path)
+         ks  (route-keys ast)]
+     (assert (set/subset? (set (keys regexs)) (set ks))
+             "unused keys in regular expression map")
+     (CompiledRoute.
+      path
+      (route-regex ast regexs)
+      (vec ks)
+      (absolute-url? path)))))
+
+(extend-type #?(:clj String :cljs string)
   Route
   (route-matches [route request]
     (route-matches (route-compile route) request)))
diff --git a/src/clout/internal/regex.cljs b/src/clout/internal/regex.cljs
@@ -0,0 +1,72 @@
+(ns ^:no-doc clout.internal.regex)
+
+(def re-unicode-letter
+  (str
+   "A-Za-z\\xAA\\xB5\\xBA\\xC0-\\xD6\\xD8-\\xF6\\xF8-\\u02C1\\u02C6-\\u02D1"
+   "\\u02E0-\\u02E4\\u02EC\\u02EE\\u0370-\\u0374\\u0376\\u0377\\u037A-\\u037D"
+   "\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u03A1\\u03A3-\\u03F5\\u03F7-\\u0481"
+   "\\u048A-\\u0527\\u0531-\\u0556\\u0559\\u0561-\\u0587\\u05D0-\\u05EA\\u05F0"
+   "-\\u05F2\\u0620-\\u064A\\u066E\\u066F\\u0671-\\u06D3\\u06D5\\u06E5\\u06E6"
+   "\\u06EE\\u06EF\\u06FA-\\u06FC\\u06FF\\u0710\\u0712-\\u072F\\u074D-\\u07A5"
+   "\\u07B1\\u07CA-\\u07EA\\u07F4\\u07F5\\u07FA\\u0800-\\u0815\\u081A\\u0824"
+   "\\u0828\\u0840-\\u0858\\u08A0\\u08A2-\\u08AC\\u0904-\\u0939\\u093D\\u0950"
+   "\\u0958-\\u0961\\u0971-\\u0977\\u0979-\\u097F\\u0985-\\u098C\\u098F\\u0990"
+   "\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BD\\u09CE\\u09DC"
+   "\\u09DD\\u09DF-\\u09E1\\u09F0\\u09F1\\u0A05-\\u0A0A\\u0A0F\\u0A10\\u0A13-"
+   "\\u0A28\\u0A2A-\\u0A30\\u0A32\\u0A33\\u0A35\\u0A36\\u0A38\\u0A39\\u0A59-"
+   "\\u0A5C\\u0A5E\\u0A72-\\u0A74\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8"
+   "\\u0AAA-\\u0AB0\\u0AB2\\u0AB3\\u0AB5-\\u0AB9\\u0ABD\\u0AD0\\u0AE0\\u0AE1"
+   "\\u0B05-\\u0B0C\\u0B0F\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32\\u0B33"
+   "\\u0B35-\\u0B39\\u0B3D\\u0B5C\\u0B5D\\u0B5F-\\u0B61\\u0B71\\u0B83\\u0B85-"
+   "\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99\\u0B9A\\u0B9C\\u0B9E\\u0B9F"
+   "\\u0BA3\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BD0\\u0C05-\\u0C0C\\u0C0E-"
+   "\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C33\\u0C35-\\u0C39\\u0C3D\\u0C58\\u0C59"
+   "\\u0C60\\u0C61\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3"
+   "\\u0CB5-\\u0CB9\\u0CBD\\u0CDE\\u0CE0\\u0CE1\\u0CF1\\u0CF2\\u0D05-\\u0D0C"
+   "\\u0D0E-\\u0D10\\u0D12-\\u0D3A\\u0D3D\\u0D4E\\u0D60\\u0D61\\u0D7A-\\u0D7F"
+   "\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0E01"
+   "-\\u0E30\\u0E32\\u0E33\\u0E40-\\u0E46\\u0E81\\u0E82\\u0E84\\u0E87\\u0E88"
+   "\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7"
+   "\\u0EAA\\u0EAB\\u0EAD-\\u0EB0\\u0EB2\\u0EB3\\u0EBD\\u0EC0-\\u0EC4\\u0EC6"
+   "\\u0EDC-\\u0EDF\\u0F00\\u0F40-\\u0F47\\u0F49-\\u0F6C\\u0F88-\\u0F8C\\u1000"
+   "-\\u102A\\u103F\\u1050-\\u1055\\u105A-\\u105D\\u1061\\u1065\\u1066\\u106E-"
+   "\\u1070\\u1075-\\u1081\\u108E\\u10A0-\\u10C5\\u10C7\\u10CD\\u10D0-\\u10FA"
+   "\\u10FC-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260"
+   "-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE"
+   "\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318"
+   "-\\u135A\\u1380-\\u138F\\u13A0-\\u13F4\\u1401-\\u166C\\u166F-\\u167F"
+   "\\u1681-\\u169A\\u16A0-\\u16EA\\u1700-\\u170C\\u170E-\\u1711\\u1720-"
+   "\\u1731\\u1740-\\u1751\\u1760-\\u176C\\u176E-\\u1770\\u1780-\\u17B3\\u17D7"
+   "\\u17DC\\u1820-\\u1877\\u1880-\\u18A8\\u18AA\\u18B0-\\u18F5\\u1900-\\u191C"
+   "\\u1950-\\u196D\\u1970-\\u1974\\u1980-\\u19AB\\u19C1-\\u19C7\\u1A00-"
+   "\\u1A16\\u1A20-\\u1A54\\u1AA7\\u1B05-\\u1B33\\u1B45-\\u1B4B\\u1B83-\\u1BA0"
+   "\\u1BAE\\u1BAF\\u1BBA-\\u1BE5\\u1C00-\\u1C23\\u1C4D-\\u1C4F\\u1C5A-\\u1C7D"
+   "\\u1CE9-\\u1CEC\\u1CEE-\\u1CF1\\u1CF5\\u1CF6\\u1D00-\\u1DBF\\u1E00-\\u1F15"
+   "\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B"
+   "\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC2-\\u1FC4"
+   "\\u1FC6-\\u1FCC\\u1FD0-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-"
+   "\\u1FF4\\u1FF6-\\u1FFC\\u2071\\u207F\\u2090-\\u209C\\u2102\\u2107\\u210A-"
+   "\\u2113\\u2115\\u2119-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u212D\\u212F-"
+   "\\u2139\\u213C-\\u213F\\u2145-\\u2149\\u214E\\u2183\\u2184\\u2C00-\\u2C2E"
+   "\\u2C30-\\u2C5E\\u2C60-\\u2CE4\\u2CEB-\\u2CEE\\u2CF2\\u2CF3\\u2D00-"
+   "\\u2D25\\u2D27\\u2D2D\\u2D30-\\u2D67\\u2D6F\\u2D80-\\u2D96\\u2DA0-\\u2DA6"
+   "\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-"
+   "\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u2E2F\\u3005\\u3006\\u3031-\\u3035"
+   "\\u303B\\u303C\\u3041-\\u3096\\u309D-\\u309F\\u30A1-\\u30FA\\u30FC-"
+   "\\u30FF\\u3105-\\u312D\\u3131-\\u318E\\u31A0-\\u31BA\\u31F0-\\u31FF"
+   "\\u3400-\\u4DB5\\u4E00-\\u9FCC\\uA000-\\uA48C\\uA4D0-\\uA4FD\\uA500-"
+   "\\uA60C\\uA610-\\uA61F\\uA62A\\uA62B\\uA640-\\uA66E\\uA67F-\\uA697\\uA6A0-"
+   "\\uA6E5\\uA717-\\uA71F\\uA722-\\uA788\\uA78B-\\uA78E\\uA790-\\uA793"
+   "\\uA7A0-\\uA7AA\\uA7F8-\\uA801\\uA803-\\uA805\\uA807-\\uA80A\\uA80C-"
+   "\\uA822\\uA840-\\uA873\\uA882-\\uA8B3\\uA8F2-\\uA8F7\\uA8FB\\uA90A-"
+   "\\uA925\\uA930-\\uA946\\uA960-\\uA97C\\uA984-\\uA9B2\\uA9CF\\uAA00-"
+   "\\uAA28\\uAA40-\\uAA42\\uAA44-\\uAA4B\\uAA60-\\uAA76\\uAA7A\\uAA80-\\uAAAF"
+   "\\uAAB1\\uAAB5\\uAAB6\\uAAB9-\\uAABD\\uAAC0\\uAAC2\\uAADB-\\uAADD\\uAAE0-"
+   "\\uAAEA\\uAAF2-\\uAAF4\\uAB01-\\uAB06\\uAB09-\\uAB0E\\uAB11-\\uAB16"
+   "\\uAB20-\\uAB26\\uAB28-\\uAB2E\\uABC0-\\uABE2\\uAC00-\\uD7A3\\uD7B0-"
+   "\\uD7C6\\uD7CB-\\uD7FB\\uF900-\\uFA6D\\uFA70-\\uFAD9\\uFB00-\\uFB06\\uFB13"
+   "-\\uFB17\\uFB1D\\uFB1F-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40"
+   "\\uFB41\\uFB43\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-"
+   "\\uFDC7\\uFDF0-\\uFDFB\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF21-\\uFF3A\\uFF41"
+   "-\\uFF5A\\uFF66-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7"
+   "\\uFFDA-\\uFFDC"))
diff --git a/test/clout/core_test.cljc b/test/clout/core_test.cljc
@@ -1,9 +1,31 @@
 (ns clout.core-test
-  (:import [clojure.lang ExceptionInfo]
-           [java.util.regex PatternSyntaxException])
-  (:require [clojure.test :refer :all]
-            [ring.mock.request :refer [request]]
-            [clout.core :refer :all]))
+  (:import #?@(:clj [[clojure.lang ExceptionInfo]
+                     [java.util.regex PatternSyntaxException]]
+               :cljs [[goog Uri]]))
+  (:require #?@(:clj [[clojure.test :refer :all]
+                      [ring.mock.request :refer [request]]]
+               :cljs [[cljs.test :refer-macros [is are deftest testing use-fixtures]]])
+            [clout.core :refer [route-matches route-compile]]))
+
+#?(:cljs
+   (defn request
+     "Naive implementation of the Ring Mock Request in ClojureScript."
+     [method uri]
+     (let [uri    (Uri. uri)
+           host   (if-not (empty? (.getDomain uri)) (.getDomain uri) "localhost")
+           port   (.getPort uri)
+           scheme (.getScheme uri)
+           path   (js/encodeURI (.getPath uri))]
+       {:server-port    (or port 80)
+        :server-name    host
+        :remote-addr    "localhost"
+        :uri            (if (clojure.string/blank? path) "/" path)
+        :query-string   (.getQuery uri)
+        :scheme         (if-not (empty? scheme) (keyword scheme) :http)
+        :request-method method
+        :headers        {"host" (if port
+                                  (str host ":" port)
+                                  host)}})))
 
 (deftest fixed-path
   (are [path] (route-matches path (request :get path))
@@ -112,16 +134,19 @@
                                 (assoc :path-info "/bar")))))
 
 (deftest custom-matches
-  (let [route (route-compile "/foo/:bar" {:bar #"\d+"})]
+  (let [route (route-compile "/foo/:bar" {:bar #?(:clj #"\d+" :cljs "\\d+")})]
     (is (not (route-matches route (request :get "/foo/bar"))))
     (is (not (route-matches route (request :get "/foo/1x"))))
     (is (route-matches route (request :get "/foo/10")))))
 
 (deftest unused-regex-keys
-  (is (thrown? AssertionError (route-compile "/:foo" {:foa #"\d+"})))
-  (is (thrown? AssertionError (route-compile "/:foo" {:foo #"\d+" :bar #".*"}))))
+  (is (thrown? #?(:clj AssertionError :cljs js/Error)
+               (route-compile "/:foo" {:foa #"\d+"})))
+  (is (thrown? #?(:clj AssertionError :cljs js/Error)
+               (route-compile "/:foo" {:foo #"\d+" :bar #".*"}))))
 
 (deftest invalid-inline-patterns
   (is (thrown? ExceptionInfo (route-compile "/:foo{")))
   (is (thrown? ExceptionInfo (route-compile "/:foo{\\d{2}")))
-  (is (thrown? PatternSyntaxException (route-compile "/:foo{[a-z}"))))
+  (is (thrown? #?(:clj PatternSyntaxException :cljs js/Error) 
+               (route-compile "/:foo{[a-z}"))))
diff --git a/test/clout/test_runner.cljs b/test/clout/test_runner.cljs
@@ -0,0 +1,5 @@
+(ns clout.test-runner
+  (:require [doo.runner :refer-macros [doo-tests]]
+            [clout.core-test]))
+
+(doo-tests 'clout.core-test)
