Skip to content

Commit 2593599

Browse files
fgenickl-
fge
authored and
nickl-
committed
Bring schema JSON files in conformity with the draft text
1 parent 2b6e201 commit 2593599

File tree

11 files changed

+414
-484
lines changed

11 files changed

+414
-484
lines changed

‎address

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"description": "An Address following the convention of http://microformats.org/wiki/hcard",
3-
"type":"object",
4-
"properties": {
5-
"post-office-box": { "type": "string" },
6-
"extended-address": { "type": "string" },
7-
"street-address": { "type": "string" },
8-
"locality":{ "type": "string", "required": true },
9-
"region": { "type": "string", "required": true },
10-
"postal-code": { "type": "string" },
11-
"country-name": { "type": "string", "required": true}
12-
},
13-
"dependencies": {
14-
"post-office-box": "street-address",
15-
"extended-address": "street-address"
16-
}
2+
"description": "An Address following the convention of http://microformats.org/wiki/hcard",
3+
"type": "object",
4+
"properties": {
5+
"post-office-box": { "type": "string" },
6+
"extended-address": { "type": "string" },
7+
"street-address": { "type": "string" },
8+
"locality":{ "type": "string", "required": true },
9+
"region": { "type": "string", "required": true },
10+
"postal-code": { "type": "string" },
11+
"country-name": { "type": "string", "required": true}
12+
},
13+
"dependencies": {
14+
"post-office-box": "street-address",
15+
"extended-address": "street-address"
16+
}
1717
}

‎calendar

+35-39
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,37 @@
11
{
2-
"description": "A representation of an event",
3-
"type": "object",
4-
"properties": {
5-
"dtstart": {
6-
"format": "date-time",
7-
"type": "string",
8-
"description": "Event starting time",
9-
"required": true
10-
},
11-
"dtend": {
12-
"format": "date-time",
13-
"type": "string",
14-
"description": "Event ending time"
15-
},
16-
"summary": { "type": "string", "required": true },
17-
"location": { "type": "string" },
18-
"url": { "type": "string", "format": "uri" },
19-
"duration": {
20-
"format": "time",
21-
"type": "string",
22-
"description": "Event duration"
23-
},
24-
"rdate": {
25-
"format": "date-time",
26-
"type": "string",
27-
"description": "Recurrence date"
28-
},
29-
"rrule": {
30-
"type": "string",
31-
"description": "Recurrence rule"
32-
},
33-
"category": { "type": "string" },
34-
"description": { "type": "string" },
35-
"geo": { "$ref": "http: //json-schema.org/geo" }
36-
}
2+
"description": "A representation of an event",
3+
"type": "object",
4+
"properties": {
5+
"dtstart": {
6+
"format": "date-time",
7+
"type": "string",
8+
"description": "Event starting time",
9+
"required": true
10+
},
11+
"dtend": {
12+
"format": "date-time",
13+
"type": "string",
14+
"description": "Event ending time"
15+
},
16+
"summary": { "type": "string", "required": true },
17+
"location": { "type": "string" },
18+
"url": { "type": "string", "format": "uri" },
19+
"duration": {
20+
"format": "time",
21+
"type": "string",
22+
"description": "Event duration"
23+
},
24+
"rdate": {
25+
"format": "date-time",
26+
"type": "string",
27+
"description": "Recurrence date"
28+
},
29+
"rrule": {
30+
"type": "string",
31+
"description": "Recurrence rule"
32+
},
33+
"category": { "type": "string" },
34+
"description": { "type": "string" },
35+
"geo": { "$ref": "http: //json-schema.org/geo" }
36+
}
3737
}
38-
39-
40-
41-

‎draft-03/hyper-schema

+43-58
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,45 @@
11
{
2-
"$schema" : "http://json-schema.org/draft-03/hyper-schema#",
3-
"extends" : {"$ref" : "http://json-schema.org/draft-03/schema#"},
4-
"id" : "http://json-schema.org/draft-03/hyper-schema#",
5-
6-
"properties" : {
7-
"links" : {
8-
"type" : "array",
9-
"items" : {"$ref" : "http://json-schema.org/draft-03/links#"}
10-
},
11-
12-
"fragmentResolution" : {
13-
"type" : "string",
14-
"default" : "slash-delimited"
15-
},
16-
17-
"root" : {
18-
"type" : "boolean",
19-
"default" : false
20-
},
21-
22-
"readonly" : {
23-
"type" : "boolean",
24-
"default" : false
25-
},
26-
27-
"contentEncoding" : {
28-
"type" : "string"
29-
},
30-
31-
"pathStart" : {
32-
"type" : "string",
33-
"format" : "uri"
34-
},
35-
36-
"mediaType" : {
37-
"type" : "string",
38-
"format" : "media-type"
39-
}
40-
},
41-
42-
"links" : [
43-
{
44-
"href" : "{id}",
45-
"rel" : "self"
46-
},
47-
48-
{
49-
"href" : "{$ref}",
50-
"rel" : "full"
51-
},
52-
53-
{
54-
"href" : "{$schema}",
55-
"rel" : "describedby"
56-
}
57-
],
58-
59-
"fragmentResolution" : "slash-delimited"
2+
"$schema": "http://json-schema.org/draft-03/hyper-schema#",
3+
"id": "http://json-schema.org/draft-03/hyper-schema#",
4+
"extends": { "$ref": "http://json-schema.org/draft-03/schema#" },
5+
"properties": {
6+
"links": {
7+
"type": "array",
8+
"items": { "$ref": "http://json-schema.org/draft-03/links#" }
9+
},
10+
"fragmentResolution": {
11+
"type": "string",
12+
"default": "slash-delimited"
13+
},
14+
"readonly": {
15+
"type": "boolean",
16+
"default": false
17+
},
18+
"contentEncoding": {
19+
"type": "string"
20+
},
21+
"pathStart": {
22+
"type": "string",
23+
"format": "uri"
24+
},
25+
"mediaType": {
26+
"type": "string",
27+
"format": "media-type"
28+
}
29+
},
30+
"links": [
31+
{
32+
"href": "{id}",
33+
"rel": "self"
34+
},
35+
{
36+
"href": "{$ref}",
37+
"rel": "full"
38+
},
39+
{
40+
"href": "{$schema}",
41+
"rel": "describedby"
42+
}
43+
],
44+
"fragmentResolution": "slash-delimited"
6045
}

