Merge pull request #6 from satra/enh-match-1.0.0-rc1

enh: update to 1.0.0-rc1
ReproNim · Jul 26, 2020 · 2db71da · 2db71da
2 parents e224cc7 + 9650a79
commit 2db71da
Show file tree

Hide file tree

Showing 11 changed files with 182 additions and 123 deletions.
diff --git a/reproschema/tests/contexts/base b/reproschema/tests/contexts/base
@@ -12,6 +12,7 @@
         "prov": "http://www.w3.org/ns/prov#",
         "pav": "http://purl.org/pav/",
         "nidm": "http://purl.org/nidash/nidm#",
+        "uuid": "http://uuid.repronim.org/",
         "reproschema": "http://schema.repronim.org/"
     }
 }
diff --git a/reproschema/tests/contexts/generic b/reproschema/tests/contexts/generic
@@ -20,6 +20,13 @@
                 "@id": "schema:image",
                 "@type": "@id"
             },
+            "inLanguage": {
+                "@id": "schema:inLanguage"
+            },
+            "url": {
+                "@id": "schema:url",
+                "@type": "@id"
+            },
             "citation": {
                 "@id": "schema:citation",
                 "@container": "@language"
@@ -209,6 +216,32 @@
             "derivedFrom": {
                 "@id": "prov:wasDerivedFrom",
                 "@type": "@id"
+            },
+            "used": {
+                "@id": "prov:used",
+                "@container": "@set",
+                "@type": "@id"
+            },
+            "wasAttributedTo": {
+                "@id": "prov:wasAttributedTo",
+                "@type": "reproschema:Participant",
+                "@container": "@set"
+            },
+            "wasAssociatedWith": {
+                "@id": "prov:wasAssociatedWith",
+                "@type": "reproschema:SoftwareAgent",
+                "@container": "@set"
+            },
+            "subject_id": {
+                "@id": "nidm:subject_id"
+            },
+            "startedAtTime": {
+                "@id": "prov:startedAtTime",
+                "@type": "xsd:dateTime"
+            },
+            "endedAtTime": {
+                "@id": "prov:endedAtTime",
+                "@type": "xsd:dateTime"
             }
         }
     ]

diff --git a/reproschema/tests/data/activities/activity1.jsonld b/reproschema/tests/data/activities/activity1.jsonld
@@ -4,7 +4,7 @@
     "@id": "activity1.jsonld",
     "prefLabel": "Example 1",
     "description": "Activity example 1",
