Merge pull request #11 from yetanalytics/8_tagged_versions

improved xAPI version regex

Author: canweriotnow

spec/cljx/xapi_schema/schemata/json_spec.cljx

@@ -144,8 +144,20 @@
                       "1.0.1"
                       "1.0.2"
                       "1.0.3"
+                      "1.0.3-rc1"
+                      "1.0.0-alpha"
+                      "1.0.0-alpha.1"
+                      "1.0.0-0.3.7"
+                      "1.0.0-x.7.z.92"
                       :bad
                       "0.9.5"
+                      "1.0." ;; bad semver
+                      "1.0.0-.123"
+                      "1.0.0-..."
+                      "1.0.0-123."
+                      "1.0.0-+"
+                      "1.0.0-+123"
+                      "1.0.0-"
                       "what's going on?")))
 
 (describe

src/cljx/xapi_schema/schemata/regex.cljx

@@ -24,8 +24,9 @@
 (def TimestampRegEx
   #"^([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)|T23:59:60Z)?)?$")
 
+;; Based on http://www.regexr.com/39s32
 (def xAPIVersionRegEx
-  #"^1\.0\.(\d+)?$")
+  #"^((1\.0\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)$")
 
 (def DurationRegEx
   #"^P((\d+([\.,]\d+)?Y)?(\d+([\.,]\d+)?M)?(\d+([\.,]\d+)?W)?(\d+([\.,]\d+)?D)?)?(T(\d+([\.,]\d+)?H)?(\d+([\.,]\d+)?M)?(\d+([\.,]\d+)?S)?)?$")