From a04925bba15d3991469400865932b10c66177822 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Fri, 24 Jul 2015 08:09:57 +0000 Subject: [PATCH] har-validator@1.8.0 --- node_modules/har-validator/LICENSE | 34 ++++++-------- node_modules/har-validator/README.md | 2 +- .../har-validator/{src => lib}/error.js | 0 .../har-validator/{src => lib}/index.js | 2 +- .../{src => lib}/schemas/cache.json | 0 .../{src => lib}/schemas/cacheEntry.json | 0 .../{src => lib}/schemas/content.json | 0 .../{src => lib}/schemas/cookie.json | 0 .../{src => lib}/schemas/creator.json | 0 .../{src => lib}/schemas/entry.json | 5 ++- .../{src => lib}/schemas/har.json | 0 .../{src => lib}/schemas/index.js | 0 .../{src => lib}/schemas/log.json | 0 .../{src => lib}/schemas/page.json | 0 .../{src => lib}/schemas/pageTimings.json | 0 .../{src => lib}/schemas/postData.json | 0 .../{src => lib}/schemas/record.json | 0 .../{src => lib}/schemas/request.json | 0 .../{src => lib}/schemas/response.json | 0 .../{src => lib}/schemas/timings.json | 0 node_modules/har-validator/package.json | 44 ++++++++++--------- 21 files changed, 42 insertions(+), 45 deletions(-) rename node_modules/har-validator/{src => lib}/error.js (100%) rename node_modules/har-validator/{src => lib}/index.js (95%) rename node_modules/har-validator/{src => lib}/schemas/cache.json (100%) rename node_modules/har-validator/{src => lib}/schemas/cacheEntry.json (100%) rename node_modules/har-validator/{src => lib}/schemas/content.json (100%) rename node_modules/har-validator/{src => lib}/schemas/cookie.json (100%) rename node_modules/har-validator/{src => lib}/schemas/creator.json (100%) rename node_modules/har-validator/{src => lib}/schemas/entry.json (90%) rename node_modules/har-validator/{src => lib}/schemas/har.json (100%) rename node_modules/har-validator/{src => lib}/schemas/index.js (100%) rename node_modules/har-validator/{src => lib}/schemas/log.json (100%) rename node_modules/har-validator/{src => lib}/schemas/page.json (100%) rename node_modules/har-validator/{src => lib}/schemas/pageTimings.json (100%) rename node_modules/har-validator/{src => lib}/schemas/postData.json (100%) rename node_modules/har-validator/{src => lib}/schemas/record.json (100%) rename node_modules/har-validator/{src => lib}/schemas/request.json (100%) rename node_modules/har-validator/{src => lib}/schemas/response.json (100%) rename node_modules/har-validator/{src => lib}/schemas/timings.json (100%) diff --git a/node_modules/har-validator/LICENSE b/node_modules/har-validator/LICENSE index d52787158d076..ca55c91af4ec5 100644 --- a/node_modules/har-validator/LICENSE +++ b/node_modules/har-validator/LICENSE @@ -1,21 +1,13 @@ -The MIT License (MIT) - -Copyright (c) 2015 Ahmad Nassri (https://www.ahmadnassri.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +Copyright (c) 2015, Ahmad Nassri + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/node_modules/har-validator/README.md b/node_modules/har-validator/README.md index 4e580ab8616e6..f40ab755da29e 100644 --- a/node_modules/har-validator/README.md +++ b/node_modules/har-validator/README.md @@ -330,7 +330,7 @@ Donations are welcome to help support the continuous development of this project ## License -[MIT](LICENSE) © [Ahmad Nassri](https://www.ahmadnassri.com) +[ISC License](LICENSE) © [Ahmad Nassri](https://www.ahmadnassri.com/) [license-url]: https://github.com/ahmadnassri/har-validator/blob/master/LICENSE diff --git a/node_modules/har-validator/src/error.js b/node_modules/har-validator/lib/error.js similarity index 100% rename from node_modules/har-validator/src/error.js rename to node_modules/har-validator/lib/error.js diff --git a/node_modules/har-validator/src/index.js b/node_modules/har-validator/lib/index.js similarity index 95% rename from node_modules/har-validator/src/index.js rename to node_modules/har-validator/lib/index.js index d0324ccd13a0b..81d55607c9e5f 100644 --- a/node_modules/har-validator/src/index.js +++ b/node_modules/har-validator/lib/index.js @@ -20,7 +20,7 @@ var runner = function (schema, data, cb) { // callback? if (!cb) { - return !validate.errors > 0 + return valid } else { return cb(validate.errors ? new ValidationError(validate.errors) : null, valid) } diff --git a/node_modules/har-validator/src/schemas/cache.json b/node_modules/har-validator/lib/schemas/cache.json similarity index 100% rename from node_modules/har-validator/src/schemas/cache.json rename to node_modules/har-validator/lib/schemas/cache.json diff --git a/node_modules/har-validator/src/schemas/cacheEntry.json b/node_modules/har-validator/lib/schemas/cacheEntry.json similarity index 100% rename from node_modules/har-validator/src/schemas/cacheEntry.json rename to node_modules/har-validator/lib/schemas/cacheEntry.json diff --git a/node_modules/har-validator/src/schemas/content.json b/node_modules/har-validator/lib/schemas/content.json similarity index 100% rename from node_modules/har-validator/src/schemas/content.json rename to node_modules/har-validator/lib/schemas/content.json diff --git a/node_modules/har-validator/src/schemas/cookie.json b/node_modules/har-validator/lib/schemas/cookie.json similarity index 100% rename from node_modules/har-validator/src/schemas/cookie.json rename to node_modules/har-validator/lib/schemas/cookie.json diff --git a/node_modules/har-validator/src/schemas/creator.json b/node_modules/har-validator/lib/schemas/creator.json similarity index 100% rename from node_modules/har-validator/src/schemas/creator.json rename to node_modules/har-validator/lib/schemas/creator.json diff --git a/node_modules/har-validator/src/schemas/entry.json b/node_modules/har-validator/lib/schemas/entry.json similarity index 90% rename from node_modules/har-validator/src/schemas/entry.json rename to node_modules/har-validator/lib/schemas/entry.json index 7acdc1b82c706..8a9c022bda6ea 100644 --- a/node_modules/har-validator/src/schemas/entry.json +++ b/node_modules/har-validator/lib/schemas/entry.json @@ -36,7 +36,10 @@ }, "serverIPAddress": { "type": "string", - "format": "ipv4" + "oneOf": [ + { "format": "ipv4" }, + { "format": "ipv6" } + ] }, "connection": { "type": "string" diff --git a/node_modules/har-validator/src/schemas/har.json b/node_modules/har-validator/lib/schemas/har.json similarity index 100% rename from node_modules/har-validator/src/schemas/har.json rename to node_modules/har-validator/lib/schemas/har.json diff --git a/node_modules/har-validator/src/schemas/index.js b/node_modules/har-validator/lib/schemas/index.js similarity index 100% rename from node_modules/har-validator/src/schemas/index.js rename to node_modules/har-validator/lib/schemas/index.js diff --git a/node_modules/har-validator/src/schemas/log.json b/node_modules/har-validator/lib/schemas/log.json similarity index 100% rename from node_modules/har-validator/src/schemas/log.json rename to node_modules/har-validator/lib/schemas/log.json diff --git a/node_modules/har-validator/src/schemas/page.json b/node_modules/har-validator/lib/schemas/page.json similarity index 100% rename from node_modules/har-validator/src/schemas/page.json rename to node_modules/har-validator/lib/schemas/page.json diff --git a/node_modules/har-validator/src/schemas/pageTimings.json b/node_modules/har-validator/lib/schemas/pageTimings.json similarity index 100% rename from node_modules/har-validator/src/schemas/pageTimings.json rename to node_modules/har-validator/lib/schemas/pageTimings.json diff --git a/node_modules/har-validator/src/schemas/postData.json b/node_modules/har-validator/lib/schemas/postData.json similarity index 100% rename from node_modules/har-validator/src/schemas/postData.json rename to node_modules/har-validator/lib/schemas/postData.json diff --git a/node_modules/har-validator/src/schemas/record.json b/node_modules/har-validator/lib/schemas/record.json similarity index 100% rename from node_modules/har-validator/src/schemas/record.json rename to node_modules/har-validator/lib/schemas/record.json diff --git a/node_modules/har-validator/src/schemas/request.json b/node_modules/har-validator/lib/schemas/request.json similarity index 100% rename from node_modules/har-validator/src/schemas/request.json rename to node_modules/har-validator/lib/schemas/request.json diff --git a/node_modules/har-validator/src/schemas/response.json b/node_modules/har-validator/lib/schemas/response.json similarity index 100% rename from node_modules/har-validator/src/schemas/response.json rename to node_modules/har-validator/lib/schemas/response.json diff --git a/node_modules/har-validator/src/schemas/timings.json b/node_modules/har-validator/lib/schemas/timings.json similarity index 100% rename from node_modules/har-validator/src/schemas/timings.json rename to node_modules/har-validator/lib/schemas/timings.json diff --git a/node_modules/har-validator/package.json b/node_modules/har-validator/package.json index 2b6fed2e17d17..0604cfc10c337 100644 --- a/node_modules/har-validator/package.json +++ b/node_modules/har-validator/package.json @@ -6,7 +6,7 @@ ] ], "_from": "har-validator@>=1.6.1 <2.0.0", - "_id": "har-validator@1.7.1", + "_id": "har-validator@1.8.0", "_inCache": true, "_location": "/har-validator", "_nodeVersion": "0.12.2", @@ -14,7 +14,7 @@ "email": "ahmad@ahmadnassri.com", "name": "ahmadnassri" }, - "_npmVersion": "2.7.4", + "_npmVersion": "2.11.2", "_phantomChildren": {}, "_requested": { "name": "har-validator", @@ -27,8 +27,8 @@ "_requiredBy": [ "/request" ], - "_resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.7.1.tgz", - "_shasum": "8ec8952f8287d21b451ba3e36f27ed8d997d8a95", + "_resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz", + "_shasum": "d83842b0eb4c435960aeb108a067a3aa94c0eeb2", "_shrinkwrap": null, "_spec": "har-validator@^1.6.1", "_where": "/Users/rebecca/code/npm/node_modules/request", @@ -38,13 +38,13 @@ "url": "https://www.ahmadnassri.com/" }, "bin": { - "har-validator": "./bin/har-validator" + "har-validator": "bin/har-validator" }, "bugs": { "url": "https://github.com/ahmadnassri/har-validator/issues" }, "dependencies": { - "bluebird": "^2.9.26", + "bluebird": "^2.9.30", "chalk": "^1.0.0", "commander": "^2.8.1", "is-my-json-valid": "^2.12.0" @@ -52,17 +52,17 @@ "description": "Extremely fast HTTP Archive (HAR) validator using JSON Schema", "devDependencies": { "codeclimate-test-reporter": "0.0.4", - "echint": "^1.1.0", - "istanbul": "^0.3.14", + "echint": "^1.3.0", + "istanbul": "^0.3.15", "mocha": "^2.2.5", - "require-directory": "^2.1.0", - "should": "^6.0.3", - "standard": "^3.11.1" + "require-directory": "^2.1.1", + "should": "^7.0.1", + "standard": "^4.3.1" }, "directories": {}, "dist": { - "shasum": "8ec8952f8287d21b451ba3e36f27ed8d997d8a95", - "tarball": "http://registry.npmjs.org/har-validator/-/har-validator-1.7.1.tgz" + "shasum": "d83842b0eb4c435960aeb108a067a3aa94c0eeb2", + "tarball": "http://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz" }, "echint": { "ignore": [ @@ -74,9 +74,9 @@ }, "files": [ "bin", - "src" + "lib" ], - "gitHead": "328d7f2f37affcc4fca1db13da68f2be817ad31c", + "gitHead": "8fd21c30edb23a1fed2d50b934d055d1be3dd7c9", "homepage": "https://github.com/ahmadnassri/har-validator", "keywords": [ "archive", @@ -85,8 +85,8 @@ "validate", "validator" ], - "license": "MIT", - "main": "./src/index.js", + "license": "ISC", + "main": "lib/index", "maintainers": [ { "name": "ahmadnassri", @@ -97,12 +97,14 @@ "optionalDependencies": {}, "repository": { "type": "git", - "url": "https://github.com/ahmadnassri/har-validator" + "url": "git+https://github.com/ahmadnassri/har-validator.git" }, "scripts": { "codeclimate": "codeclimate < coverage/lcov.info", - "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha", - "test": "standard && echint && mocha --reporter spec" + "coverage": "istanbul cover --dir coverage _mocha -- -R dot", + "posttest": "npm run coverage", + "pretest": "standard && echint", + "test": "mocha" }, - "version": "1.7.1" + "version": "1.8.0" }