Testing for Correct rights URIs

Fixes #79
IIIF · Dec 4, 2019 · f2b9b5c · f2b9b5c
1 parent cffa9e7
commit f2b9b5c
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 11 deletions.
diff --git a/fixtures/3/full_example.json b/fixtures/3/full_example.json
@@ -50,7 +50,7 @@
   "behavior": [ "paged" ],
   "navDate": "1856-01-01T00:00:00Z",
 
-  "rights": "https://creativecommons.org/licenses/by/4.0/",
+  "rights": "http://creativecommons.org/licenses/by/4.0",
   "requiredStatement": {
     "label": { "en": [ "Attribution" ] },
     "value": { "en": [ "Provided by Example Organization" ] }

diff --git a/schema/iiif_3_0.json b/schema/iiif_3_0.json
@@ -236,9 +236,104 @@
             }
         },
         "rights": {
-            "type": "string",
-            "format": "uri",
-            "pattern": "^http.*$"
+            "title": "Rights URI isn't from either Creative Commons or Rights statements.org. Both require http links.",
+            "oneOf": [
+                {
+                    "type": "string",
+                    "format": "uri",
+                    "pattern": "http://creativecommons.org/licenses/by/4.0"
+                },
+                {
+                    "type": "string",
+                    "format": "uri",
+                    "pattern": "http://creativecommons.org/licenses/by-sa/4.0"
+                },
+                {
+                    "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/"
+                }
+            ]
         },
         "navDate": {
             "type": "string",

diff --git a/schema/schemavalidator.py b/schema/schemavalidator.py
@@ -42,16 +42,12 @@ def validate(data, version, url):
         print('Validation Failed')
         errorCount = 1
         for err in errors:
-            error += 'Error {} of {}.\n Message: {}'.format(errorCount, len(errors), err.message)
             detail = ''
             if 'title' in err.schema:
                 detail = err.schema['title']
-            #    print (' Test message: {}'.format(detail))
             description = ''    
             if 'description' in err.schema:
-                description = err.schema['description']
-            #    print (' Test description: {}'.format(description))
-            #print('\n Path for error: {}'.format(printPath(err.path, err.message)))
+                detail += err.schema['description']
             context = err.instance
             #print (json.dumps(err.instance, indent=4))
             if isinstance(context, dict):

diff --git a/tests/test_validator.py b/tests/test_validator.py
@@ -163,8 +163,7 @@ def printValidationerror(self, filename, errors):
         errorCount = 1
         for err in errors:
             print(err['title'])
-            if 'description' in err:
-                print (' Test description: {}'.format(err['description']))
+            print(err['detail'])
             print('\n Path for error: {}'.format(err['path']))
             print('\n Context: {}'.format(err['context']))
             errorCount += 1