Merge remote-tracking branch 'origin/master'

Author: awwright

README.md

@@ -1,36 +1,13 @@
-## Welcome to JSON Schema
+## Repo for the JSON Schema website!
 
-This repository contains the current, and historical, JSON Schema
-specifications, along wit a CommonJS implementation (authored by Kris Zyp, one
-of the initiators of JSON Schema).
+This repo is currently undergoing a complete restructuring and removing of content not related to the website.
+It was a copy of the gh-pages branch over on the old org repo.
 
-## Call for reviews
-
-Specifications are starting to get written. Reviews, comments and suggestions
-are of paramount importance to JSON Schema. It is humbly asked to you, dear
-reader, that you bring your contribution.
-
-Proposed specifications are here:
-
-https://github.com/json-schema/json-schema/tree/next/proposals
-
-Pull requests _will_ be considered.
-
-## The wiki
- 
-The <a href="https://github.com/json-schema/json-schema/wiki">wiki</a> contains
-a detailed description of JSON Schema, and discussion about the next version of
-the specification.
-
-## The website
+For current work on JSON Schema, please see https://github.com/json-schema-org/json-schema-spec
 
 The JSON Schema web site is at http://json-schema.org
 
-Note that the content of the aforementioned web site is available from this
-repository (branch <tt>gh-pages</tt>). Pull requests to improve the content of
-the site will be considered.
 
 ## License
 
 The source material in this repository is licensed under the AFL or BSD license. 
-

content/implementations.html

@@ -4,7 +4,7 @@
 
 	<p>Implementations below are classified based on their functionality.  When known, the
 	license of the project is also mentioned.</p>
-	
+
 	<p>If you have updates to this list, Look at the <a href="https://github.com/json-schema/json-schema">GitHub repo</a>
 	under the gh-pages branch</p>
 </div>
@@ -104,7 +104,7 @@ <h3>Online (web tool)</h3>
 </div>
 
 <div class="show-hide" data-target="schema-generation-list"></div>
-<h2>Schema generation (5)</h2>
+<h2>Schema generation (7)</h2>
 <div class="block" id="schema-generation-list">
 	<h3>.NET</h3>
 	<ul>
@@ -115,6 +115,7 @@ <h3>.NET</h3>
 	<h3>Online (web tool)</h3>
 	<ul>
 		<li><a href="http://www.jsonschema.net/">jsonschema.net</a> - generates schemas from example data</li>
+		<li><a id="link-impl-guru-ui" href="http://schemaguru.snowplowanalytics.com/">Schema Guru Web UI</a> - derives precise Schemas using several JSON instances. Based on <a href="link-impl-guru">Schema Guru</a></li>
 	</ul>
 
 	<h3>TypeScript</h3>
@@ -131,6 +132,11 @@ <h3>Python</h3>
 	<ul>
 		<li><a id="link-impl-jsl" href="https://github.com/aromanovich/jsl">JSL</a> (BSD) - a Python DSL for defining JSON Schemas</li>
 	</ul>
+
+	<h3>Scala</h3>
+	<ul>
+		<li><a id="link-impl-guru" href="https://github.com/snowplow/schema-guru">Schema Guru</a> (Apache 2.0) - CLI util, Spark Job and Web UI for deriving JSON Schemas out of corpus of JSON instances</li>
+	</ul>
 </div>
 
 <div class="show-hide" data-target="parsing-list"></div>
@@ -176,12 +182,13 @@ <h3>JavaScript</h3>
 </div>
 
 <div class="show-hide" data-target="documentation-list"></div>
-<h2>Documentation generation (2)</h2>
+<h2>Documentation generation (4)</h2>
 <div class="block" id="documentation-list">
 	<h3>JavaScript</h3>
 	<ul>
 		<li><a id="link-impl-matic" href="https://github.com/mattyod/matic">Matic</a> (MIT)</li>
 		<li><a id="link-impl-docson" href="https://github.com/lbovet/docson">Docson</a> (Apache 2.0)</li>
+    <li><a id="link-impl-docs-generator" href="https://github.com/cloudflare/json-schema-docs-generator/">json-schema-docs-generator</a> (MIT)</li>
 	</ul>
 </div>
 

implementations.html

@@ -38,7 +38,7 @@ <h1>json-schema.org</h1>
 </div>
 
 <div class="show-hide" data-target="validator-list"></div>
-<h2>Validators (32)</h2>
+<h2>Validators (37)</h2>
 <div class="block" id="validator-list">
 	<h3>JavaScript</h3>
 	<ul>
