Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update meta-schemas for changes in the last draft. #132

Merged
merged 1 commit into from
Nov 17, 2016
Merged

Update meta-schemas for changes in the last draft. #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions hyper-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand All @@ -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",
Expand All @@ -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": {
Expand Down
7 changes: 5 additions & 2 deletions schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand All @@ -28,7 +31,7 @@
"properties": {
"id": {
"type": "string",
"format": "uri"
"format": "uriref"
},
"$schema": {
"type": "string",
Expand Down