Merge pull request #15 from satra/fix/rc4

satra · web-flow · commit caaf5bead682 · 2021-03-21T17:31:41.000-04:00
match with schema 1.0.0-rc4 examples
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-18.04]
-        python-version: [3.7, 3.8]
+        python-version: [3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/reproschema/models/protocol.py b/reproschema/models/protocol.py
@@ -18,7 +18,7 @@ def __init__(self, version=None):
         }
 
     def set_landing_page(self, landing_page_url, lang="en"):
-        self.schema["landingPage"] = {"@id": landing_page_url, "@language": lang}
+        self.schema["landingPage"] = {"@id": landing_page_url, "inLanguage": lang}
 
     # TODO
     # def add_landing_page(self, landing_page_url, lang="en"):
diff --git a/reproschema/tests/contexts/generic b/reproschema/tests/contexts/generic
@@ -19,7 +19,7 @@
             },
             "imageUrl": {
                 "@id": "schema:image",
-                "@type": "xsd:anyURI"
+                "@type": "@id"
             },
             "audio": {
                 "@id": "schema:audio"
@@ -29,7 +29,7 @@
             },
             "contentUrl": {
                 "@id": "schema:contentUrl",
-                "@type": "xsd:anyURI"
+                "@type": "@id"
             },
             "VideoObject": "schema:VideoObject",
             "AudioObject": "schema:AudioObject",
@@ -45,12 +45,10 @@
                 "@container": "@language"
             },
             "version": {
-                "@id": "schema:version",
-                "@container": "@language"
+                "@id": "schema:version"
             },
             "schemaVersion": {
-                "@id": "schema:schemaVersion",
-                "@container": "@language"
+                "@id": "schema:schemaVersion"
             },
             "prefLabel": {
                 "@id": "skos:prefLabel",
@@ -71,6 +69,7 @@
             },
             "landingPage": {
                 "@id": "reproschema:landingPage",
+                "@type": "@id",
                 "@container": "@set"
             },
             "question": {
@@ -152,11 +151,11 @@
             },
             "compute": {
                 "@id": "reproschema:compute",
-                "@container": "@index"
+                "@container": "@set"
             },
             "messages": {
                 "@id": "reproschema:messages",
-                "@container": "@index"
+                "@container": "@set"
             },
             "jsExpression": {
                 "@id": "reproschema:jsExpression"
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": "1.0.0-rc2",
+    "schemaVersion": "1.0.0-rc4",
     "version": "0.0.1",
     "citation": "https://www.ncbi.nlm.nih.gov/pmc/articles/PMC1495268/",
     "image": {
@@ -15,18 +15,18 @@
         "en": "Over the last 2 weeks, how often have you been bothered by any of the following problems?",
         "es": "Durante las últimas 2 semanas, ¿con qué frecuencia le han molestado los siguintes problemas?"
     },
-    "messages": [
-      {
-        "message": "Test message: Triggered when item1 value is greater than 1",
-        "jsExpression": "item1 > 1"
-      }
-    ],
     "compute": [
         {
             "variableName": "activity1_total_score",
             "jsExpression": "item1 + item2"
         }
     ],
+    "messages": [
+		{
+			"message": "Test message: Triggered when item1 value is greater than 1",
+			"jsExpression": "item1 > 1"
+		}
+	],
     "ui": {
         "addProperties": [
             {   "isAbout": "items/item1.jsonld",
@@ -42,6 +42,11 @@
                 "requiredValue": true,
                 "isVis": true,
                 "allow": ["reproschema:Skipped"]
+            },
+            {   "isAbout": "items/activity1_total_score",
+                "variableName": "activity1_total_score",
+                "requiredValue": true,
+                "isVis": false
             }
         ],
         "order": [
@@ -51,4 +56,4 @@
         ],
         "shuffle": false
     }
-}
+}
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": "1.0.0-rc2",
+    "schemaVersion": "1.0.0-rc4",
     "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": "1.0.0-rc2",
