Merge branch 'master' into type_dsl. Add test for typeDSL.

Conflicts:
	schema_salad/metaschema/metaschema.yml
	schema_salad/ref_resolver.py

Author: Peter Amstutz

schema_salad/main.py

@@ -98,8 +98,16 @@ def main(argsl=None):  # type: (List[str]) -> int
     if not urlparse.urlparse(schema_uri)[0]:
         schema_uri = "file://" + os.path.abspath(schema_uri)
     schema_raw_doc = metaschema_loader.fetch(schema_uri)
-    schema_doc, schema_metadata = metaschema_loader.resolve_all(
-        schema_raw_doc, schema_uri)
+
+    try:
+        schema_doc, schema_metadata = metaschema_loader.resolve_all(
+            schema_raw_doc, schema_uri)
+    except (validate.ValidationException) as e:
+        _logger.error("Schema `%s` failed link checking:\n%s",
+                      args.schema, e, exc_info=(e if args.debug else False))
+        _logger.debug("Index is %s", metaschema_loader.idx.keys())
+        _logger.debug("Vocabulary is %s", metaschema_loader.vocab.keys())
+        return 1
 
     # Optionally print the schema after ref resolution
     if not args.document and args.print_pre:
@@ -110,16 +118,6 @@ def main(argsl=None):  # type: (List[str]) -> int
         print(json.dumps(metaschema_loader.idx.keys(), indent=4))
         return 0
 
-    # Validate links in the schema document
-    try:
-        metaschema_loader.validate_links(schema_doc)
-    except (validate.ValidationException) as e:
-        _logger.error("Schema `%s` failed link checking:\n%s",
-                      args.schema, e, exc_info=(e if args.debug else False))
-        _logger.debug("Index is %s", metaschema_loader.idx.keys())
-        _logger.debug("Vocabulary is %s", metaschema_loader.vocab.keys())
-        return 1
-
     # Validate the schema document against the metaschema
     try:
         schema.validate_doc(metaschema_names, schema_doc,
@@ -196,16 +194,6 @@ def main(argsl=None):  # type: (List[str]) -> int
         print(json.dumps(document_loader.idx.keys(), indent=4))
         return 0
 
-    # Validate links in the target document
-    try:
-        document_loader.validate_links(document)
-    except (validate.ValidationException) as e:
-        _logger.error("Document `%s` failed link checking:\n%s",
-                      args.document, e, exc_info=(e if args.debug else False))
-        _logger.debug("Index is %s", json.dumps(
-            document_loader.idx.keys(), indent=4))
-        return 1
-
     # Validate the schema document against the metaschema
     try:
         schema.validate_doc(avsc_names, document,

schema_salad/metaschema/metaschema.yml

@@ -139,11 +139,29 @@ $graph:
         the item is transformed to a JSON object with the key assigned to the
         field specified by `mapSubject` and the value assigned to the field
         specified by `mapPredicate`.
+    - name: refScope
+      type:
+        - "null"
+        - int
+      doc: |
+        If the field contains a relative reference, it must be resolved by
+        searching for valid document references in each successive parent scope
+        in the document fragment.  For example, a reference of `foo` in the
+        context `#foo/bar/baz` will first check for the existence of
+        `#foo/bar/baz/foo`, followed by `#foo/bar/foo`, then `#foo/foo` and
+        then finally `#foo`.  The first valid URI in the search order shall be
+        used as the fully resolved value of the identifier.  The value of the
+        refScope field is the specified number of levels from the containing
+        identifer scope before starting the search, so if `refScope: 2` then
+        "baz" and "bar" must be stripped to get the base `#foo` and search
+        `#foo/foo` and the `#foo`.  The last scope searched must be the top
+        level scope before determining if the identifier cannot be resolved.
     - name: typeDSL
       type: ["null", boolean]
       doc: |
         Field must be expanded based on the the Schema Salad type DSL.
 
+
 - name: SpecializeDef
   type: record
   fields:
@@ -274,6 +292,7 @@ $graph:
       jsonldPredicate:
         _id: "sld:type"
         _type: "@vocab"
+        typeDSL: true
       doc: |
         The field type
 
@@ -305,7 +324,7 @@ $graph:
       jsonldPredicate:
         _id: "sld:type"
         _type: "@vocab"
-
+        typeDSL: true
     - name: "fields"
       type:
         - "null"
@@ -370,7 +389,7 @@ $graph:
       jsonldPredicate:
         _id: "sld:type"
         _type: "@vocab"
-
+        typeDSL: true
     - name: "symbols"
       type:
         - type: "array"
@@ -415,7 +434,7 @@ $graph:
       jsonldPredicate:
         _id: "sld:type"
         _type: "@vocab"
-
+        typeDSL: true
     - name: items
       type:
         - "#PrimitiveType"
@@ -454,3 +473,4 @@ $graph:
       jsonldPredicate:
         _id: "sld:type"
         _type: "@vocab"
+        typeDSL: true