Skip to content

Commit 82046fc

Browse files
geraintluffgeraintluff
committed
Merge branch 'gh-pages' of https://github.com/json-schema/json-schema into next
Conflicts: hyper-schema
2 parents ca4937c + 79c1a7a commit 82046fc

File tree

4 files changed

+409
-252
lines changed

4 files changed

+409
-252
lines changed

‎hyper-schema

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"description": "Instances' URIs must start with this value for this schema to apply to them",
7171
"type": "string",
7272
"format": "uri"
73+
<<<<<<< HEAD
7374
}
7475
},
7576
"definitions": {
@@ -128,4 +129,54 @@
128129
"href": "{+($ref)}"
129130
}
130131
]
132+
=======
133+
}
134+
},
135+
"definitions": {
136+
"schemaArray": {
137+
"type": "array",
138+
"items": {"$ref": "#"}
139+
},
140+
"linkDescription": {
141+
"title": "Link Description Object",
142+
"type": "object",
143+
"required": ["href", "rel"],
144+
"properties": {
145+
"href": {
146+
"description": "a URI template, as defined by RFC 6570, with the addition of the $, ( and ) characters for pre-processing",
147+
"type": "string"
148+
},
149+
"rel": {
150+
"description": "relation to the target resource of the link",
151+
"type": "string"
152+
},
153+
"title": {
154+
"description": "a title for the link",
155+
"type": "string"
156+
},
157+
"targetSchema": {
158+
"description": "JSON Schema describing the link target",
159+
"$ref": "#"
160+
},
161+
"mediaType": {
162+
"description": "media type (as defined by RFC 2046) describing the link target",
163+
"type": "string"
164+
},
165+
"method": {
166+
"description": "method for requesting the target of the link (e.g. for HTTP this might be \"GET\" or \"DELETE\")",
167+
"type": "string"
168+
},
169+
"encType": {
170+
"description": "The media type in which to submit data along with the request",
171+
"type": "string",
172+
"default": "application/json"
173+
},
174+
"schema": {
175+
"description": "Schema describing the data to submit along with the request",
176+
"$ref": "#"
177+
}
178+
}
179+
}
180+
}
181+
>>>>>>> 79c1a7afd282f76e50d93e8aeac2ad9943716eec
131182
}

‎latest/json-schema-core.html

Lines changed: 83 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,11 @@
143143
<table summary="layout" cellpadding="0" cellspacing="2" class="TOCbug" align="right"><tr><td class="TOCbug"><a href="#toc">&nbsp;TOC&nbsp;</a></td></tr></table>
144144
<table summary="layout" width="66%" border="0" cellpadding="0" cellspacing="0"><tr><td><table summary="layout" width="100%" border="0" cellpadding="2" cellspacing="1">
145145
<tr><td class="header">Internet Engineering Task Force</td><td class="header">fge. Galiegue</td></tr>
146-
<tr><td class="header">Internet-Draft</td><td class="header">January 21, 2013</td></tr>
147-
<tr><td class="header">Intended status: Informational</td><td class="header">&nbsp;</td></tr>
148-
<tr><td class="header">Expires: July 25, 2013</td><td class="header">&nbsp;</td></tr>
146+
<tr><td class="header">Internet-Draft</td><td class="header">&nbsp;</td></tr>
147+
<tr><td class="header">Intended status: Informational</td><td class="header">K. Zyp, Ed.</td></tr>
148+
<tr><td class="header">Expires: August 3, 2013</td><td class="header">SitePen (USA)</td></tr>
149+
<tr><td class="header">&nbsp;</td><td class="header">G. Court</td></tr>
150+
<tr><td class="header">&nbsp;</td><td class="header">January 30, 2013</td></tr>
149151
</table></td></tr></table>
150152
<h1><br />JSON Schema: core definitions and terminology<br />json-schema-core</h1>
151153

@@ -174,7 +176,7 @@ <h3>Status of This Memo</h3>
174176
It is inappropriate to use Internet-Drafts as reference material or to cite
175177
them other than as &ldquo;work in progress.&rdquo;</p>
176178
<p>
177-
This Internet-Draft will expire on July 25, 2013.</p>
179+
This Internet-Draft will expire on August 3, 2013.</p>
178180

