Merge commit '8bff7e3c726f3adcb9f16a54fa5f510028c4c151'

* commit '8bff7e3c726f3adcb9f16a54fa5f510028c4c151':
  Squashed 'json/' changes from 3481a79..27f8c84

Author: Julian

json/.travis.yml

@@ -1,4 +1,9 @@
 language: python
 python: "2.7"
-install: pip install jsonschema
-script: bin/jsonschema_suite check
+node_js: "6"
+install:
+  - pip install tox
+  - npm install
+script:
+  - tox
+  - npm test

json/README.md

@@ -1,4 +1,4 @@
-JSON Schema Test Suite [![Build Status](https://travis-ci.org/json-schema/JSON-Schema-Test-Suite.png?branch=develop)](https://travis-ci.org/json-schema/JSON-Schema-Test-Suite)
+JSON Schema Test Suite [![Build Status](https://travis-ci.org/json-schema-org/JSON-Schema-Test-Suite.svg?branch=master)](https://travis-ci.org/json-schema-org/JSON-Schema-Test-Suite)
 ======================
 
 This repository contains a set of JSON objects that implementors of JSON Schema
@@ -64,17 +64,26 @@ This suite is being used by:
 
 * [jsck](https://github.com/pandastrike/jsck)
 
+### C++ ###
+
+* [Modern C++ JSON schema validator](https://github.com/pboettch/json-schema-validator)
+
 ### Dart ###
 
 * [json_schema](https://github.com/patefacio/json_schema) 
 
+### Elixir ###
+
+* [ex_json_schema](https://github.com/jonasschmidt/ex_json_schema)
+
 ### Erlang ###
 
-* [jesse](https://github.com/klarna/jesse)
+* [jesse](https://github.com/for-GET/jesse)
 
 ### Go ###
 
 * [gojsonschema](https://github.com/sigu-399/gojsonschema) 
+* [validate-json](https://github.com/cesanta/validate-json)
 
 ### Haskell ###
 
@@ -83,9 +92,11 @@ This suite is being used by:
 
 ### Java ###
 
-* [json-schema-validator](https://github.com/fge/json-schema-validator)
+* [json-schema-validator](https://github.com/daveclayton/json-schema-validator)
+* [everit-org/json-schema](https://github.com/everit-org/json-schema)
+* [networknt/json-schema-validator](https://github.com/networknt/json-schema-validator)
 
-### Javascript ###
+### JavaScript ###
 
 * [json-schema-benchmark](https://github.com/Muscula/json-schema-benchmark)
 * [direct-schema](https://github.com/IreneKnapp/direct-schema)
@@ -100,14 +111,26 @@ This suite is being used by:
 * [tv4](https://github.com/geraintluff/tv4)
 * [z-schema](https://github.com/zaggino/z-schema)
 * [jsen](https://github.com/bugventure/jsen)
+* [ajv](https://github.com/epoberezkin/ajv)
+* [djv](https://github.com/korzio/djv)
+
+### Node.js ###
+
+The JSON Schema Test Suite is also available as an
+[npm](https://www.npmjs.com/package/json-schema-test-suite) package.
+Node-specific support is maintained on the [node branch](https://github.com/json-schema-org/JSON-Schema-Test-Suite/tree/node).
+See [NODE-README.md](https://github.com/json-schema-org/JSON-Schema-Test-Suite/blob/node/NODE-README.md)
+for more information.
 
 ### .NET ###
 
 * [Newtonsoft.Json.Schema](https://github.com/JamesNK/Newtonsoft.Json.Schema)
+* [Manatee.Json](https://github.com/gregsdennis/Manatee.Json)
 
 ### PHP ###
 
 * [json-schema](https://github.com/justinrainbow/json-schema)
+* [json-guard](https://github.com/thephpleague/json-guard)
 
 ### Python ###
 
@@ -125,6 +148,14 @@ This suite is being used by:
 
 * [JSONSchema](https://github.com/kylef/JSONSchema.swift)
 
+### Clojure ###
+
+* [json-schema](https://github.com/tatut/json-schema)
+
+### PostgreSQL ###
+
+* [postgres-json-schema](https://github.com/gavinwahl/postgres-json-schema)
+
 If you use it as well, please fork and send a pull request adding yourself to
 the list :).
 
@@ -134,5 +165,5 @@ Contributing
 If you see something missing or incorrect, a pull request is most welcome!
 
 There are some sanity checks in place for testing the test suite. You can run
-them with `bin/jsonschema_suite check`. They will be run automatically by
+them with `bin/jsonschema_suite check && npm test` or `tox && npm test`. They will be run automatically by
 [Travis CI](https://travis-ci.org/) as well.

json/bin/jsonschema_suite

@@ -38,47 +38,29 @@ else:
     )
 
 
-ROOT_DIR = os.path.join(
-    os.path.dirname(__file__), os.pardir).rstrip("__pycache__")
+ROOT_DIR = os.path.abspath(
+    os.path.join(os.path.dirname(__file__), os.pardir).rstrip("__pycache__"),
+)
 SUITE_ROOT_DIR = os.path.join(ROOT_DIR, "tests")
 
 REMOTES = {
-    "integer.json": {"type": "integer"},
+    "integer.json": {u"type": u"integer"},
+    "name.json": {
+        u"type": "string",
+        u"definitions": {
+            u"orNull": {u"anyOf": [{u"type": u"null"}, {u"$ref": u"#"}]},
+        },
+    },
     "subSchemas.json": {
-        "integer": {"type": "integer"},
-        "refToInteger": {"$ref": "#/integer"},
+        u"integer": {u"type": u"integer"},
+        u"refToInteger": {u"$ref": u"#/integer"},
     },
-    "folder/folderInteger.json": {"type": "integer"}
+    "folder/folderInteger.json": {u"type": u"integer"}
 }
 REMOTES_DIR = os.path.join(ROOT_DIR, "remotes")
 
-TESTSUITE_SCHEMA = {
-    "$schema": "http://json-schema.org/draft-03/schema#",
-    "type": "array",
-    "items": {
-        "type": "object",
-        "properties": {
-            "description": {"type": "string", "required": True},
-            "schema": {"required": True},
-            "tests": {
-                "type": "array",
-                "items": {
-                    "type": "object",
-                    "properties": {
-                        "description": {"type": "string", "required": True},
-                        "data": {"required": True},
-                        "valid": {"type": "boolean", "required": True}
-                    },
-                    "additionalProperties": False
-                },
-                "minItems": 1
-            }
-        },
-        "additionalProperties": False,
-        "minItems": 1
-    }
-}
-
+with open(os.path.join(ROOT_DIR, "test-schema.json")) as schema:
+    TESTSUITE_SCHEMA = json.load(schema)
 
 def files(paths):
     for path in paths:
@@ -164,10 +146,19 @@ class SanityTests(unittest.TestCase):
                 self.fail(str(error))
 
     def test_remote_schemas_are_updated(self):
-        for url, schema in REMOTES.items():
-            filepath = os.path.join(REMOTES_DIR, url)
-            with open(filepath) as schema_file:
-                self.assertEqual(json.load(schema_file), schema)
+        files = {}
+        for parent, _, paths in os.walk(REMOTES_DIR):
+            for path in paths:
+                absolute_path = os.path.join(parent, path)
+                with open(absolute_path) as schema_file:
+                    files[absolute_path] = json.load(schema_file)
+
+        self.assertEqual(
+            files, {
+                os.path.join(REMOTES_DIR, path): contents
+                for path, contents in REMOTES.iteritems()
+            },
+        )
 
 
 def main(arguments):

json/index.js

@@ -0,0 +1,32 @@
+'use strict';
+
+var Ajv = require('ajv');
+var jsonSchemaTest = require('json-schema-test');
+var assert = require('assert');
+
+var refs = {
+  'http://localhost:1234/integer.json': require('./remotes/integer.json'),
+  'http://localhost:1234/subSchemas.json': require('./remotes/subSchemas.json'),
+  'http://localhost:1234/folder/folderInteger.json': require('./remotes/folder/folderInteger.json'),
+  'http://localhost:1234/name.json': require('./remotes/name.json')
+};
+
+runTest(4);
+runTest(6);
+
+function runTest(draft) {
+  var opts = {format: 'full'};
+  if (draft == 4) opts.meta = false;
+  var ajv = new Ajv(opts);
+  ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json'));
+  if (draft == 4) ajv._opts.defaultMeta = 'http://json-schema.org/draft-04/schema#';
+  for (var uri in refs) ajv.addSchema(refs[uri], uri);
+
+  jsonSchemaTest(ajv, {
+    description: 'Test suite draft-0' + draft,
+    suites: {tests: './tests/draft' + draft + '/{**/,}*.json'},
+    skip: draft == 4 ? ['optional/zeroTerminatedFloats'] : [],
+    cwd: __dirname,
+    hideFolder: 'tests/'
+  });
+}

json/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "json-schema-test-suite",
+  "version": "0.1.0",
+  "description": "A language agnostic test suite for the JSON Schema specifications",
+  "main": "index.js",
+  "scripts": {
+    "test": "mocha index.js -R spec"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/json-schema-org/JSON-Schema-Test-Suite.git"
+  },
+  "keywords": [
+    "json-schema",
+    "tests"
+  ],
+  "author": "http://json-schema.org",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/json-schema-org/JSON-Schema-Test-Suite/issues"
+  },
+  "homepage": "https://github.com/json-schema-org/JSON-Schema-Test-Suite#readme",
+  "devDependencies": {
+    "ajv": "^5.0.4-beta.1",
+    "json-schema-test": "^1.3.0",
+    "mocha": "^3.2.0"
+  }
+}

json/remotes/name.json

@@ -0,0 +1,11 @@
+{
+    "definitions": {
+        "orNull": {
+            "anyOf": [
+                {"type": "null"},
+                {"$ref": "#"}
+            ]
+        }
+    },
+    "type": "string"
+}

json/test-schema.json

@@ -0,0 +1,28 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "array",
+    "items": {
+        "type": "object",
+        "required": ["description", "schema", "tests"],
+        "properties": {
+            "description": {"type": "string"},
+            "schema": {},
+            "tests": {
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "required": ["description", "data", "valid"],
+                    "properties": {
+                        "description": {"type": "string"},
+                        "data": {},
+                        "valid": {"type": "boolean"}
+                    },
+                    "additionalProperties": false
+                },
+                "minItems": 1
+            }
+        },
+        "additionalProperties": false,
+        "minItems": 1
+    }
+}

json/tests/draft3/optional/format.json

@@ -77,6 +77,11 @@
                 "data": "http://foo.bar/?baz=qux#quux",
                 "valid": true
             },
+            {
+                "description": "an invalid protocol-relative URI Reference",
+                "data": "//foo.bar/?baz=qux#quux",
+                "valid": false
+            },
             {
                 "description": "an invalid URI",
                 "data": "\\\\WINDOWS\\fileshare",

json/tests/draft3/ref.json

@@ -140,6 +140,39 @@
             }
         ]
     },
+    {
+        "description": "ref overrides any sibling keywords",
+        "schema": {
+            "definitions": {
+                "reffed": {
+                    "type": "array"
+                }
+            },
+            "properties": {
+                "foo": {
+                    "$ref": "#/definitions/reffed",
+                    "maxItems": 2
+                }
+            }
+        },
+        "tests": [
+            {
+                "description": "remote ref valid",
+                "data": { "foo": [] },
+                "valid": true
+            },
+            {
+                "description": "remote ref valid, maxItems ignored",
+                "data": { "foo": [ 1, 2, 3] },
+                "valid": true
+            },
+            {
+                "description": "ref invalid",
+                "data": { "foo": "string" },
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "remote ref, containing refs itself",
         "schema": {"$ref": "http://json-schema.org/draft-03/schema#"},