Additional refactoring.

Author: Charlie Owen

.travis.yml

@@ -8,5 +8,4 @@ before_script:
 - PATH="./node_modules/.bin/:$PATH"
 script:
 - bundle exec jekyll build
-- ajv test -s schema -d address -d calendar -d card -d geo --valid
-- ajv test -s schema -d "_includes/example/*.json" --valid
+- ajv test -s schema -d "learn/examples/*.json" --valid

_config.yml

@@ -28,7 +28,7 @@ theme: minima
 
 header_pages:
 - specification.md
-- examples.md
+- learn/index.md
 - implementations.md
 
 exclude:

example/address.json

@@ -10,60 +10,47 @@ permalink: /
 **JSON Schema** is a vocabulary that allows you to **annotate** and **validate** JSON documents.
 
 
-Advantages
-----------
+## Advantages
 
 <div class="block" style="float:left;width:50%;" markdown="1">
 
 ### JSON Schema
 
--   describes your existing data format
--   clear, human- and machine-readable documentation
--   complete structural validation, useful for
-    -   automated testing
-    -   validating client-submitted data
+* Describes your existing data format(s).
+* Provides clear human- and machine- readable documentation.
+* Validates data which is useful for:
+    * Automated testing.
+    * Ensuring quality of client submitted data.
 </div>
 
 <div class="block" style="float:right;width:50%;" markdown="1">
 
 ### JSON Hyper-Schema
 
