Allow 2.0.x versions

Author: milt

src/xapi_schema/spec/regex.cljc

@@ -1,7 +1,7 @@
 (ns xapi-schema.spec.regex
   (:require [clojure.string :refer [join]]))
 
-(def LanguageTagRegEx ; RFC 5646, w/ lang subtag limitation 
+(def LanguageTagRegEx ; RFC 5646, w/ lang subtag limitation
   (let [;; Language Subtags
         ;; Note: we exclude 4-8 char subtags, even though they are allowed in
         ;; the RFC spec, since they are reserved for future (not current) use.
@@ -148,7 +148,7 @@
 (def xAPIVersionRegEx
   (let [suf-part "[0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*"
         suffix   (str "(\\.[0-9]+(?:-" suf-part ")?(?:\\+" suf-part ")?)?")
-        ver-str  (str "^1\\.0" suffix "$")]
+        ver-str  (str "^[1-2]\\.0" suffix "$")]
     (re-pattern ver-str)))
 
 (def Base64RegEx

test/xapi_schema/spec/regex_test.cljc

@@ -148,7 +148,12 @@
              (re-matches xAPIVersionRegEx "1.0.2")
              (re-matches xAPIVersionRegEx "1.0")
              (re-matches xAPIVersionRegEx "1.0.32-abc.def+ghi.jkl")))
-    (is (not (re-matches xAPIVersionRegEx "0.9.5")))))
+    (is (not (re-matches xAPIVersionRegEx "0.9.5"))))
+  (testing "matches xAPI 2.0.x versions"
+    (is (and (re-matches xAPIVersionRegEx "2.0.0")
+             (re-matches xAPIVersionRegEx "2.0.2")
+             (re-matches xAPIVersionRegEx "2.0")
+             (re-matches xAPIVersionRegEx "2.0.32-abc.def+ghi.jkl")))))
 
 (deftest duration-regex-test
   (testing "matches ISO durations"