adiwg-json_schemas 0.5.0 → 0.5.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (22) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +1 -2
  3. data/examples/full_example.json +2 -3
  4. data/examples/lcc_project_example.json +1 -1
  5. data/examples/uri.json +9 -1
  6. data/lib/adiwg/json_schemas/version.rb +1 -1
  7. data/schema/schema/citation.json +37 -28
  8. data/schema/schema/contact.json +2 -2
  9. data/schema/schema/dataQuality.json +1 -1
  10. data/schema/schema/distributor.json +1 -1
  11. data/schema/schema/extent.json +11 -3
  12. data/schema/schema/geojson/geojson.json +4 -1
  13. data/schema/schema/keyword.json +1 -1
  14. data/schema/schema/metadata.json +7 -7
  15. data/schema/schema/resolution.json +2 -0
  16. data/schema/schema/resourceInfo.json +15 -15
  17. data/schema/schema.json +1 -1
  18. data/test/tc_schemas.rb +121 -115
  19. data/test/tc_utils.rb +1 -1
  20. metadata +2 -4
  21. data/examples/adiwg_project_example_1.json +0 -847
  22. data/examples/data_example.json +0 -371
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e32a203cca9fc8e322e972d9fc02167468b4b284
4
- data.tar.gz: 398186cdee6682807312ce9ce263dc0f427cbc5d
3
+ metadata.gz: fb711b0bee42f4f3e4e85400f2f69a6d1f111311
4
+ data.tar.gz: 49abe5300e521566cca461579b61a0809606eb03
5
5
  SHA512:
6
- metadata.gz: ca197b5fc1f98e90c64a597a5ff5eb7c46cd2f001452fac7cfb364d27e4c0a8f24563eb57774c92ed90f12637efd8ea21d3db1eb6ef29154bf22b42f617f0674
7
- data.tar.gz: 7c143f6b20b8e97ca6bd79b34b36ba42cb4abdac384e83e2d7c0c584327363c7dec778c4d49adf775c3503aa2f668bfe140a4c2505c12987766066ef555213c4
6
+ metadata.gz: 0d35ab73cdf11d39373493133f07453fca472c91d2bcd985a1344ed2bcbc492279f02eceb1b110f7def3b6babcdce0e0afda005de7ee1eeeda90049ccd56f3e0
7
+ data.tar.gz: 91a7ed01baea09e341dcb537ef66a4191ff6a7069587048975b05f5fb2efec71ba3715c5d2c701acd1cfe7e8a70360f67c27571ef4e8e4cfff781178d1dcd419
data/.travis.yml CHANGED
@@ -5,5 +5,4 @@ rvm:
5
5
  - 1.9.3
6
6
  - jruby-18mode
7
7
  - jruby-19mode
8
- - ruby-head
9
- - jruby-head
8
+ - ruby-head
data/examples/full_example.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version":{
3
3
  "name":"adiwgJSON",
4
- "version":"0.3.0"
4
+ "version":"0.5.0"
5
5
  },
6
6
  "contact":[
7
7
  {
@@ -1774,8 +1774,7 @@
1774
1774
  {
1775
1775
  "id":"timePeriod010",
1776
1776
  "description":"Period of borehole operation",
1777
- "beginPosition":"1977-12-14",
1778
- "endPosition":"2007-08-13"
1777
+ "beginPosition":"1977-12-14"
1779
1778
  }
1780
1779
  ]
1781
1780
  }
data/examples/lcc_project_example.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": {
3
3
  "name": "adiwgJSON",
4
- "version": "0.3.0"
4
+ "version": "0.5.0"
5
5
  },
