Skip to content

Commit

Permalink
Merge 51fde0a into 1183876
Browse files Browse the repository at this point in the history
  • Loading branch information
@glenrobson
glenrobson committed Mar 19, 2020
2 parents 1183876 + 51fde0a commit ae50679
Show file tree
Hide file tree
Showing 5 changed files with 201 additions and 86 deletions.
64 changes: 64 additions & 0 deletions fixtures/3/non_cc_license.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"@context": "http://iiif.io/api/presentation/3/context.json",
"id": "http://localhost:4000/recipe/0008-rights/manifest.json",
"type": "Manifest",
"label": {
"en": [
"Picture of Göttingen taken during the 2019 IIIF Conference"
]
},
"summary": {
"en": [
"<p>Picture taken by the <a href=\"https://github.com/glenrobson\">IIIF Technical Coordinator</a></p>"
]
},
"rights": "https://en.wikipedia.org/wiki/License",
"requiredStatement": {
"label": {
"en": [
"Attribution"
]
},
"value": {
"en": [
"<span>Glen Robson, IIIF Technical Coordinator. <a href=\"https://creativecommons.org/licenses/by-sa/3.0\">CC BY-SA 3.0</a> <img src=\"https://licensebuttons.net/l/by-sa/3.0/88x31.png\"/></span>"
]
}
},
"items": [
{
"id": "http://localhost:4000/recipe/0008-rights/canvas/p1",
"type": "Canvas",
"height": 3024,
"width": 4032,
"items": [
{
"id": "http://localhost:4000/recipe/0008-rights/page/p1/1",
"type": "AnnotationPage",
"items": [
{
"id": "http://localhost:4000/recipe/0008-rights/annotation/p0001-image",
"type": "Annotation",
"motivation": "painting",
"body": {
"id": "https://iiif.io/api/image/3.0/example/reference/918ecd18c2592080851777620de9bcb5-gottingen/full/max/0/default.jpg",
"type": "Image",
"format": "image/jpeg",
"height": 3024,
"width": 4032,
"service": [
{
"id": "https://iiif.io/api/image/3.0/example/reference/918ecd18c2592080851777620de9bcb5-gottingen",
"profile": "level1",
"type": "ImageService3"
}
]
},
"target": "http://localhost:4000/recipe/0008-rights/canvas/p1"
}
]
}
]
}
]
}
64 changes: 64 additions & 0 deletions fixtures/3/old_cc_license.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"@context": "http://iiif.io/api/presentation/3/context.json",
"id": "http://localhost:4000/recipe/0008-rights/manifest.json",
"type": "Manifest",
"label": {
"en": [
"Picture of Göttingen taken during the 2019 IIIF Conference"
]
},
"summary": {
"en": [
"<p>Picture taken by the <a href=\"https://github.com/glenrobson\">IIIF Technical Coordinator</a></p>"
]
},
"rights": "http://creativecommons.org/licenses/by-sa/3.0/",
"requiredStatement": {
"label": {
"en": [
"Attribution"
]
},
"value": {
"en": [
"<span>Glen Robson, IIIF Technical Coordinator. <a href=\"https://creativecommons.org/licenses/by-sa/3.0\">CC BY-SA 3.0</a> <img src=\"https://licensebuttons.net/l/by-sa/3.0/88x31.png\"/></span>"
]
}
},
"items": [
{
"id": "http://localhost:4000/recipe/0008-rights/canvas/p1",
"type": "Canvas",
"height": 3024,
"width": 4032,
"items": [
{
"id": "http://localhost:4000/recipe/0008-rights/page/p1/1",
"type": "AnnotationPage",
"items": [
{
"id": "http://localhost:4000/recipe/0008-rights/annotation/p0001-image",
"type": "Annotation",
"motivation": "painting",
"body": {
"id": "https://iiif.io/api/image/3.0/example/reference/918ecd18c2592080851777620de9bcb5-gottingen/full/max/0/default.jpg",
"type": "Image",
"format": "image/jpeg",
"height": 3024,
"width": 4032,
"service": [
{
"id": "https://iiif.io/api/image/3.0/example/reference/918ecd18c2592080851777620de9bcb5-gottingen",
"profile": "level1",
"type": "ImageService3"
}
]
},
"target": "http://localhost:4000/recipe/0008-rights/canvas/p1"
}
]
}
]
}
]
}
64 changes: 64 additions & 0 deletions fixtures/3/rightsstatement_license.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"@context": "http://iiif.io/api/presentation/3/context.json",
"id": "http://localhost:4000/recipe/0008-rights/manifest.json",
"type": "Manifest",
"label": {
"en": [
"Picture of Göttingen taken during the 2019 IIIF Conference"
]
},
"summary": {
"en": [
"<p>Picture taken by the <a href=\"https://github.com/glenrobson\">IIIF Technical Coordinator</a></p>"
]
},
"rights": "http://rightsstatements.org/vocab/NoC-NC/1.0/",
"requiredStatement": {
"label": {
"en": [
"Attribution"
]
},
"value": {
"en": [
"<span>Glen Robson, IIIF Technical Coordinator. <a href=\"https://creativecommons.org/licenses/by-sa/3.0\">CC BY-SA 3.0</a> <img src=\"https://licensebuttons.net/l/by-sa/3.0/88x31.png\"/></span>"
]
}
},
"items": [
{
"id": "http://localhost:4000/recipe/0008-rights/canvas/p1",
"type": "Canvas",
"height": 3024,
"width": 4032,
"items": [
{
"id": "http://localhost:4000/recipe/0008-rights/page/p1/1",
"type": "AnnotationPage",
"items": [
{
"id": "http://localhost:4000/recipe/0008-rights/annotation/p0001-image",
"type": "Annotation",
"motivation": "painting",
"body": {
"id": "https://iiif.io/api/image/3.0/example/reference/918ecd18c2592080851777620de9bcb5-gottingen/full/max/0/default.jpg",
"type": "Image",
"format": "image/jpeg",
"height": 3024,
"width": 4032,
"service": [
{
"id": "https://iiif.io/api/image/3.0/example/reference/918ecd18c2592080851777620de9bcb5-gottingen",
"profile": "level1",
"type": "ImageService3"
}
]
},
"target": "http://localhost:4000/recipe/0008-rights/canvas/p1"
}
]
}
]
}
]
}
88 changes: 4 additions & 84 deletions schema/iiif_3_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,102 +236,22 @@
}
},
"rights": {
"title": "Rights URI isn't from either Creative Commons or Rights statements.org. Both require http links.",
"title": "Rights URI isn't from either Creative Commons or RightsStatements.org. Both require http links.",
"oneOf": [
{
"type": "string",
"format": "uri",
"pattern": "http://creativecommons.org/licenses/by/4.0"
"pattern": "http://creativecommons.org/licenses/.*"
},
{
"type": "string",
"format": "uri",
"pattern": "http://creativecommons.org/licenses/by-sa/4.0"
"pattern": "http://creativecommons.org/publicdomain/mark/.*"
},
{
"type": "string",
"format": "uri",
"pattern": "http://creativecommons.org/licenses/by-nd/4.0"
},
{
"type": "string",
"format": "uri",
"pattern": "http://creativecommons.org/licenses/by-nc/4.0"
},
{
"type": "string",
"format": "uri",
"pattern": "http://creativecommons.org/licenses/by-nc-sa/4.0"
},
{
"type": "string",
"format": "uri",
"pattern": "http://creativecommons.org/licenses/by-nc-nd/4.0"
},
{
"type": "string",
"format": "uri",
"pattern": "http://creativecommons.org/publicdomain/mark/1.0/"
},
{
"type": "string",
"format": "uri",
"pattern": "http://rightsstatements.org/vocab/InC/1.0/"
},
{
"type": "string",
"format": "uri",
"pattern": "http://rightsstatements.org/vocab/InC-OW-EU/1.0/"
},
{
"type": "string",
"format": "uri",
"pattern": "http://rightsstatements.org/vocab/InC-EDU/1.0/"
},
{
"type": "string",
"format": "uri",
"pattern": "http://rightsstatements.org/vocab/InC-NC/1.0/"
},
{
"type": "string",
"format": "uri",
"pattern": "http://rightsstatements.org/vocab/InC-RUU/1.0/"
},
{
"type": "string",
"format": "uri",
"pattern": "http://rightsstatements.org/vocab/NoC-CR/1.0/"
},
{
"type": "string",
"format": "uri",
"pattern": "http://rightsstatements.org/vocab/NoC-NC/1.0/"
},
{
"type": "string",
"format": "uri",
"pattern": "http://rightsstatements.org/vocab/NoC-OKLR/1.0/"
},
{
"type": "string",
"format": "uri",
"pattern": "http://rightsstatements.org/vocab/NoC-US/1.0/"
},
{
"type": "string",
"format": "uri",
"pattern": "http://rightsstatements.org/vocab/CNE/1.0/"
},
{
"type": "string",
"format": "uri",
"pattern": "http://rightsstatements.org/vocab/UND/1.0/"
},
{
"type": "string",
"format": "uri",
"pattern": "http://rightsstatements.org/vocab/NKC/1.0/"
"pattern": "http://rightsstatements.org/vocab/.*"
}
]
},
Expand Down
7 changes: 5 additions & 2 deletions tests/test_validator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,9 @@ def test07_check_manifest3(self):
'fixtures/3/version2image.json',
'fixtures/3/annoPage.json',
'fixtures/3/anno_pointselector.json',
'fixtures/3/annoPageMultipleMotivations.json'
'fixtures/3/annoPageMultipleMotivations.json',
'fixtures/3/old_cc_license.json',
'fixtures/3/rightsstatement_license.json'
]:
with open(good, 'r') as fh:
data = fh.read()
Expand All @@ -151,7 +153,8 @@ def test07_check_manifest3(self):
for bad_data in ['fixtures/3/broken_simple_image.json',
'fixtures/3/broken_choice.json',
'fixtures/3/broken_collection.json',
'fixtures/3/broken_embedded_annos.json']:
'fixtures/3/broken_embedded_annos.json',
'fixtures/3/non_cc_license.json']:
with open(bad_data, 'r') as fh:
data = fh.read()
j = json.loads(v.check_manifest(data, '3.0'))
Expand Down

0 comments on commit ae50679

Please sign in to comment.