‎draft-03/json-ref

+20-25
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
11
{
2-
"$schema" : "http://json-schema.org/draft-03/hyper-schema#",
3-
"id" : "http://json-schema.org/draft-03/json-ref#",
4-
5-
"additionalItems" : {"$ref" : "#"},
6-
"additionalProperties" : {"$ref" : "#"},
7-
8-
"links" : [
9-
{
10-
"href" : "{id}",
11-
"rel" : "self"
12-
},
13-
14-
{
15-
"href" : "{$ref}",
16-
"rel" : "full"
17-
},
18-
19-
{
20-
"href" : "{$schema}",
21-
"rel" : "describedby"
22-
}
23-
],
24-
25-
"fragmentResolution" : "dot-delimited"
26-
}
2+
"$schema": "http://json-schema.org/draft-03/hyper-schema#",
3+
"id": "http://json-schema.org/draft-03/json-ref#",
4+
"additionalItems": { "$ref": "#" },
5+
"additionalProperties": { "$ref": "#" },
6+
"links": [
7+
{
8+
"href": "{id}",
9+
"rel": "self"
10+
},
11+
{
12+
"href": "{$ref}",
13+
"rel": "full"
14+
},
15+
{
16+
"href": "{$schema}",
17+
"rel": "describedby"
18+
}
19+
],
20+
"fragmentResolution": "slash-delimited"
21+
}

‎draft-03/links

+30-34
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,31 @@
11
{
2-
"$schema" : "http://json-schema.org/draft-03/hyper-schema#",
3-
"id" : "http://json-schema.org/draft-03/links#",
4-
"type" : "object",
5-
6-
"properties" : {
7-
"href" : {
8-
"type" : "string",
9-
"required" : true,
10-
"format" : "link-description-object-template"
11-
},
12-
13-
"rel" : {
14-
"type" : "string",
15-
"required" : true
16-
},
17-
18-
"targetSchema" : {"$ref" : "http://json-schema.org/draft-03/hyper-schema#"},
19-
20-
"method" : {
21-
"type" : "string",
22-
"default" : "GET"
23-
},
24-
25-
"enctype" : {
26-
"type" : "string",
27-
"requires" : "method"
28-
},
29-
30-
"properties" : {
31-
"type" : "object",
32-
"additionalProperties" : {"$ref" : "http://json-schema.org/draft-03/hyper-schema#"}
33-
}
34-
}
35-
}
2+
"$schema": "http://json-schema.org/draft-03/hyper-schema#",
3+
"id": "http://json-schema.org/draft-03/links#",
4+
"type": "object",
5+
6+
"properties": {
7+
"href": {
8+
"type": "string",
9+
"required": true
10+
},
11+
"rel": {
12+
"type": "string",
13+
"required": true
14+
},
15+
"targetSchema": { "$ref": "http://json-schema.org/draft-03/hyper-schema#" },
16+
"method": {
17+
"type": "string",
18+
"default": "GET"
19+
},
20+
"enctype": {
21+
"type": "string"
22+
},
23+
"schema": {
24+
"type": "object",
25+
"additionalProperties": { "$ref": "http://json-schema.org/draft-03/hyper-schema#" }
26+
}
27+
},
28+
"dependencies": {
29+
"enctype": "method"
30+
}
31+
}

‎geo

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"description": "A geographical coordinate",
3-
"type": "object",
4-
"properties": {
5-
"latitude": { "type": "number" },
6-
"longitude": { "type": "number" }
7-
}
2+
"description": "A geographical coordinate",
3+
"type": "object",
4+
"properties": {
5+
"latitude": { "type": "number" },
6+
"longitude": { "type": "number" }
7+
}
88
}

0 commit comments

Comments
 (0)