Skip to content

Commit

Permalink
Merge pull request #4 from satra/enh-update
Browse files Browse the repository at this point in the history 
update to latest shape
  • Loading branch information
@satra
satra authored Jul 3, 2020
2 parents 44cf2e2 + 61090a6 commit 137139f
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 85 deletions.
21 changes: 14 additions & 7 deletions reproschema/tests/contexts/generic
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@
"@container": "@language"
},
"value": {
"@id": "schema:value",
"@id": "reproschema:value",
"@type": "@id",
"@container": "@language"
},
"image": {
"@id": "schema:image",
"@type": "@vocab"
"@type": "@id"
},
"citation": {
"@id": "schema:citation",
Expand Down Expand Up @@ -45,7 +46,8 @@
},
"valueType": {
"@id": "reproschema:valueType",
"@type": "@vocab"
"@type": "@id",
"@container": "@set"
},
"landingPage": {
"@id": "reproschema:landingPage",
Expand All @@ -56,16 +58,17 @@
"@container": "@language"
},
"choices": {
"@id": "schema:itemListElement"
"@id": "reproschema:choices"
},
"valueRequired": "https://schema.org/valueRequired",
"valueRequired": "schema:valueRequired",
"multipleChoice": {
"@id": "reproschema:multipleChoice",
"@type": "schema:Boolean"
},
"responseOptions": {
"@id": "reproschema:responseOptions",
"@type": "@vocab"
"@container": "@set",
"@type": "@id"
},
"dataType": {
"@id": "schema:DataType",
Expand All @@ -77,6 +80,10 @@
"maxValue": {
"@id": "schema:maxValue"
},
"unitCode": {
"@id": "schema:unitCode",
"@container": "@set"
},
"ui" : "@nest",
"order": {
"@id": "reproschema:order",
Expand Down Expand Up @@ -106,7 +113,7 @@
"@nest": "ui"
},
"readonlyValue": {
"@id": "https://schema.org/readonlyValue",
"@id": "schema:readonlyValue",
"@nest": "ui"
},
"scoringLogic": {
Expand Down
157 changes: 79 additions & 78 deletions reproschema/tests/reproschema-shacl.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,47 @@ reproschema:ActivityShape a sh:NodeShape ;
sh:ignoredProperties ( rdf:type ) ;
sh:property [ sh:datatype rdf:langString ;
sh:path schema:description ],

[ sh:datatype rdf:langString ;
sh:path schema:schemaVersion ],

[ sh:datatype rdf:langString ;
sh:path schema:version ],

[ sh:datatype rdf:langString ;
sh:path schema:citation ],

[ sh:nodeKind sh:IRI ;
sh:path schema:image ],

[ sh:datatype rdf:langString ;
sh:minCount 1 ;
sh:path skos:prefLabel ],

[ sh:datatype rdf:langString ;
sh:path reproschema:preamble ],

[ sh:node reproschema:ScoringShape ;
sh:path reproschema:scoringLogic ],

[ sh:maxCount 1 ;
sh:node dash:ListShape ;
sh:path reproschema:order ;
sh:property [ sh:minCount 1 ;
sh:nodeKind sh:IRI ;
sh:path ( [ sh:zeroOrMorePath rdf:rest ] rdf:first ) ] ],

[ sh:node reproschema:AddPropertiesShape ;
sh:path reproschema:addProperties ],

[ sh:datatype xsd:string ;
sh:path reproschema:inputType ],

[ sh:datatype schema:Boolean ;
sh:path reproschema:shuffle ],

[ sh:nodeKind sh:IRI ;
sh:in ( reproschema:AllowExport reproschema:DisableBack reproschema:AutoAdvance reproschema:AllowReplay reproschema:Skipped reproschema:DontKnow reproschema:TimedOut ) ;
sh:path reproschema:allow ] ;
sh:targetClass reproschema:Activity .

Expand All @@ -46,191 +61,177 @@ reproschema:FieldShape a sh:NodeShape ;
sh:property [ sh:datatype rdf:langString ;
sh:minCount 1 ;
sh:path skos:prefLabel ],

[ sh:datatype rdf:langString ;
sh:maxCount 1 ;
sh:path skos:altLabel ],

[ sh:datatype rdf:langString ;
sh:maxCount 1 ;
sh:path schema:description ],

[ sh:datatype rdf:langString ;
sh:maxCount 1 ;
sh:path schema:schemaVersion ],

[ sh:datatype rdf:langString ;
sh:maxCount 1 ;
sh:path schema:version ],

[ sh:datatype rdf:langString ;
sh:path schema:question ],
[ sh:datatype rdf:langString ;

[ sh:nodeKind sh:IRI ;
sh:maxCount 1 ;
sh:path schema:image ],

[ sh:datatype rdf:langString ;
sh:path reproschema:preamble ],

[ sh:datatype xsd:string ;
sh:maxCount 1 ;
sh:minCount 1 ;
sh:path reproschema:inputType ],

[ sh:datatype xsd:boolean ;
sh:maxCount 1 ;
sh:path reproschema:readOnly ],
[ sh:node reproschema:ResponseOptionsShape ;
sh:path schema:readonlyValue ],

[ sh:or ( [ sh:nodeKind sh:IRI ] [ sh:node reproschema:ResponseOptionsShape ] ) ;
sh:path reproschema:responseOptions ] ;
sh:targetClass reproschema:Field .

reproschema:ProtocolShape a sh:NodeShape ;
sh:closed true ;
sh:ignoredProperties ( rdf:type ) ;
sh:property [ sh:datatype rdf:langString ;
sh:maxCount 1 ;
sh:path schema:description ],

[ sh:datatype rdf:langString ;
sh:maxCount 1 ;
sh:path schema:schemaVersion ],

[ sh:datatype rdf:langString ;
sh:maxCount 1 ;
sh:path schema:version ],
[ sh:datatype rdf:langString ;

[ sh:nodeKind sh:IRI ;
sh:maxCount 1 ;
sh:path schema:image ],
[ sh:datatype rdf:langString ;
sh:maxCount 1 ;

[ sh:nodeKind sh:IRI ;
sh:path reproschema:landingPage ],

[ sh:datatype rdf:langString ;
sh:minCount 1 ;
sh:path skos:prefLabel ],

[ sh:datatype rdf:langString ;
sh:maxCount 1 ;
sh:path reproschema:preamble ],
[ sh:maxCount 1 ;
sh:node reproschema:ScoringShape ;

[ sh:node reproschema:ScoringShape ;
sh:path reproschema:scoringLogic ],

[ sh:minCount 1 ;
sh:node dash:ListShape ;
sh:path reproschema:order ;
sh:property [ sh:minCount 1 ;
sh:nodeKind sh:IRI ;
sh:path ( [ sh:zeroOrMorePath rdf:rest ] rdf:first ) ] ],

[ sh:node reproschema:AddPropertiesShape ;
sh:path reproschema:addProperties ],

[ sh:datatype schema:Boolean ;
sh:path reproschema:shuffle ],

[ sh:nodeKind sh:IRI ;
sh:in ( reproschema:AllowExport reproschema:DisableBack reproschema:AutoAdvance reproschema:AllowReplay reproschema:Skipped reproschema:DontKnow reproschema:TimedOut ) ;
sh:path reproschema:allow ] ;
sh:targetClass reproschema:Protocol .

reproschema:ResponseOptionsShape a sh:NodeShape ;
sh:closed true ;
sh:ignoredProperties ( rdf:type ),
( rdf:type ) ;
sh:ignoredProperties ( rdf:type ) ;
sh:property [ sh:datatype schema:Boolean ;
sh:maxCount 1 ;
sh:path reproschema:multipleChoice ],
[ sh:datatype xsd:integer ;
sh:path schema:minValue ],
[ sh:datatype xsd:integer ;
sh:path schema:maxValue ],

[ sh:nodeKind sh:IRI ;
sh:path reproschema:valueType ],
[ sh:node reproschema:ChoicesShape ;
sh:path schema:itemListElement ],
[ sh:minCount 1 ;
sh:nodeKind sh:IRI ;
sh:path reproschema:valueType ],

[ sh:datatype xsd:integer ;
sh:maxCount 1 ;
sh:path schema:minValue ],

[ sh:datatype xsd:integer ;
sh:maxCount 1 ;
sh:path schema:maxValue ],
[ sh:datatype schema:Boolean ;
sh:maxCount 1 ;
sh:path reproschema:multipleChoice ],

[ sh:datatype xsd:string ;
sh:maxCount 1 ;
sh:path reproschema:datumType ],
[ sh:maxCount 1 ;
sh:or ( [ sh:datatype schema:URL ] [ sh:datatype rdf:langString ] ) ;

[ sh:or ( [ sh:datatype schema:URL ] [ sh:datatype rdf:langString ] ) ;
sh:path schema:unitCode ],

[ sh:node reproschema:ChoicesShape ;
sh:path schema:itemListElement ] ;
sh:path reproschema:choices ] ;
sh:targetClass reproschema:ResponseOptions .

reproschema:AddPropertiesShape a sh:NodeShape ;
sh:closed true ;
sh:ignoredProperties ( rdf:type ),
( rdf:type ) ;
sh:ignoredProperties ( rdf:type ) ;
sh:property [ sh:datatype rdf:langString ;
sh:minCount 1 ;
sh:path reproschema:variableName ],

[ sh:minCount 1 ;
sh:nodeKind sh:IRI ;
sh:path reproschema:isAbout ],

[ sh:or ( [ sh:datatype rdf:langString ] [ sh:datatype xsd:boolean ] [ sh:node reproschema:IsVisShape ] ) ;
sh:path reproschema:isVis ],

[ sh:datatype rdf:langString ;
sh:path skos:prefLabel ],
[ sh:datatype rdf:langString ;
sh:minCount 1 ;
sh:path reproschema:variableName ],
[ sh:minCount 1 ;
sh:nodeKind sh:IRI ;
sh:path reproschema:isAbout ],
[ sh:datatype schema:Boolean ;
sh:path reproschema:requiredValue ],
[ sh:or ( [ sh:datatype rdf:langString ] [ sh:datatype xsd:boolean ] [ sh:node reproschema:IsVisShape ] ) ;
sh:path reproschema:isVis ],
[ sh:datatype rdf:langString ;
sh:path skos:prefLabel ] .

[ sh:datatype xsd:boolean ;
sh:path schema:valueRequired ] .

reproschema:ChoicesShape a sh:NodeShape ;
sh:closed true ;
sh:ignoredProperties ( rdf:type ),
( rdf:type ) ;
sh:property [ sh:datatype xsd:string ;
sh:ignoredProperties ( rdf:type ) ;
sh:property [ sh:nodeKind sh:IRI ;
sh:path schema:image ],

[ sh:nodeKind sh:IRI ;
sh:path reproschema:dontKnow ],
sh:path reproschema:DontKnow ],

[ sh:nodeKind sh:IRI ;
sh:path reproschema:skipped ],
[ sh:datatype rdf:langString ;
sh:path schema:name ],
[ sh:datatype xsd:integer ;
sh:path schema:value ],
sh:path reproschema:Skipped ],

[ sh:datatype rdf:langString ;
sh:path schema:name ],
[ sh:datatype xsd:integer ;
sh:path schema:value ],
[ sh:datatype xsd:string ;
sh:path schema:image ],
[ sh:nodeKind sh:IRI ;
sh:path reproschema:dontKnow ],
[ sh:nodeKind sh:IRI ;
sh:path reproschema:skipped ] .

[ sh:or ( [ sh:datatype xsd:integer ] [ sh:nodeKind sh:IRI ] ) ;
sh:path reproschema:value ] .

reproschema:IsVisShape a sh:NodeShape ;
sh:closed true ;
sh:ignoredProperties ( rdf:type ),
( rdf:type ) ;
sh:ignoredProperties ( rdf:type ) ;
sh:property [ sh:datatype rdf:langString ;
sh:minCount 1 ;
sh:path schema:method ],

[ sh:datatype rdf:langString ;
sh:minCount 1 ;
sh:path schema:url ],

[ sh:datatype rdf:langString ;
sh:path reproschema:payload ],
[ sh:datatype rdf:langString ;
sh:path schema:method ],
[ sh:datatype rdf:langString ;
sh:path schema:url ],
[ sh:datatype rdf:langString ;
sh:minCount 1 ;
sh:path reproschema:payload ] .

reproschema:ScoringShape a sh:NodeShape ;
sh:closed true ;
sh:ignoredProperties ( rdf:type ) ;
sh:property [ sh:datatype rdf:langString ;
sh:path reproschema:variableName ],
[ sh:datatype rdf:langString ;
sh:path reproschema:jsExpression ],
[ sh:datatype rdf:langString ;
sh:maxCount 1 ;
sh:minCount 1 ;
sh:path reproschema:variableName ],
[ sh:datatype rdf:langString ;
sh:maxCount 1 ;
sh:minCount 1 ;
sh:path reproschema:jsExpression ] .

0 comments on commit 137139f

Please sign in to comment.