6
6
  "contact": [
7
7
  {
data/examples/uri.json CHANGED
@@ -3,5 +3,13 @@
3
3
  "mailto:info@datypic.com",
4
4
  "ftp://test.net/%C3%A9dition.html",
5
5
  "http://datypic.com/prod.html#shirt",
6
- "urn:example:org"
6
+ "urn:example:org",
7
+ "ftp://ftp.is.co.za/rfc/rfc1808.txt",
8
+ "http://www.ietf.org/rfc/rfc2396.txt",
9
+ "ldap://[2001:db8::7]/c=GB?objectClass?one",
10
+ "mailto:John.Doe@example.com",
11
+ "news:comp.infosystems.www.servers.unix",
12
+ "tel:+1-816-555-1212",
13
+ "telnet://192.0.2.16:80/",
14
+ "urn:oasis:names:specification:docbook:dtd:xml:4.1.2"
7
15
  ]
data/lib/adiwg/json_schemas/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module ADIWG
2
2
  module JsonSchemas
3
3
  # Current schema version number
4
- VERSION = "0.5.0"
4
+ VERSION = "0.5.2"
5
5
  end
6
6
  end
data/schema/schema/citation.json CHANGED
@@ -4,39 +4,14 @@
4
4
  "description": "schema for citation",
5
5
  "type": "object",
6
6
  "required": ["title", "date"],
7
- "properties": {
8
- "edition": {
9
- "type": "string"
10
- },
11
- "presentationForm": {
12
- "type": "array",
13
- "items": {
14
- "type": "string"
15
- }
16
- },
17
- "additionalIdentifier": {
18
- "type": "object",
19
- "properties": {
20
- "doi": {
21
- "type": "string"
22
- },
23
- "isbn": {
24
- "type": "string"
25
- },
26
- "issn": {
27
- "type": "string"
28
- }
29
- }
30
- }
31
- },
32
7
  "allOf": [
33
8
  {
34
- "$ref": "#/definitions/citationBase"
9
+ "$ref": "#/definitions/citationMain"
35
10
  }
36
11
  ],
37
12
  "definitions": {
38
13
  "citationBase": {
39
- "title": "citation",
14
+ "title": "base citation",
40
15
  "description": "base schema for citation, date not required",
41
16
  "type": "object",
42
17
  "required": ["title"],
@@ -72,11 +47,45 @@
72
47
  "onlineResource": {
73
48
  "type": "array",
74
49
  "items": {
75
- "$ref": "./onlineResource.json#"
50
+ "$ref": "onlineResource.json#"
76
51
  }
77
52
  }
78
53
  }
79
54
  },
55
+ "citationMain": {
56
+ "type": "object",
57
+ "title": "citation",
58
+ "properties": {
59
+ "edition": {
60
+ "type": "string"
61
+ },
62
+ "presentationForm": {
63
+ "type": "array",
64
+ "items": {
65
+ "type": "string"
66
+ }
67
+ },
68
+ "additionalIdentifier": {
69
+ "type": "object",
70
+ "properties": {
71
+ "doi": {
72
+ "type": "string"
73
+ },
74
+ "isbn": {
75
+ "type": "string"
76
+ },
77
+ "issn": {
78
+ "type": "string"
79
+ }
80
+ }
81
+ }
82
+ },
83
+ "allOf": [
84
+ {
85
+ "$ref": "#/definitions/citationBase"
86
+ }
87
+ ]
88
+ },
80
89
  "resourceIdentifier": {
81
90
  "title": "resource identifier",
82
91
  "description": "Assigned identifier for a resource, based on citation",
data/schema/schema/contact.json CHANGED
@@ -93,7 +93,7 @@
93
93
  "onlineResource": {
94
94
  "type": "array",
95
95
  "items": {
96
- "$ref": "./onlineResource.json#"
96
+ "$ref": "onlineResource.json#"
97
97
  },
98
98
  "uniqueItems": true
99
99
  },
@@ -129,7 +129,7 @@
129
129
  "onlineResource": {
130
130
  "type": "array",
131
131
  "items": {
132
- "$ref": "./onlineResource.json#"
132
+ "$ref": "onlineResource.json#"
133
133
  },
134
134
  "uniqueItems": true
135
135
  },
data/schema/schema/dataQuality.json CHANGED
@@ -68,7 +68,7 @@
68
68
  "type": "string"
69
69
  },
70
70
  "citation": {
71
- "$ref": "./citation.json#"
71
+ "$ref": "citation.json#"
72
72
  },
73
73
  "processStep": {
74
74
  "type": "array",
data/schema/schema/distributor.json CHANGED
@@ -47,7 +47,7 @@
47
47
  "online": {
48
48
  "type": "array",
49
49
  "items": {
50
- "$ref": "./onlineResource.json#"
50
+ "$ref": "onlineResource.json#"
51
51
  },
52
52
  "uniqueItems": true
53
53
  },
data/schema/schema/extent.json CHANGED
@@ -18,7 +18,7 @@
18
18
  },
19
19
  "oneOf": [
20
20
  {
21
- "$ref": "./geojson/geojson.json#"
21
+ "$ref": "geojson/geojson.json#"
22
22
  }
23
23
  ]
24
24
  }