@@ -93,6 +93,7 @@ <h3>PHP</h3>
 		<li><a id="link-impl-php-json-schema" href="https://github.com/hasbridge/php-json-schema">php-json-schema</a> (MIT)</li>
 		<li><a id="link-impl-json-schema" href="https://github.com/justinrainbow/json-schema">json-schema</a> (Berkeley)</li>
 		<li><a id="link-impl-jvalidator" href="https://github.com/brainly/jvalidator">jvalidator</a> (BSD3)</li>
+		<li><a id="link-impl-json-guard" href="https://github.com/thephpleague/json-guard">JSON Guard</a> (MIT)</li>
 	</ul>
 
 	<h3>.NET</h3>
@@ -113,6 +114,7 @@ <h3>C</h3>
 	<h3>C++</h3>
 	<ul>
 		<li><a id="link-impl-libvariant" href="https://bitbucket.org/gallen/libvariant">LibVariant</a> (LGPLv2)</li>
+		<li><a id="link-impl-valijson" href="https://github.com/tristanpenman/valijson">Valijson</a> - header-only library, <em>supports version 4</em> (Simplified BSD)</li>
 	</ul>
 
 	<h3>Haskell</h3>
@@ -191,6 +193,15 @@ <h3>JavaScript</h3>
 		<li><a id="link-impl-schematic-ipsum" href="http://schematic-ipsum.herokuapp.com/">Schematic Ipsum</a> (MIT)</li>
 		<li><a id="link-impl-json-schema-instantiator" href="https://github.com/tomarad/JSON-Schema-Instantiator">JSON-Schema-Instantiator</a> (MIT)</li>
 		<li><a id="link-impl-json-schema-random" href="https://github.com/andreineculau/json-schema-random">JSON Schema Random</a> (Apache 2.0)</li>
+</div>
+<div class="show-hide" data-target="code-generation-list"></div>
+<h2>Code generation (1)</h2>
+<div class="block" id="code-generation-list">
+	<h3>Scala</h3>
+	<ul>
+		<li><a id="link-impl-json-schema-codegen"
+			   href="https://github.com/VoxSupplyChain/json-schema-codegen">json-schema-codegen</a> (Apache 2.0) -
+			generates Scala types from JSON schemas</li>
 	</ul>
 </div>
 
@@ -220,13 +231,13 @@ <h3>JavaScript</h3>
 </div>
 
 <div class="show-hide" data-target="editors-list"></div>
-<h2>Editors (2)</h2>
+<h2>Editors (3)</h2>
 <div class="block" id="editors-list">
 	<h3>Integration</h3>
 	<ul>
 		<li><a id="link-impl-visualstudio" href="http://www.visualstudio.com/">Visual Studio 2013</a> - <em>Auto-completion and tooltips based on JSON schema v3 and v4</em></li>
-        <li><a id="link-impl-jsonbuddy" href="http://www.json-buddy.com/">JSONBuddy</a> - <em>Grid-style JSON editor and context sensitive entry-helpers based on JSON schema</em></li>
-        <li><a id="link-impl-vim" href="https://github.com/Quramy/vison">Vim</a> - <em>Omnicomplete provider for editing json file Vim based on JSON schema</em></li>
+        	<li><a id="link-impl-jsonbuddy" href="http://www.json-buddy.com/">JSONBuddy</a> - <em>Grid-style JSON editor and context sensitive entry-helpers based on JSON schema</em></li>
+        	<li><a id="link-impl-resharer" href="https://www.jetbrains.com/resharper/">ReSharper 2016.1</a> - <em>code completion, inspections and quick fixes for JSON schema in Visual Studio 2010 - 2015, including support for JSON Path and regular expressions for schema editing</em></li>
 	</ul>
 </div>
 
@@ -264,12 +275,13 @@ <h3>Command line</h3>
 </div>
 
 <div class="show-hide" data-target="documentation-list"></div>
-<h2>Documentation generation (3)</h2>
+<h2>Documentation generation (4)</h2>
 <div class="block" id="documentation-list">
 	<h3>JavaScript</h3>
 	<ul>
 		<li><a id="link-impl-matic" href="https://github.com/mattyod/matic">Matic</a> (MIT)</li>
 		<li><a id="link-impl-docson" href="https://github.com/lbovet/docson">Docson</a> (Apache 2.0)</li>
+    <li><a id="link-impl-docs-generator" href="https://github.com/cloudflare/json-schema-docs-generator/">json-schema-docs-generator</a> (MIT)</li>
 	</ul>
 
   <h3>Ruby</h3>

index.html

@@ -1,4 +1,4 @@
-
+<!-- json-schema-org confirmation -->
 <html>
 	<head>
 		<title>JSON Schema and Hyper-Schema</title>