+                "schemaVersion": "1.0.0-rc4",
                 "version": "0.0.1",
                 "question": {
                     "en": "Little interest or pleasure in doing things",
diff --git a/reproschema/tests/data/activities/items/activity1_total_score b/reproschema/tests/data/activities/items/activity1_total_score
@@ -4,7 +4,7 @@
     "@id": "activity1_total_score",
     "prefLabel": "activity1_total_score",
     "description": "Score item for Activity 1",
-    "schemaVersion": "1.0.0-rc2",
+    "schemaVersion": "1.0.0-rc4",
     "version": "0.0.1",
     "ui": {
         "inputType": "number",
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": "1.0.0-rc1.post",
+    "schemaVersion": "1.0.0-rc4",
     "version": "0.0.1",
     "audio": {
       "@type": "AudioObject",
diff --git a/reproschema/tests/data/activities/items/item2.jsonld b/reproschema/tests/data/activities/items/item2.jsonld
@@ -4,7 +4,7 @@
     "@id": "item2.jsonld",
     "prefLabel": "item2",
     "description": "Q2 of example 1",
-    "schemaVersion": "0.0.1",
+    "schemaVersion": "1.0.0-rc4",
     "version": "0.0.1",
     "question": {
         "en": "Current temperature.",
@@ -38,6 +38,3 @@
         ]
     }
 }
-
-
-
diff --git a/reproschema/tests/data/protocols/protocol1.jsonld b/reproschema/tests/data/protocols/protocol1.jsonld
@@ -7,8 +7,10 @@
 		"es": "Protocol1_es"
 	},
 	"description": "example Protocol",
-	"schemaVersion": "1.0.0-rc2",
+	"schemaVersion": "1.0.0-rc4",
 	"version": "0.0.1",
+	"landingPage": {"@id": "http://example.com/sample-readme.md",
+		"inLanguage": "en"},
 	"messages": [
 		{
 			"message": "Test message: Triggered when item1 value is greater than 0",
diff --git a/reproschema/tests/data/protocols/protocol1_embed.jsonld b/reproschema/tests/data/protocols/protocol1_embed.jsonld
@@ -7,7 +7,7 @@
 		"es": "Protocol1_es"
 	},
 	"description": "example Protocol",
-	"schemaVersion": "1.0.0-rc2",
+	"schemaVersion": "1.0.0-rc4",
 	"version": "0.0.1",
 	"ui": {
 		"addProperties": [
@@ -27,7 +27,7 @@
 				"@id": "../activities/activity1.jsonld",
 				"prefLabel": "Example 1",
 				"description": "Activity example 1",
-				"schemaVersion": "1.0.0-rc2",
+				"schemaVersion": "1.0.0-rc4",
 				"version": "0.0.1",
 				"citation": "https://www.ncbi.nlm.nih.gov/pmc/articles/PMC1495268/",
 				"preamble": {
@@ -49,7 +49,7 @@
 							"@id": "../activities/items/item1.jsonld",
 							"prefLabel": "item1",
 							"description": "Q1 of example 1",
-							"schemaVersion": "1.0.0-rc2",
+							"schemaVersion": "1.0.0-rc4",
 							"version": "0.0.1",
 							"question": {
 								"en": "Little interest or pleasure in doing things",
diff --git a/reproschema/tests/reproschema-shacl.ttl b/reproschema/tests/reproschema-shacl.ttl
diff --git a/setup.cfg b/setup.cfg

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ def __init__(self, version=None):`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`def set_landing_page(self, landing_page_url, lang="en"):`
`21`		`- self.schema["landingPage"] = {"@id": landing_page_url, "@language": lang}`
	`21`	`+ self.schema["landingPage"] = {"@id": landing_page_url, "inLanguage": lang}`
`22`	`22`
`23`	`23`	`# TODO`
`24`	`24`	`# def add_landing_page(self, landing_page_url, lang="en"):`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"@id": "item2.jsonld",`
`5`	`5`	`"prefLabel": "item2",`
`6`	`6`	`"description": "Q2 of example 1",`
`7`		`- "schemaVersion": "0.0.1",`
	`7`	`+ "schemaVersion": "1.0.0-rc4",`
`8`	`8`	`"version": "0.0.1",`
`9`	`9`	`"question": {`
`10`	`10`	`"en": "Current temperature.",`
`@@ -38,6 +38,3 @@`
`38`	`38`	`]`
`39`	`39`	`}`
`40`	`40`	`}`
`41`		`-`
`42`		`-`
`43`		`-`