Merge branch 'master' into 6_mailto_percent_signs

Author: milt

README.org

@@ -133,10 +133,10 @@ If you want to use validations from JavaScript, first build the js:
 =target/js/xapi_schema.js= and invoke:
 
 #+BEGIN_SRC javascript
-var statement-str = '{"id":"fd41c918-b88b-4b20-a0a5-a4c32391aaa0", "actor":{"objectType": "Agent","name":"Project Tin Can API","mbox":"mailto:user@example.com"},"verb":{"id":"http://example.com/xapi/verbs#sent-a-statement","display":{ "en-US":"sent" }},"object":{"id":"http://example.com/xapi/activity/simplestatement","definition":{"name":{ "en-US":"simple statement" },"description":{ "en-US":"A simple Experience API statement. Note that the LRS does not need to have any prior information about the Actor (learner), the verb, or the Activity/object." }}}}';
-var statement-json = JSON.parse(s);
-xapi_schema.core.validate_statement_data_js(statement-str); // => statement JSON
-xapi_schema.core.validate_statement_data_js(statement-json); // => statement JSON
+var statement_str = '{"id":"fd41c918-b88b-4b20-a0a5-a4c32391aaa0", "actor":{"objectType": "Agent","name":"Project Tin Can API","mbox":"mailto:user@example.com"},"verb":{"id":"http://example.com/xapi/verbs#sent-a-statement","display":{ "en-US":"sent" }},"object":{"id":"http://example.com/xapi/activity/simplestatement","definition":{"name":{ "en-US":"simple statement" },"description":{ "en-US":"A simple Experience API statement. Note that the LRS does not need to have any prior information about the Actor (learner), the verb, or the Activity/object." }}}}';
+var statement_json = JSON.parse(s);
+xapi_schema.core.validate_statement_data_js(statement_str); // => statement JSON
+xapi_schema.core.validate_statement_data_js(statement_json); // => statement JSON
 #+END_SRC
 
 ** Testing

spec/cljx/xapi_schema/schemata/json_spec.cljx

@@ -124,8 +124,11 @@
  (it "is a valid ISO 8601 DateTime"
      (should-satisfy+ Timestamp
                       "2014-09-10T14:12:05Z"
+                      "2015-06-30T23:59:60Z" ;; leap second
                       :bad
-                      "09-10-2014T14:12:00+500")))
+                      "09-10-2014T14:12:00+500"
+                      "2014-09-12T03:47:40" ;; no time zone
+                      )))
 (describe
  "Duration"
  (it "is a valid ISO 8601 Duration"
@@ -142,8 +145,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

@@ -22,10 +22,11 @@
   #"[0-9A-Za-z]{8}-[0-9A-Za-z]{4}-4[0-9A-Za-z]{3}-[89ABab][0-9A-Za-z]{3}-[0-9A-Za-z]{12}")
 
 (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)?)?)?)?$")
+  #"^([\+-]?\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)?)?$")