Draft 03: draft-zyp-json-schema-03

Author: adamvoss

hyper-schema.json

@@ -1,52 +1,50 @@
 {
-"$schema" : "http://json-schema.org/draft-02/hyper-schema#",
-"id" : "http://json-schema.org/draft-02/hyper-schema#",
+"$schema" : "http://json-schema.org/draft-03/hyper-schema#",
+"extends" : {"$ref" : "http://json-schema.org/draft-03/schema#"}
+"id" : "http://json-schema.org/draft-03/hyper-schema#",
 
 "properties" : {
 "links" : {
 "type" : "array",
-"items" : {"$ref" : "http://json-schema.org/draft-02/links#"},
-"optional" : true
+"items" : {"$ref" : "http://json-schema.org/draft-03/links#"}
 },
 
 "fragmentResolution" : {
 "type" : "string",
-"optional" : true,
 "default" : "slash-delimited"
 },
 
 "root" : {
 "type" : "boolean",
-"optional" : true,
 "default" : false
 },
 
 "readonly" : {
 "type" : "boolean",
-"optional" : true,
 "default" : false
 },
 
+"contentEncoding" : {
+"type" : "string"
+},
+
 "pathStart" : {
 "type" : "string",
-"optional" : true,
 "format" : "uri"
 },
 
 "mediaType" : {
 "type" : "string",
-"optional" : true,
 "format" : "media-type"
-},
-
-"alternate" : {
-"type" : "array",
-"items" : {"$ref" : "#"},
-"optional" : true
 }
 },
 
 "links" : [
+{
+"href" : "{id}",
+"rel" : "self"
+},
+
 {
 "href" : "{$ref}",
 "rel" : "full"
@@ -55,14 +53,8 @@
 {
 "href" : "{$schema}",
 "rel" : "describedby"
-},
-
-{
-"href" : "{id}",
-"rel" : "self"
 }
 ],
 
-"fragmentResolution" : "slash-delimited",
-"extends" : {"$ref" : "http://json-schema.org/draft-02/schema#"}
+"fragmentResolution" : "slash-delimited"
 }

json-ref.json

@@ -1,11 +1,16 @@
 {
-"$schema" : "http://json-schema.org/draft-02/hyper-schema#",
-"id" : "http://json-schema.org/draft-02/json-ref#",
+"$schema" : "http://json-schema.org/draft-03/hyper-schema#",
+"id" : "http://json-schema.org/draft-03/json-ref#",
 
-"items" : {"$ref" : "#"},
+"additionalItems" : {"$ref" : "#"},
 "additionalProperties" : {"$ref" : "#"},
 
 "links" : [
+{
+"href" : "{id}",
+"rel" : "self"
+},
+
 {
 "href" : "{$ref}",
 "rel" : "full"
@@ -14,11 +19,6 @@
 {
 "href" : "{$schema}",
 "rel" : "describedby"
-},
-
-{
-"href" : "{id}",
-"rel" : "self"
 }
 ],