@@ -53,7 +53,6 @@
53
53
  },
54
54
  "timePeriod": {
55
55
  "type": "object",
56
- "required": ["beginPosition", "endPosition"],
57
56
  "additionalProperties": false,
58
57
  "properties": {
59
58
  "id": {
@@ -68,7 +67,16 @@
68
67
  "endPosition": {
69
68
  "$ref": "../schema.json#/definitions/date"
70
69
  }
71
- }
70
+ },
71
+ "anyOf": [
72
+ {
73
+ "title": "beginPosition required",
74
+ "required": ["beginPosition"]
75
+ }, {
76
+ "title": "endPosition required",
77
+ "required": ["endPosition"]
78
+ }
79
+ ]
72
80
  },
73
81
  "temporalElement": {
74
82
  "type": "object",
data/schema/schema/geojson/geojson.json CHANGED
@@ -98,7 +98,7 @@
98
98
  "title": "featureProperties",
99
99
  "properties": {
100
100
  "includesData": {
101
- "type": ["boolean", "null"]
101
+ "type": "boolean"
102
102
  },
103
103
  "temporalElement": {
104
104
 
@@ -110,6 +110,9 @@
110
110
  "$ref": "../extent.json#/definitions/verticalExtent"
111
111
  }
112
112
  },
113
+ "description": {
114
+ "type": "string"
115
+ },
113
116
  "featureName": {
114
117
  "type": "string"
115
118
  },
data/schema/schema/keyword.json CHANGED
@@ -29,7 +29,7 @@
29
29
  "$ref": "../schema.json#/definitions/url"
30
30
  },
31
31
  "citation": {
32
- "$ref": "citation.json#/definitions/citationBase"
32
+ "$ref": "citation.json#/definitions/citationMain"
33
33
  }
34
34
  }
35
35
  }
data/schema/schema/metadata.json CHANGED
@@ -46,18 +46,18 @@
46
46
  "type": "string"
47
47
  },
48
48
  "metadataMaintenance": {
49
- "$ref": "./maintInfo.json#"
49
+ "$ref": "maintInfo.json#"
50
50
  }
51
51
  }
52
52
  },
53
53
  "resourceInfo": {
54
- "$ref": "./resourceInfo.json#"
54
+ "$ref": "resourceInfo.json#"
55
55
  },
56
56
  "distributionInfo": {
57
57
  "type": "array",
58
58
  "minItems": 1,
59
59
  "items": {
60
- "$ref": "./distributor.json#"
60
+ "$ref": "distributor.json#"
61
61
  }
62
62
  },
63
63
  "associatedResource": {
@@ -75,15 +75,15 @@
75
75
  "type": "string"
76
76
  },
77
77
  "resourceCitation": {
78
- "$ref": "./citation.json#"
78
+ "$ref": "citation.json#"
79
79
  },
