Merge pull request #132 from handrews/metafix

Update meta-schemas for changes in the last draft.
json-schema-org · Nov 17, 2016 · d0391a9 · d0391a9
2 parents 7780914 + 0e3189d
commit d0391a9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/hyper-schema.json b/hyper-schema.json
@@ -46,13 +46,14 @@
         "oneOf": {"$ref": "#/definitions/schemaArray"},
         "not": { "$ref": "#" },
 
+        "base": {
+            "description": "URI Template resolved as for the 'href' keyword in the Link Description Object.  The resulting URI Reference is resolved against the current URI base and sets the new URI base for URI references within the instance.",
+            "type": "string"
+        },
         "links": {
             "type": "array",
             "items": {"$ref": "#/definitions/linkDescription"}
         },
-        "fragmentResolution": {
-            "type": "string"
-        },
         "media": {
             "type": "object",
             "properties": {
@@ -65,11 +66,6 @@
                     "type": "string"
                 }
             }
-        },
-        "pathStart": {
-            "description": "Instances' URIs must start with this value for this schema to apply to them",
-            "type": "string",
-            "format": "uri"
         }
     },
     "definitions": {
@@ -80,7 +76,7 @@
         "linkDescription": {
             "title": "Link Description Object",
             "type": "object",
-            "required": ["href", "rel"],
+            "required": ["href"],
             "properties": {
                 "href": {
                     "description": "a URI template, as defined by RFC 6570, with the addition of the $, ( and ) characters for pre-processing",
@@ -103,7 +99,7 @@
                     "type": "string"
                 },
                 "method": {
-                    "description": "method for requesting the target of the link (e.g. for HTTP this might be \"GET\" or \"DELETE\")",
+                    "description": "specifies that the client can construct a templated query (\"get\") or non-idempotent request (\"post\") to a resource.",
                     "type": "string"
                 },
                 "encType": {

diff --git a/schema.json b/schema.json
@@ -13,7 +13,10 @@
             "minimum": 0
         },
         "positiveIntegerDefault0": {
-            "allOf": [ { "$ref": "#/definitions/positiveInteger" }, { "default": 0 } ]
+            "allOf": [
+                { "$ref": "#/definitions/positiveInteger" },
+                { "default": 0 }
+            ]
         },
         "simpleTypes": {
             "enum": [ "array", "boolean", "integer", "null", "number", "object", "string" ]
@@ -28,7 +31,7 @@
     "properties": {
         "id": {
             "type": "string",
-            "format": "uri"
+            "format": "uriref"
         },
         "$schema": {
             "type": "string",