Merge pull request #3 from sanuann/convertors

fix and refactor audio, video and image properties

Author: sanuann

reproschema/tests/contexts/generic

@@ -15,14 +15,24 @@
                 "@id": "reproschema:value"
             },
             "image": {
+                "@id": "schema:image"
+            },
+            "imageUrl": {
                 "@id": "schema:image",
-                "@type": "@id"
+                "@type": "xsd:anyURI"
             },
-            "associatedMedia": {
-                "@id": "schema:associatedMedia",
-                "@type": "@id",
-                "@container": "@set"
+            "audio": {
+                "@id": "schema:audio"
+            },
+            "video": {
+                "@id": "schema:video"
+            },
+            "contentUrl": {
+                "@id": "schema:contentUrl",
+                "@type": "xsd:anyURI"
             },
+            "VideoObject": "schema:VideoObject",
+            "AudioObject": "schema:AudioObject",
             "inLanguage": {
                 "@id": "schema:inLanguage"
             },

reproschema/tests/data/activities/activity1.jsonld

@@ -7,6 +7,10 @@
     "schemaVersion": "1.0.0-rc2",
     "version": "0.0.1",
     "citation": "https://www.ncbi.nlm.nih.gov/pmc/articles/PMC1495268/",
+    "image": {
+        "@type": "AudioObject",
+        "contentUrl": "http://example.com/sample-image.png"
+    },
     "preamble": {
         "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?"

reproschema/tests/data/activities/items/item1.jsonld

@@ -4,8 +4,16 @@
     "@id": "item1.jsonld",
     "prefLabel": "item1",
     "description": "Q1 of example 1",
-    "schemaVersion": "1.0.0-rc2",
+    "schemaVersion": "1.0.0-rc1.post",
     "version": "0.0.1",
+    "audio": {
+      "@type": "AudioObject",
+      "contentUrl": "http://media.freesound.org/sample-file.mp4"
+    },
+    "image": {
+        "@type": "ImageObject",
+        "contentUrl": "http://example.com/sample-image.jpg"
+    },
     "question": {
         "en": "Little interest or pleasure in doing things",
         "es": "Poco interés o placer en hacer cosas"
@@ -31,21 +39,21 @@
                 "en": "Several days",
                 "es": "Varios días"
             },
-            "value": 1
+            "value": "a"
         },
         {
             "name": {
                 "en": "More than half the days",
                 "es": "Más de la mitad de los días"
             },
-            "value": 2
+            "value": {"@id": "http://example.com/choice3" }
         },
         {
             "name": {
                 "en": "Nearly everyday",
                 "es": "Casi todos los días"
             },
-            "value": 3
+            "value": {"@value": "choice-with-lang", "@language": "en"}
         }
         ]
     },
@@ -54,7 +62,12 @@
             "source": "redcap",
             "column": "notes",
             "value": "some extra note"
+        },
+        {
+            "source": "redcap",
+            "column": "notes",
+            "value": {"@id": "http://example.com/iri-example"}
         }
     ]
 
-}
+}

reproschema/tests/data/activities/items/item2.jsonld

@@ -10,11 +10,32 @@
         "en": "Current temperature.",
         "es": "Fiebre actual."
     },
+    "video": {
+      "@type": "VideoObject",
+      "contentUrl": "http://media.freesound.org/data/0/previews/719__elmomo__12oclock_girona_preview.mp4"
+    },
+    "imageUrl": "http://example.com/sample-image.jpg",
     "ui": {
         "inputType": "float"
     },
     "responseOptions": {
-        "valueType": "xsd:float"
+        "valueType": "xsd:float",
+        "unitOptions": [
+        {
+            "prefLabel": {
+                "en": "Fahrenheit",
+                "es": "Fahrenheit"
+            },
+            "value": "°F"
+        },
+        {
+            "prefLabel": {
+                "en": "Celsius",
+                "es": "Celsius"
+            },
+            "value": "°C"
+        }
+        ]
     }
 }
 

reproschema/tests/reproschema-shacl.ttl

@@ -24,11 +24,14 @@ reproschema:ActivityShape a sh:NodeShape ;
         [ sh:datatype rdf:langString ;
             sh:path schema:citation ],
 