--   make any JSON format a hypermedia format - no constraints on document structure
--   use [URI Templates](https://tools.ietf.org/html/rfc6570) with instance data
--   describe client data for use with links using JSON Schema
--   recognize collections and collection items
+* Make any JSON format a hypermedia format with no constraints on document structure
+* Allows use of [URI Templates](https://tools.ietf.org/html/rfc6570) with instance data
+* Describe client data for use with links using JSON Schema.
+* Recognizes collections and collection items.
 
 </div>
 
-Project Status
---------------
+## Project Status
 
-The JSON Schema project intends to shepherd the Core, Validation, and Hyper-Schema specifications
-to RFC status.  Currently, we are continuing to improve our self-published Internet-Drafts.
-The next step will be to get the drafts adopted by an IETF Working Group.
+The JSON Schema project intends to shepherd the Core, Validation, and Hyper-Schema specifications to RFC status.  Currently, we are continuing to improve our self-published Internet-Drafts. The next step will be to get the drafts adopted by an IETF Working Group.
 
 In the meantime, publication of Internet-Draft documents can be tracked through the IETF:
-- [JSON Schema (core)](https://datatracker.ietf.org/doc/draft-handrews-json-schema/)
-- [JSON Schema Validation](https://datatracker.ietf.org/doc/draft-handrews-json-schema-validation/)
-- [JSON Hyper-Schema](https://datatracker.ietf.org/doc/draft-handrews-json-schema-hyperschema/)
-- [Relative JSON Pointers](https://datatracker.ietf.org/doc/draft-handrews-relative-json-pointer/)
+* [JSON Schema (core)](https://datatracker.ietf.org/doc/draft-handrews-json-schema/)
+* [JSON Schema Validation](https://datatracker.ietf.org/doc/draft-handrews-json-schema-validation/)
+* [JSON Hyper-Schema](https://datatracker.ietf.org/doc/draft-handrews-json-schema-hyperschema/)
+* [Relative JSON Pointers](https://datatracker.ietf.org/doc/draft-handrews-relative-json-pointer/)
 
-Internet-Drafts expire after six months, so our goal is to publish often enough to always have
-a set of unexpired drafts available.  There may be brief gaps as we wrap up each draft and finalize
-the text.
+Internet-Drafts expire after six months, so our goal is to publish often enough to always have a set of unexpired drafts available.  There may be brief gaps as we wrap up each draft and finalize the text.
 
-The intention, particularly for vocabularies such as validation which have been widely
-implemented, is to remain as compatible as possible from draft to draft.  However, these are still
-drafts, and given a clear enough need validated with the user community, major changes can occur.
+The intention, particularly for vocabularies such as validation which have been widely implemented, is to remain as compatible as possible from draft to draft.  However, these are still drafts, and given a clear enough need validated with the user community, major changes can occur.
 
-Progress on the next set of Internet-Drafts can be tracked on GitHub.
-The [draft-08](https://github.com/json-schema-org/json-schema-spec/milestone/6) milestone 
-will track the evolving scope of the draft
+Progress on the next set of Internet-Drafts can be tracked on GitHub. The [draft-08](https://github.com/json-schema-org/json-schema-spec/milestone/6) milestone will track the evolving scope of the draft
 
-<div style="clear:both"></div>
-
-Quickstart
-----------
+## Quickstart
 
 The JSON document being validated or described we call the *instance*, and the document containing the description is called the *schema*.
 
@@ -76,25 +63,23 @@ The most basic schema is a blank JSON object, which constrains nothing, allows a
 You can apply constraints on an instance by adding validation keywords to the schema. For example, the "type" keyword can be used to restrict an instance to an object, array, string, number, boolean, or null:
 
 ```json
-{"type": "string"}
+{ "type": "string" }
 ```
 
 JSON Schema is hypermedia ready, and ideal for annotating your existing JSON-based HTTP API. JSON Schema documents are identified by URIs, which can be used in HTTP Link headers, and inside JSON Schema documents to allow recursive definitions.
 
-More
-----
+## More
 
 Interested? Check out:
 
--   the [specification](specification.html)
--   some [examples](examples.md)
--   the growing list of [JSON (Hyper-)Schema software](implementations.html)
+* The [specification](./specification.md)
+* [Learning resources](./learn/index.md)
+* the growing list of [JSON (Hyper-)Schema software](./implementations.md)
 
-We encourage updating to the latest specification, as described by the draft-07 meta-schemas.  However, if you are still using draft-04, you may be interested in:
--   this [excellent guide](https://spacetelescope.github.io/understanding-json-schema/) for schema authors, from the [Space Telescope Science Institute](http://www.stsci.edu/)
+We encourage updating to the latest specification, as described by the draft-07 meta-schemas.
 
 Questions? Feeling helpful? Get involved on:
 
--   the [GitHub repo](http://github.com/json-schema-org/json-schema-spec)
--   the [Google Group](https://groups.google.com/forum/#!forum/json-schema)
--   the [Slack channel](https://join.slack.com/t/json-schema/shared_invite/enQtMjk1NDcyNDI2NTAwLTcyYmYwMjdmMmUxNzZjYzIxNGU2YjdkNzdlOGZiNjIwNDI2M2Y3NmRkYjA4YmMwODMwYjgyOTFlNWZjZjAyNjg)
+* [GitHub](http://github.com/json-schema-org/json-schema-spec)
+* [Google Groups](https://groups.google.com/forum/#!forum/json-schema)
+* [Slack](https://join.slack.com/t/json-schema/shared_invite/enQtMjk1NDcyNDI2NTAwLTcyYmYwMjdmMmUxNzZjYzIxNGU2YjdkNzdlOGZiNjIwNDI2M2Y3NmRkYjA4YmMwODMwYjgyOTFlNWZjZjAyNjg)

example/card.json

@@ -0,0 +1,34 @@
+{
+  "$id": "https://example.com/address.schema.json",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "description": "An address similar to http://microformats.org/wiki/h-card",
+  "type": "object",
+  "properties": {
+    "post-office-box": {
+      "type": "string"
+    },
+    "extended-address": {
+      "type": "string"
+    },
+    "street-address": {
+      "type": "string"
+    },
+    "locality": {
+      "type": "string"
+    },
+    "region": {
+      "type": "string"
+    },
+    "postal-code": {
+      "type": "string"
+    },
+    "country-name": {
+      "type": "string"
+    }
+  },
+  "required": [ "locality", "region", "country-name" ],
+  "dependencies": {
+    "post-office-box": [ "street-address" ],
+    "extended-address": [ "street-address" ]
+  }
+}

example/geo.json

@@ -1,38 +1,47 @@
 {
-  "$schema": "http://json-schema.org/draft-06/schema#",
+  "$id": "https://example.com/address.schema.json",
+  "$schema": "http://json-schema.org/draft-07/schema#",
   "description": "A representation of an event",
   "type": "object",
   "required": [ "dtstart", "summary" ],
   "properties": {
     "dtstart": {
-      "format": "date-time",
       "type": "string",
       "description": "Event starting time"
     },
     "dtend": {
-      "format": "date-time",
       "type": "string",
       "description": "Event ending time"
     },
-    "summary": { "type": "string" },
-    "___location": { "type": "string" },
-    "url": { "type": "string", "format": "uri" },
+    "summary": {
+      "type": "string"
+    },
+    "___location": {
+      "type": "string"
+    },
+    "url": {
+      "type": "string"
+    },
     "duration": {
-      "format": "time",
       "type": "string",
       "description": "Event duration"
     },
     "rdate": {
-      "format": "date-time",
       "type": "string",
       "description": "Recurrence date"
     },
     "rrule": {
       "type": "string",
       "description": "Recurrence rule"
     },
-    "category": { "type": "string" },
-    "description": { "type": "string" },
-    "geo": { "$ref": "http://json-schema.org/geo" }
+    "category": {
+      "type": "string"
+    },
+    "description": {
+      "type": "string"
+    },
+    "geo": {
+      "$ref": "http://example.com/geo.schema.json"
+    }
   }
 }