80
80
  "metadataCitation": {
81
- "$ref": "./citation.json#"
81
+ "$ref": "citation.json#"
82
82
  },
83
83
  "resourceIdentifier": {
84
84
  "type": "array",
85
85
  "items": {
86
- "$ref": "./citation.json#/definitions/resourceIdentifier"
86
+ "$ref": "citation.json#/definitions/resourceIdentifier"
87
87
  }
88
88
  }
89
89
  }
@@ -94,7 +94,7 @@
94
94
  "type": "array",
95
95
  "minItems": 1,
96
96
  "items": {
97
- "$ref": "./citation.json#"
97
+ "$ref": "citation.json#"
98
98
  }
99
99
  }
100
100
  }
data/schema/schema/resolution.json CHANGED
@@ -5,6 +5,7 @@
5
5
  "anyOf": [
6
6
  {
7
7
  "type": "object",
8
+ "title": "scaleFactor",
8
9
  "required": ["equivalentScale"],
9
10
  "additionalProperties": true,
10
11
  "properties": {
@@ -14,6 +15,7 @@
14
15
  }
15
16
  }, {
16
17
  "type": "object",
18
+ "title": "distance",
17
19
  "required": ["distance"],
18
20
  "additionalProperties": true,
19
21
  "properties": {
data/schema/schema/resourceInfo.json CHANGED
@@ -7,12 +7,12 @@
7
7
  "additionalProperties": false,
8
8
  "properties": {
9
9
  "citation": {
10
- "$ref": "./citation.json#"
10
+ "$ref": "citation.json#"
11
11
  },
12
12
  "resourceIdentifier": {
13
13
  "type": "array",
14
14
  "items": {
15
- "$ref": "./citation.json#/definitions/resourceIdentifier"
15
+ "$ref": "citation.json#/definitions/resourceIdentifier"
16
16
  }
17
17
  },
18
18
  "pointOfContact": {
@@ -20,7 +20,7 @@
20
20
  "minItems": 1,
21
21
  "uniqueItems": true,
22
22
  "items": {
23
- "$ref": "./contact.json#/definitions/contactRef"
23
+ "$ref": "contact.json#/definitions/contactRef"
24
24
  }
25
25
  },
26
26
  "abstract": {
@@ -70,57 +70,57 @@
70
70
  "minItems": 1,
71
71
  "uniqueItems": true,
72
72
  "items": {
73
- "$ref": "./distributor.json#/definitions/format"
73
+ "$ref": "distributor.json#/definitions/format"
74
74
  }
75
75
  },
76
76
  "keyword": {
77
77
  "type": "array",
78
78
  "uniqueItems": true,
79
79
  "items": {
80
- "$ref": "./keyword.json"
80
+ "$ref": "keyword.json"
81
81
  }
82
82
  },
83
83
  "resourceMaintenance": {
84
84
  "type": "array",
85
85
  "items": {
86
- "$ref": "./maintInfo.json#"
86
+ "$ref": "maintInfo.json#"
87
87
  }
88
88
  },
89
89
  "resourceSpecificUsage": {
90
90
  "type": "array",
91
91
  "uniqueItems": true,
92
92
  "items": {
93
- "$ref": "./usage.json"
93
+ "$ref": "usage.json"
94
94
  }
95
95
  },
96
96
  "graphicOverview": {
97
97
  "type": "array",
98
98
  "items": {
99
- "$ref": "./graphicOverview.json#"
99
+ "$ref": "graphicOverview.json#"
100
100
  }
101
101
  },
102
102
  "constraint": {
103
103
  "type": "object",
104
104
  "properties": {
105
105
  "useLimitation": {
106
- "$ref": "./resourceConstraint.json#/definitions/useLimitation"
106
+ "$ref": "resourceConstraint.json#/definitions/useLimitation"
107
107
  },
108
108
  "legalConstraint": {
109
109
  "type": "array",
110
110
  "items": {
111
- "$ref": "./resourceConstraint.json#/definitions/legalConstraint"
111
+ "$ref": "resourceConstraint.json#/definitions/legalConstraint"
112
112
  }
113
113
  },
114
114
  "securityConstraint": {
115
115
  "type": "array",
116
116
  "items": {
117
- "$ref": "./resourceConstraint.json#/definitions/securityConstraint"
117
+ "$ref": "resourceConstraint.json#/definitions/securityConstraint"
118
118
  }
119
119
  }
120
120
  }
121
121
  },
122
122
  "taxonomy": {
123
- "$ref": "./taxonomy.json"
123
+ "$ref": "taxonomy.json"
124
124
  },
125
125
  "spatialDatum": {
126
126
  "description": "Description of the spatial and temporal reference systems used in the dataset.",
@@ -138,19 +138,19 @@
138
138
  "spatialResolution": {
139
139
  "type": "array",
140
140
  "items": {
141
- "$ref": "./resolution.json"
141
+ "$ref": "resolution.json"
142
142
  }
143
143
  },
144
144
  "extent": {
145
145
  "type": "array",
146
146
  "items": {
147
- "$ref": "./extent.json"
147
+ "$ref": "extent.json"
148
148
  }
149
149
  },
150
150
  "dataQualityInfo": {
151
151
  "type": "array",
152
152
  "items": {
153
- "$ref": "./dataQuality.json#"
153
+ "$ref": "dataQuality.json#"
154
154
  }
155
155
  },
156
156
  "supplementalInfo": {
data/schema/schema.json CHANGED
@@ -33,7 +33,7 @@
33
33
  },
34
34
  "uri": {
35
35
  "type": "string",
36
- "pattern": "((?<=\\()[A-Za-z][A-Za-z0-9\\+\\.\\-]*:([A-Za-z0-9\\.\\-_~:/\\?#\\[\\]@!\\$&'\\(\\)\\*\\+,;=]|%[A-Fa-f0-9]{2})+(?=\\)))|([A-Za-z][A-Za-z0-9\\+\\.\\-]*:([A-Za-z0-9\\.\\-_~:/\\?#\\[\\]@!\\$&'\\(\\)\\*\\+,;=]|%[A-Fa-f0-9]{2})+)"
36
+ "pattern": "([A-Za-z][A-Za-z0-9+\\-.]*):(?:(//)(?:((?:[A-Za-z0-9\\-._~!$&'()*+,;=:]|%[0-9A-Fa-f]{2})*)@)?((?:\\[(?:(?:(?:(?:[0-9A-Fa-f]{1,4}:){6}|::(?:[0-9A-Fa-f]{1,4}:){5}|(?:[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){4}|(?:(?:[0-9A-Fa-f]{1,4}:){0,1}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){3}|(?:(?:[0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){2}|(?:(?:[0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})?::[0-9A-Fa-f]{1,4}:|(?:(?:[0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})?::)(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))|(?:(?:[0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})?::[0-9A-Fa-f]{1,4}|(?:(?:[0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})?::)|[Vv][0-9A-Fa-f]+\\.[A-Za-z0-9\\-._~!$&'()*+,;=:]+)\\]|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|(?:[A-Za-z0-9\\-._~!$&'()*+,;=]|%[0-9A-Fa-f]{2})*))(?::([0-9]*))?((?:/(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f]{2})*)*)|/((?:(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f]{2})+(?:/(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f]{2})*)*)?)|((?:[A-Za-z0-9\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f]{2})+(?:/(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f]{2})*)*)|)(?:\\?((?:[A-Za-z0-9\\-._~!$&'()*+,;=:@/?]|%[0-9A-Fa-f]{2})*))?(?:\\#((?:[A-Za-z0-9\\-._~!$&'()*+,;=:@/?]|%[0-9A-Fa-f]{2})*))?"
37
37
  },
38
38
  "date": {
39
39
  "type": "string",