-        [ sh:nodeKind sh:IRI ;
+        [ sh:or ( [ sh:datatype xsd:anyURI ; sh:pattern "((http|https)://)(www.)?[a-zA-Z0-9@:%._\\+~#?&//=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%._\\+~#?&//=]*)" ] [sh:node reproschema:MediaObjectShape] ) ;
             sh:path schema:image ],
 
-        [ sh:nodeKind sh:IRI ;
-            sh:path schema:associatedMedia ],
+        [ sh:node reproschema:MediaObjectShape ;
+            sh:path schema:audio ],
+
+        [ sh:node reproschema:MediaObjectShape ;
+            sh:path schema:video ],
 
         [ sh:nodeKind sh:IRI ;
             sh:path schema:about ],
@@ -98,12 +101,14 @@ reproschema:FieldShape a sh:NodeShape ;
         [ sh:datatype rdf:langString ;
             sh:path reproschema:preamble ],
 
-        [ sh:nodeKind sh:IRI ;
-            sh:maxCount 1 ;
+        [ sh:or ( [ sh:datatype xsd:anyURI ; sh:pattern "((http|https)://)(www.)?[a-zA-Z0-9@:%._\\+~#?&//=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%._\\+~#?&//=]*)" ] [sh:node reproschema:MediaObjectShape] ) ;
             sh:path schema:image ],
 
-        [ sh:nodeKind sh:IRI ;
-            sh:path schema:associatedMedia ],
+        [ sh:node reproschema:MediaObjectShape ;
+            sh:path schema:audio ],
+
+        [ sh:node reproschema:MediaObjectShape ;
+            sh:path schema:video ],
 
         [ sh:datatype xsd:string ;
             sh:maxCount 1 ;
@@ -144,8 +149,14 @@ reproschema:ProtocolShape a sh:NodeShape ;
             sh:maxCount 1 ;
             sh:path schema:about ],
 
-        [ sh:nodeKind sh:IRI ;
-            sh:path schema:associatedMedia ],
+        [ sh:or ( [ sh:datatype xsd:anyURI ; sh:pattern "((http|https)://)(www.)?[a-zA-Z0-9@:%._\\+~#?&//=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%._\\+~#?&//=]*)" ] [sh:node reproschema:MediaObjectShape] ) ;
+            sh:path schema:image ],
+
+        [ sh:node reproschema:MediaObjectShape ;
+            sh:path schema:audio ],
+
+        [ sh:node reproschema:MediaObjectShape ;
+            sh:path schema:video ],
 
         [ sh:nodeKind sh:IRI ;
             sh:path reproschema:landingPage ],
@@ -315,7 +326,7 @@ reproschema:OverridePropertiesShape a sh:NodeShape ;
 reproschema:ChoicesShape a sh:NodeShape ;
     sh:closed true ;
     sh:ignoredProperties ( rdf:type ) ;
-    sh:property [ sh:nodeKind sh:IRI ;
+    sh:property [ sh:or ( [ sh:datatype xsd:anyURI ; sh:pattern "((http|https)://)(www.)?[a-zA-Z0-9@:%._\\+~#?&//=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%._\\+~#?&//=]*)" ] [sh:node reproschema:MediaObjectShape] ) ;
             sh:path schema:image ],
 
         [ sh:datatype rdf:langString ;
@@ -331,7 +342,7 @@ reproschema:UnitOptionsShape a sh:NodeShape ;
     sh:property [ sh:datatype rdf:langString ;
             sh:path skos:prefLabel ],
 
-        [ sh:or ( [ sh:datatype xsd:integer ] [ sh:nodeKind sh:IRI ] [ sh:datatype schema:Boolean ] [ sh:datatype schema:StructuredValue ] [ sh:datatype rdf:langString ]) ;
+        [ sh:or ( [ sh:nodeKind sh:IRI ] [ sh:datatype rdf:langString ]) ;
             sh:path reproschema:value ] ;
     sh:targetClass reproschema:UnitOption .
 
@@ -439,3 +450,11 @@ prov:SoftwareAgentShape a sh:NodeShape ;
         [ sh:nodeKind sh:IRI ;
             sh:path schema:url ] ;
     sh:targetClass reproschema:SoftwareAgent .
+
+reproschema:MediaObjectShape a sh:NodeShape ;
+    sh:closed true;
+    sh:ignoredProperties ( rdf:type ) ;
+    sh:property [ sh:datatype xsd:anyURI ;
+            sh:minCount 1 ;
+            sh:pattern "((http|https)://)(www.)?[a-zA-Z0-9@:%._\\+~#?&//=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%._\\+~#?&//=]*)" ;
+            sh:path schema:contentUrl ] .