179181
<h3>Copyright Notice</h3>
180182
<p>
@@ -341,7 +343,7 @@ <h3>Table of Contents</h3>
341343
<p>
342344
A JSON Schema is a JSON document, and that document MUST be an object. Object
343345
members (or properties) defined by JSON Schema (this specification, or related
344-
specifcations) are called keywords, or schema keywords.
346+
specifications) are called keywords, or schema keywords.
345347

346348
</p>
347349
<p>
@@ -507,7 +509,7 @@ <h3>Table of Contents</h3>
507509
JSON Schema allows applications to validate instances, either non interactively
508510
or interactively. For instance, an application may collect JSON data and check
509511
that this data matches a given set of constraints; another application may use a
510-
JSON Schema to build an interactve interface in order to collect user input
512+
JSON Schema to build an interactive interface in order to collect user input
511513
according to constraints described by JSON Schema.
512514

513515
</p>
@@ -592,8 +594,8 @@ <h3>Table of Contents</h3>
592594

593595
</p>
594596
<p>
595-
As a consequence, for interoperability reasons, any JSON used in the context of
596-
JSON Schema, whether that JSON be a JSON Schema or an instance, SHOULD ensure
597+
As a consequence, for interoperability reasons, JSON values used in the context
598+
of JSON Schema, whether that JSON be a JSON Schema or an instance, SHOULD ensure
597599
that mathematical integers be represented as integers as defined by this
598600
specification.
599601

