Merge pull request #14 from yetanalytics/5_duration_regex

5 duration regex

Author: canweriotnow

spec/cljx/xapi_schema/schemata/json_spec.cljx

@@ -134,8 +134,13 @@
  (it "is a valid ISO 8601 Duration"
      (should-satisfy+ Duration
                       "P3Y6M4DT12H30M5S"
+                      "P3Y6M4DT12H30M5.2S" ;; good fractional
                       :bad
-                      "2 hours")))
+                      "2 hours"
+                      "P"
+                      "PT"
+                      "P3Y6M4DT12H30.1M5S" ;; bad fractional
+                      )))
 
 (describe
  "Version"

src/cljx/xapi_schema/schemata/regex.cljx

@@ -29,7 +29,7 @@
   #"^((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)?)?$")
+  #"P(?:(?:(?:\d+D|\d+\.\d+D$)|(?:\d+M|\d+\.\d+M$)(?:\d+D|\d+\.\d+D$)?|(?:\d+Y|\d+\.\d+Y$)(:?(?:\d+M|\d+\.\d+M$)(?:\d+D|\d+\.\d+D$)?)?)(:?T(?:(?:\d+H|\d+\.\d+H$)(?:(?:\d+M|\d+\.\d+M$)(?:\d+S|\d+\.\d+S$)?)?|(?:\d+M|\d+\.\d+M$)(?:\d+S|\d+\.\d+S$)?|(?:\d+S|\d+\.\d+S$)))?|T(?:(?:\d+H|\d+\.\d+H$)(?:(?:\d+M|\d+\.\d+M$)(?:\d+S|\d+\.\d+S$)?)?|(?:\d+M|\d+\.\d+M$)(?:\d+S|\d+\.\d+S$)?|(?:\d+S|\d+\.\d+S$))|(?:\d+W|\d+\.\d+W$))")
 
 (def Base64RegEx
   #"^(?:[A-Za-z0-9\+\/]{4})*(?:[A-Za-z0-9\+\/]{2}==|[A-Za-z0-9\+\/]{3}=|[A-Za-z0-9\+\/]{4})$")