Merge branch 'master' of https://github.com/json-schema-org/json-schema-org.github.io into json-schema-org-master

Author: gregsdennis

.gitignore

@@ -3,3 +3,5 @@
 _site/
 node_modules/
 .vscode/
+.jekyll-metadata
+vendor/

CONTRIBUTING.md

@@ -1,3 +1,3 @@
 Thank you for your interest in contributing to JSON Schema!  Your participation is appreciated!
 
-If your question/request/change concerns the [JSON Schema Website](json-schema.org) you are in the right place.  If your question/request/change concerns the JSON Schema specification drafts or meta-schemas, please go to [the JSON Schema specification repository](https://github.com/json-schema-org/json-schema-spec).
+If your question/request/change concerns the [JSON Schema Website](https://json-schema.org/) you are in the right place.  If your question/request/change concerns the JSON Schema specification drafts or meta-schemas, please go to [the JSON Schema specification repository](https://github.com/json-schema-org/json-schema-spec).

README.md

@@ -19,28 +19,17 @@ Labels are assigned based on [Sensible Github Labels](https://github.com/Releque
 ## Compile and run locally
 
 This site runs via github pages, with automatically building PR previews via netlify.
-If you wish to compile and run this site locally, you will need to have ruby installed.
-
-If you're not familiar with ruby, consider using `rvm` (https://rvm.io/).
-Once you have Ruby installed, follow these instructions while in the project directory
-
-> Instructions
->
->     1. Install the jekyll and bundler gems.
->
->     `gem install jekyll bundler`
->
->     2. Create a new Jekyll site at ./myblog.
->
->     ...
->
->     3. Build the site and make it available on a local server.
->
->     `bundle exec jekyll serve`
->
->     4. Browse to http://localhost:4000
-
-Adapted from https://jekyllrb.com/docs/
+
+This project uses git submodules, so you will need to run the following commands
+to fully clone the repo.
+
+```bash
+git submodule init
+git submodule update
+```
+
+You can run the site locally using `docker-compose up` and browse to
+http://localhost:4000
 
 ## License
 

_data/validator-libraries-modern.yml

@@ -37,6 +37,12 @@
       date-draft:
       draft: [7]
       license: BSD-2-Clause
+    - name: jsoncons
+      url: https://github.com/danielaparker/jsoncons/blob/master/doc/ref/jsonschema/jsonschema.md
+      notes: Header-only library
+      date-draft:
+      draft: [7]
+      license: Boost Software License 1.0
 - name: Clojure
   implementations:
     - name: jinx
@@ -121,6 +127,12 @@
       date-draft:
       draft: [7, 6, 4]
       license: Apache License 2.0
+    - name: jsonschemafriend
+      url: https://github.com/jimblackler/jsonschemafriend
+      notes:
+      date-draft: [2019-09]
+      draft: [7, 6, 4, 3]
+      license: Apache License 2.0
 - name: Kotlin
   implementations:
     - name: Medeia-validator
@@ -129,12 +141,21 @@
       date-draft:
       draft: [7, 6, 4]
       license: Apache License 2.0
+    - name: json-kotlin-schema
+      url: https://github.com/pwall567/json-kotlin-schema
+      notes: |
+        Kotlin implementation of JSON Schema.
+        (Currently supports most of Draft 7; see the README for details.
+        Full compliance with Draft 7 and later drafts in progress.)
+      date-draft:
+      draft: [7]
+      license: MIT
 - name: JavaScript
   implementations:
     - name: ajv
       url: https://github.com/ajv-validator/ajv
       notes: "for Node.js and browsers - supports [user-defined keywords](https://github.com/ajv-validator/ajv/blob/master/docs/keywords.md) and [$data reference](https://github.com/json-schema-org/json-schema-spec/issues/51)"
-      date-draft: [2019-09]
+      date-draft: [2019-09, 2020-12]
       draft: [7, 6, 4]
       license: MIT
     - name: djv
@@ -146,7 +167,7 @@
     - name: Hyperjump JSV
       url: https://github.com/jdesrosiers/json-schema
       notes: "Built for Node.js and browsers. Includes support for custom vocabularies."
-      date-draft: [2019-09]
+      date-draft: [2019-09, 2020-12]
       draft: [7, 6, 4]
       license: MIT
     - name: vue-vuelidate-jsonschema
@@ -162,17 +183,22 @@
       license: MIT
 - name: Perl
   implementations:
+    - name: JSON::Schema::Modern
+      url: https://github.com/karenetheridge/JSON-Schema-Modern
+      notes:
+      date-draft: [7, 2019-09, 2020-12]
+      license: "GNU General Public License, Version 1 + The Artistic License 1.0"
+    - name: JSON::Schema::Tiny
+      url: https://github.com/karenetheridge/JSON-Schema-Tiny
+      notes:
+      date-draft: [7, 2019-09, 2020-12]
+      license: "GNU General Public License, Version 1 + The Artistic License 1.0"
     - name: JSON::Validator
       url: https://github.com/mojolicious/json-validator
       notes:
       date-draft:
       draft: [7, 6, 4]
       license: "The Artistic License 2.0 (GPL Compatible)"
-    - name: JSON::Schema::Draft201909
-      url: https://github.com/karenetheridge/JSON-Schema-Draft201909
-      notes:
-      date-draft: [2019-09]
-      license: "GNU General Public License, Version 1 + The Artistic License 1.0"
 - name: PHP
   implementations:
     - name: Opis Json Schema
@@ -189,6 +215,12 @@
       license: "MIT"
 - name: Python
   implementations:
+    - name: jschon
+      url: https://github.com/marksparkza/jschon
+      notes:
+      date-draft: [2019-09, 2020-12]
+      draft:
+      license: MIT
     - name: jsonschema
       url: https://github.com/Julian/jsonschema
       notes:
@@ -202,7 +234,7 @@
       draft: [7, 6, 4]
       license: BSD-3-Clause
     - name: jsonschema-rs
-      url: https://github.com/Stranger6667/jsonschema-rs/python
+      url: https://github.com/Stranger6667/jsonschema-rs/tree/master/bindings/python
       notes: Python bindings to Rust's jsonschema crate
       date-draft:
       draft: [7, 6, 4]
@@ -256,6 +288,10 @@
       date-draft: [2019-09]
       draft: [7, 6, 4]
       notes: Powered by ajv; client-side validation
+    - name: jschon.dev
+      url: https://jschon.dev/
+      date-draft: [2020-12, 2019-09]
+      draft:
     - name: JSON Schema Validator
       url: https://www.jsonschemavalidator.net/
       date-draft: [2019-09]

_includes/footer.html

@@ -13,6 +13,7 @@ <h2 class="footer-heading">{{ site.title | escape }}</h2>
           </li>
           {% endif %}
           <li>Discussion: <a href="/slack">Slack</a> | <a href="https://groups.google.com/forum/#!forum/json-schema">Google Groups</a></li>
+          <li><a href="https://github.com/json-schema-org/community/discussions">GitHub Discussions</a></li>
           <li>Site edits: <a href="https://github.com/json-schema-org/json-schema-org.github.io">GitHub repo for site</a></li>
         </ul>
       </div>

_includes/header.html

@@ -25,6 +25,7 @@
             <a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
             {%- endif -%}
           {% endfor -%}
+          <a class="page-link" href="/blog">Blog</a>
           <a class="page-link" href="/slack">Join our Slack</a>
         </div>
       </nav>

docker-compose.yml

@@ -0,0 +1,11 @@
+version: "3.9"
+
+services:
+  web:
+    image: docker.io/jekyll/jekyll
+    volumes:
+      - .:/srv/jekyll:Z
+      - ./vendor/bundle:/usr/local/bundle:Z
+    ports:
+      - "4000:4000"
+    command: jekyll serve --incremental --watch

draft-06/json-schema-release-notes.md

@@ -70,19 +70,19 @@ The difficulty is that if you attempt to do this:
 {
     "type": "object",
     "allOf": [
-        {"$ref": "#/definitions/foo"},
-        {"$ref": "#/definitions/bar"}
+        { "$ref": "#/definitions/foo" },
+        { "$ref": "#/definitions/bar" }
     ],
     "definitions": {
         "foo": {
             "properties": {
-                "foo": {"type": "string"}
+                "foo": { "type": "string" }
             },
             "additionalProperties": false
         },
         "bar": {
             "properties": {
-                "bar": {"type": "number"}
+                "bar": { "type": "number" }
             },
             "additionalProperties": false
         }
@@ -100,30 +100,28 @@ A workaround is available with the new `"propertyNames"` keyword:
 {
     "type": "object",
     "allOf": [
-        {"$ref": "#/definitions/foo"},
-        {"$ref": "#/definitions/bar"}
-    ],
-    "anyOf": [
-        {"$ref": "#/definitions/fooNames"},
-        {"$ref": "#/definitions/barNames"}
+        { "$ref": "#/definitions/foo" },
+        { "$ref": "#/definitions/bar" }
     ],
+    "propertyNames": {
+        "anyOf": [
+            { "$ref": "#/definitions/fooNames" },
+            { "$ref": "#/definitions/barNames" }
+        ]
+    },
     "definitions": {
         "foo": {
             "properties": {
-                "foo": {"type": "string"}
+                "foo": { "type": "string" }
             }
         },
-        "fooNames": {
-            "propertyNames": {"enum": ["foo"]}
-        },
+        "fooNames": { "enum": ["foo"] },
         "bar": {
             "properties": {
-                "bar": {"type": "number"}
+                "bar": { "type": "number" }
             }
         },
-        "barNames": {
-            "propertyNames": {"enum": ["bar"]}
-        }
+        "barNames": { "enum": ["bar"] }
     }
 }
 ```

draft/2019-09/release-notes.md

@@ -3,8 +3,6 @@ title: JSON Schema 2019-09 Release Notes
 layout: page
 ---
 
-_NOTE: This page is still being written, and is currently a fairly minimal listing of changes._
-
 For the vast majority of schema authors, we hope that these changes are minimally disruptive.
 
 The most likely to be frustrating is that `format` is no longer treated as a validation assertion _by default_ (although it is still possible for an application or user to configure a validator to treat it as one).  We decided this was acceptable because many schema authors are already extremely frustrated by its inconsistent behavior.