@@ -638,37 +640,43 @@ <h3>Table of Contents</h3>
638640
</p>
639641
<p>
640642
This keyword MUST be located at the root of a JSON Schema. The value of this
641-
keyword MUST be a <a class='info' href='#RFC3986'>URI<span> (</span><span class='info'>Berners-Lee, T., Fielding, R., and L. Masinter, &ldquo;Uniform Resource Identifier (URI): Generic Syntax,&rdquo; January&nbsp;2005.</span><span>)</span></a> [RFC3986], and this URI MUST be both
642-
absolute and normalized. The resource located at this URI MUST successfully
643-
describe itself. It is RECOMMENDED that schema authors include this keyword in
644-
their schemas.
643+
keyword MUST be a <a class='info' href='#RFC3986'>URI<span> (</span><span class='info'>Berners-Lee, T., Fielding, R., and L. Masinter, &ldquo;Uniform Resource Identifier (URI): Generic Syntax,&rdquo; January&nbsp;2005.</span><span>)</span></a> [RFC3986] and a valid <a class='info' href='#json-reference'>JSON Reference<span> (</span><span class='info'>Bryan, P. and K. Zyp, &ldquo;JSON Reference (work in progress),&rdquo; September&nbsp;2012.</span><span>)</span></a> [json&#8209;reference]; this URI MUST be both absolute
644+
and normalized. The resource located at this URI MUST successfully describe
645+
itself. It is RECOMMENDED that schema authors include this keyword in their
646+
schemas.
645647

646648
</p>
647649
<p>
648650
The following values are predefined:
649651

650652
</p>
651-
<blockquote class="text">
652-
<p>"http://json-schema.org/schema#" (JSON Schema written
653-
against the current version of the specification);
654-
</p>
655-
<p>"http://json-schema.org/hyper-schema#" (JSON Schema written
656-
against the current version of the specification);
657-
</p>
658-
<p>"http://json-schema.org/draft-04/schema#" (JSON Schema written
659-
against against JSON Schema, draft v4 -- this version);
660-
</p>
661-
<p>"http://json-schema.org/draft-04/hyper-schema#" (JSON Schema hyperschema
662-
written against JSON Schema, draft v4 -- this version);
663-
</p>
664-
<p>"http://json-schema.org/draft-03/schema#" (JSON Schema written
665-
against <a class='info' href='#json-schema-03'>JSON Schema, draft v3<span> (</span><span class='info'>Court, G. and K. Zyp, &ldquo;JSON Schema, draft 3,&rdquo; September&nbsp;2012.</span><span>)</span></a> [json&#8209;schema&#8209;03]);
666-
</p>
667-
<p>"http://json-schema.org/draft-03/hyper-schema#" (JSON Schema hyperschema
653+
<blockquote class="text"><dl>
654+
<dt>http://json-schema.org/schema#</dt>
655+
<dd>JSON Schema written against
656+
the current version of the specification.
657+
</dd>
658+
<dt>http://json-schema.org/hyper-schema#</dt>
659+
<dd>JSON Schema written
660+
against the current version of the specification.
661+
</dd>
662+
<dt>http://json-schema.org/draft-04/schema#</dt>
663+
<dd>JSON Schema written
664+
against this version.
665+
</dd>
666+
<dt>http://json-schema.org/draft-04/hyper-schema#</dt>
667+
<dd>JSON Schema hyperschema
668+
written against this version.
669+
</dd>
670+
<dt>http://json-schema.org/draft-03/schema#</dt>
671+
<dd> JSON Schema written
672+
against <a class='info' href='#json-schema-03'>JSON Schema, draft v3<span> (</span><span class='info'>Court, G. and K. Zyp, &ldquo;JSON Schema, draft 3,&rdquo; September&nbsp;2012.</span><span>)</span></a> [json&#8209;schema&#8209;03].
673+
</dd>
674+
<dt>http://json-schema.org/draft-03/hyper-schema#</dt>
675+
<dd> JSON Schema hyperschema
668676
written against <a class='info' href='#json-schema-03'>JSON Schema, draft
669-
v3<span> (</span><span class='info'>Court, G. and K. Zyp, &ldquo;JSON Schema, draft 3,&rdquo; September&nbsp;2012.</span><span>)</span></a> [json&#8209;schema&#8209;03]).
670-
</p>
671-
</blockquote><p>
677+
v3<span> (</span><span class='info'>Court, G. and K. Zyp, &ldquo;JSON Schema, draft 3,&rdquo; September&nbsp;2012.</span><span>)</span></a> [json&#8209;schema&#8209;03].
678+
</dd>
679+
</dl></blockquote><p>
672680

673681
</p>
674682
<a name="anchor24"></a><br /><hr />
@@ -694,7 +702,7 @@ <h3>Table of Contents</h3>
694702

695703
<p>
696704
JSON Schema uses <a class='info' href='#json-reference'>JSON Reference<span> (</span><span class='info'>Bryan, P. and K. Zyp, &ldquo;JSON Reference (work in progress),&rdquo; September&nbsp;2012.</span><span>)</span></a> [json&#8209;reference] as a
697-
general addressing mechanism. It extends this specification in two ways:
705+
mechanism for schema addressing. It extends this specification in two ways:
698706

699707
</p>
700708
<blockquote class="text">
@@ -705,6 +713,7 @@ <h3>Table of Contents</h3>
705713
accept arbitrary fragment parts.
706714
</p>
707715
</blockquote><p>
716+
708717

709718
</p>
710719
<p>
@@ -725,7 +734,7 @@ <h3>Table of Contents</h3>
725734

726735
<p>
727736
The value for this keyword MUST be a string, and MUST be a valid URI. This
728-
URI MUST be normalized, and MUST NOT be an empty fragment (#) or the empty
737+
URI MUST be normalized, and SHOULD NOT be an empty fragment (#) or the empty
729738
URI.
730739

731740
</p>
@@ -789,7 +798,7 @@ <h3>Table of Contents</h3>
789798
<dd>http://x.y.z/otherschema.json#
790799
</dd>
791800
<dt>#/schema2/nested</dt>
792-
<dd>http://x.y.z/rootschema.json#bar
801+
<dd>http://x.y.z/otherschema.json#bar
793802
</dd>
794803
<dt>#/schema2/alsonested</dt>
795804
<dd>http://x.y.z/t/inner.json#a
@@ -850,7 +859,7 @@ <h3>Table of Contents</h3>
850859
<p>
851860
When an implementation encounters the "schema1" reference, it resolves it
852861
against the most immediate parent scope, leading to URI
853-
"http://my.site/myschema/schema1#". The way to process this URI will differ
862+
"http://my.site/schema1#". The way to process this URI will differ
854863
according to the chosen dereferencing mode:
855864

856865
</p>
@@ -859,8 +868,8 @@ <h3>Table of Contents</h3>
859868
dereference this URI, and fetch the content at this URI;
860869
</p>
861870
<p>if inline dereferencing is used, the implementation will notice that
862-
URI scope "http://my.site/myschema/schema1#" is already defined within
863-
the schema, and choose to use the appropriate subschema.
871+
URI scope "http://my.site/schema1#" is already defined within the
872+
schema, and choose to use the appropriate subschema.
864873
</p>
865874
</blockquote><p>
866875

@@ -891,7 +900,7 @@ <h3>Table of Contents</h3>
891900
</pre></div>
892901
<p>
893902
An implementation choosing to support inline dereferencing SHOULD be able to
894-
use this kind of references. Implementations choosing to use canonical
903+
use this kind of reference. Implementations choosing to use canonical
895904
dereferencing, however, are not required to support it.
896905

897906
</p>
@@ -910,8 +919,8 @@ <h3>Table of Contents</h3>
910919
<p>
911920
Extended JSON References using fragments which are not JSON Pointers are not
912921
dereferenceable by implementations choosing not to support inline dereferencing.
913-
This addressing mechanism is defined for backwards compatibility, and SHOULD NOT
914-
be used in new schemas.
922+
This kind of reference is defined for backwards compatibility, and SHOULD NOT be
923+
used in new schemas.
915924

916925
</p>
917926
<a name="anchor33"></a><br /><hr />
@@ -1032,6 +1041,14 @@ <h3>10.2.&nbsp;Informative References</h3>
10321041
<ul class="text">
10331042
<li>Initial draft.
10341043
</li>
1044+
<li>Salvaged from draft v3.
1045+
</li>
1046+
<li>Mandate the use of JSON Reference, JSON Pointer.
1047+
</li>
1048+
<li>Define the role of "id". Define URI resolution scope.
1049+
</li>
1050+
<li>Add interoperability considerations.
1051+
</li>
10351052
</ul>
10361053

10371054
</dd>
@@ -1040,11 +1057,35 @@ <h3>10.2.&nbsp;Informative References</h3>
10401057
</p>
10411058
<a name="rfc.authors"></a><br /><hr />
10421059
<table summary="layout" cellpadding="0" cellspacing="2" class="TOCbug" align="right"><tr><td class="TOCbug"><a href="#toc">&nbsp;TOC&nbsp;</a></td></tr></table>
1043-
<h3>Author's Address</h3>
1060+
<h3>Authors' Addresses</h3>
10441061
<table width="99%" border="0" cellpadding="0" cellspacing="0">
10451062
<tr><td class="author-text">&nbsp;</td>
10461063
<td class="author-text">Francis Galiegue</td></tr>
10471064
<tr><td class="author" align="right">EMail:&nbsp;</td>
10481065
<td class="author-text"><a href="mailto:[email protected]">[email protected]</a></td></tr>
1066+
<tr cellpadding="3"><td>&nbsp;</td><td>&nbsp;</td></tr>
1067+
<tr><td class="author-text">&nbsp;</td>
1068+
<td class="author-text">Kris Zyp (editor)</td></tr>
1069+
<tr><td class="author-text">&nbsp;</td>
1070+
<td class="author-text">SitePen (USA)</td></tr>
1071+
<tr><td class="author-text">&nbsp;</td>
1072+
<td class="author-text">530 Lytton Avenue</td></tr>
1073+
<tr><td class="author-text">&nbsp;</td>
1074+
<td class="author-text">Palo Alto, CA 94301</td></tr>
1075+
<tr><td class="author-text">&nbsp;</td>
1076+
<td class="author-text">USA</td></tr>
1077+
<tr><td class="author" align="right">Phone:&nbsp;</td>
1078+
<td class="author-text">+1 650 968 8787</td></tr>
1079+
<tr><td class="author" align="right">EMail:&nbsp;</td>
1080+
<td class="author-text"><a href="mailto:[email protected]">[email protected]</a></td></tr>
1081+
<tr cellpadding="3"><td>&nbsp;</td><td>&nbsp;</td></tr>
1082+
<tr><td class="author-text">&nbsp;</td>
1083+
<td class="author-text">Gary Court</td></tr>
1084+
<tr><td class="author-text">&nbsp;</td>
1085+
<td class="author-text">Calgary, AB</td></tr>
1086+
<tr><td class="author-text">&nbsp;</td>
1087+
<td class="author-text">Canada</td></tr>
1088+
<tr><td class="author" align="right">EMail:&nbsp;</td>
1089+
<td class="author-text"><a href="mailto:[email protected]">[email protected]</a></td></tr>
10491090
</table>
10501091
</body></html>

0 commit comments

Comments
 (0)