-    "schemaVersion": "0.0.1",
+    "schemaVersion": "1.0.0-rc1.post",
     "version": "0.0.1",
     "citation": "https://www.ncbi.nlm.nih.gov/pmc/articles/PMC1495268/",
     "preamble": {
@@ -23,9 +23,9 @@
                 "variableName": "item1",
                 "requiredValue": true,
                 "isVis": true,
-                "randomMaxDelay": "2:0:0",
-                "limit": "2-0",
-                "schedule": "0 8 * * *"
+                "randomMaxDelay": "PT2H",
+                "limit": "P2D",
+                "schedule": "R/2020-08-01T08:00:00Z/P1D"
             }
         ],
         "order": [

diff --git a/reproschema/tests/data/activities/activity1_embed.jsonld b/reproschema/tests/data/activities/activity1_embed.jsonld
@@ -4,7 +4,7 @@
     "@id": "activity1.jsonld",
     "prefLabel": "Example 1",
     "description": "Activity example 1",
-    "schemaVersion": "0.0.1",
+    "schemaVersion": "1.0.0-rc1.post",
     "version": "0.0.1",
     "citation": "https://www.ncbi.nlm.nih.gov/pmc/articles/PMC1495268/",
     "preamble": {
@@ -24,7 +24,7 @@
                 "@id": "items/item1.jsonld",
                 "prefLabel": "item1",
                 "description": "Q1 of example 1",
-                "schemaVersion": "0.0.1",
+                "schemaVersion": "1.0.0-rc1.post",
                 "version": "0.0.1",
                 "question": {
                     "en": "Little interest or pleasure in doing things",

diff --git a/reproschema/tests/data/activities/items/item1.jsonld b/reproschema/tests/data/activities/items/item1.jsonld
@@ -4,7 +4,7 @@
     "@id": "item1.jsonld",
     "prefLabel": "item1",
     "description": "Q1 of example 1",
-    "schemaVersion": "0.0.1",
+    "schemaVersion": "1.0.0-rc1.post",
     "version": "0.0.1",
     "question": {
         "en": "Little interest or pleasure in doing things",

diff --git a/reproschema/tests/data/protocols/protocol1.jsonld b/reproschema/tests/data/protocols/protocol1.jsonld
@@ -1,13 +1,13 @@
 {
-	"@context": "../../contexts/generic",
+    "@context": "../../contexts/generic",
 	"@type": "reproschema:Protocol",
 	"@id": "protocol1.jsonld",
 	"prefLabel": {
 		"en": "Protocol1",
 		"es": "Protocol1_es"
 	},
 	"description": "example Protocol",
-	"schemaVersion": "0.0.1",
+	"schemaVersion": "1.0.0-rc1.post",
 	"version": "0.0.1",
 	"ui": {
 		"addProperties": [
@@ -18,7 +18,10 @@
 					"en": "Screening",
 					"es": "Screening_es"
 				},
-				"isVis": true
+				"isVis": true,
+				"schedule": "R5/2008-01-01T13:00:00Z/P1Y2M10DT2H30M",
+				"randomMaxDelay": "PT12H",
+				"limit": "P1W/2020-08-01T13:00:00Z"
 			}
 		],
 		"order": [

diff --git a/reproschema/tests/data/protocols/protocol1_embed.jsonld b/reproschema/tests/data/protocols/protocol1_embed.jsonld
@@ -1,13 +1,13 @@
 {
-	"@context": "../../contexts/generic",
+    "@context": "../../contexts/generic",
 	"@type": "reproschema:Protocol",
 	"@id": "protocol1.jsonld",
 	"prefLabel": {
 		"en": "Protocol1",
 		"es": "Protocol1_es"
 	},
 	"description": "example Protocol",
-	"schemaVersion": "0.0.1",
+	"schemaVersion": "1.0.0-rc1.post",
 	"version": "0.0.1",
 	"ui": {
 		"addProperties": [
@@ -27,7 +27,7 @@
 				"@id": "../activities/activity1.jsonld",
 				"prefLabel": "Example 1",
 				"description": "Activity example 1",
-				"schemaVersion": "0.0.1",
+				"schemaVersion": "1.0.0-rc1.post",
 				"version": "0.0.1",
 				"citation": "https://www.ncbi.nlm.nih.gov/pmc/articles/PMC1495268/",
 				"preamble": {

diff --git a/reproschema/tests/data/responses/response1.jsonld b/reproschema/tests/data/responses/response1.jsonld
@@ -0,0 +1,11 @@
+{
+    "@context": "../../contexts/generic",
+    "@type": "reproschema:Response",
+    "@id": "uuid:fc963765-1f1b-4ad9-bc4b-0d21b9de5acb",
+    "wasAttributedTo": {
+		"@id": "uuid:2b0aab3d-495f-4eee-98a5-4284b3268a56",
+		"subject_id": "6aabb03d-9e5f-ae5e-c4a5-21b9b326868a"
+    },
+    "isAbout": "../activities/items/item1.jsonld",
+    "value": 1
+}
diff --git a/reproschema/tests/data/responses/responseActivity1.jsonld b/reproschema/tests/data/responses/responseActivity1.jsonld
@@ -0,0 +1,19 @@
+{
+    "@context": "../../contexts/generic",
+    "@type": "reproschema:ResponseActivity",
+    "@id": "uuid:96496a96-50d6-4b87-a65e-468420e7c80d",
+    "used": [
+        "../activities/items/item1.jsonld",
+        "../activities/activity1.jsonld",
+        "../protocols/protocol1.jsonld"
+    ],
+    "inLanguage": "en",
+    "startedAtTime": "2020-07-23T22:15:37.675Z",
+    "endedAtTime": "2020-07-23T22:15:50.293Z",
+	"wasAssociatedWith": {
+		"version": "0.0.1",
+		"url": "https://schema.repronim.org/ui/#/",
+		"@id": "https://github.com/ReproNim/reproschema-ui"
+	},
+    "prov:generated": "uuid:85d18360-1787-4d3d-b72e-b543ca9b4b1a"
+}