n3 0.4.2 → 0.5.0

package/lib/N3Util.js

@@ -94,23 +94,52 @@ var N3Util = {
            (/^[a-z]+(-[a-z0-9]+)*$/i.test(modifier) ? '"@'  + modifier.toLowerCase()
                                                     : '"^^' + modifier);
   },
+
+  // Creates a function that prepends the given IRI to a local name
+  prefix: function (iri) {
+    return N3Util.prefixes({ '': iri })('');
+  },
+
+  // Creates a function that allows registering and expanding prefixes
+  prefixes: function (defaultPrefixes) {
+    // Add all of the default prefixes
+    var prefixes = Object.create(null);
+    for (var prefix in defaultPrefixes)
+      processPrefix(prefix, defaultPrefixes[prefix]);
+
+    // Registers a new prefix (if an IRI was specified)
+    // or retrieves a function that expands an existing prefix (if no IRI was specified)
+    function processPrefix(prefix, iri) {
+      // Create a new prefix if an IRI is specified or the prefix doesn't exist
+      if (iri || !(prefix in prefixes)) {
+        var cache = Object.create(null);
+        iri = iri || '';
+        // Create a function that expands the prefix
+        prefixes[prefix] = function (localName) {
+          return cache[localName] || (cache[localName] = iri + localName);
+        };
+      }
+      return prefixes[prefix];
+    }
+    return processPrefix;
+  },
 };
 
 // Add the N3Util functions to the given object or its prototype
-function AddN3Util(parent, toPrototype) {
+function addN3Util(parent, toPrototype) {
   for (var name in N3Util)
     if (!toPrototype)
       parent[name] = N3Util[name];
     else
-      parent.prototype[name] = ApplyToThis(N3Util[name]);
+      parent.prototype[name] = applyToThis(N3Util[name]);
 
   return parent;
 }
 
 // Returns a function that applies `f` to the `this` object
-function ApplyToThis(f) {
+function applyToThis(f) {
   return function (a) { return f(this, a); };
 }
 
 // Expose N3Util, attaching all functions to it
-module.exports = AddN3Util(AddN3Util);
+module.exports = addN3Util(addN3Util);

package/lib/N3Writer.js

@@ -21,21 +21,24 @@ function N3Writer(outputStream, options) {
   // Shift arguments if the first argument is not a stream
   if (outputStream && typeof outputStream.write !== 'function')
     options = outputStream, outputStream = null;
+  options = options || {};
 
   // If no output stream given, send the output as string through the end callback
   if (!outputStream) {
-    outputStream = this;
-    this._output = '';
-    this.write = function (chunk, encoding, callback) {
-      this._output += chunk;
-      callback && callback();
+    var output = '';
+    this._outputStream = {
+      write: function (chunk, encoding, done) { output += chunk; done && done(); },
+      end:   function (done) { done && done(null, output); },
     };
+    this._endStream = true;
+  }
+  else {
+    this._outputStream = outputStream;
+    this._endStream = options.end === undefined ? true : !!options.end;
   }
-  this._outputStream = outputStream;
 
   // Initialize writer, depending on the format
   this._subject = null;
-  options = options || {};
   if (!(/triple|quad/i).test(options.format)) {
     this._graph = '';
     this._prefixIRIs = Object.create(null);
@@ -62,7 +65,9 @@ N3Writer.prototype = {
         // Close the previous graph and start the new one
         this._write((this._subject === null ? '' : (this._graph ? '\n}\n' : '.\n')) +
                     (graph ? this._encodeIriOrBlankNode(graph) + ' {\n' : ''));
-        this._graph = graph, this._subject = null;
+        this._subject = null;
+        // Don't treat identical blank nodes as repeating graphs
+        this._graph = graph[0] !== '[' ? graph : ']';
       }
       // Don't repeat the subject if it's the same
       if (this._subject === subject) {
@@ -100,16 +105,18 @@ N3Writer.prototype = {
   },
 
   // ### `_encodeIriOrBlankNode` represents an IRI or blank node
-  _encodeIriOrBlankNode: function (iri) {
-    // A blank node is represented as-is
-    if (iri[0] === '_' && iri[1] === ':') return iri;
+  _encodeIriOrBlankNode: function (entity) {
+    // A blank node or list is represented as-is
+    var firstChar = entity[0];
+    if (firstChar === '[' || firstChar === '(' || firstChar === '_' && entity[1] === ':')
+      return entity;
     // Escape special characters
-    if (escape.test(iri))
-      iri = iri.replace(escapeAll, characterReplacer);
+    if (escape.test(entity))
+      entity = entity.replace(escapeAll, characterReplacer);
     // Try to represent the IRI as prefixed name
-    var prefixMatch = this._prefixRegex.exec(iri);
-    return !prefixMatch ? '<' + iri + '>' :
-           (!prefixMatch[1] ? iri : this._prefixIRIs[prefixMatch[1]] + prefixMatch[2]);
+    var prefixMatch = this._prefixRegex.exec(entity);
+    return !prefixMatch ? '<' + entity + '>' :
+           (!prefixMatch[1] ? entity : this._prefixIRIs[prefixMatch[1]] + prefixMatch[2]);
   },
 
   // ### `_encodeLiteral` represents a literal
@@ -130,6 +137,9 @@ N3Writer.prototype = {
   _encodeSubject: function (subject) {
     if (subject[0] === '"')
       throw new Error('A literal as subject is not allowed: ' + subject);
+    // Don't treat identical blank nodes as repeating subjects
+    if (subject[0] === '[')
+      this._subject = ']';
     return this._encodeIriOrBlankNode(subject);
   },
 
@@ -159,7 +169,7 @@ N3Writer.prototype = {
   // ### `addTriple` adds the triple to the output stream
   addTriple: function (subject, predicate, object, graph, done) {
     // The triple was given as a triple object, so shift parameters
-    if (typeof object !== 'string')
+    if (object === undefined)
       this._writeTriple(subject.subject, subject.predicate, subject.object,
                         subject.graph || '', predicate);
     // The optional `graph` parameter was not provided
@@ -217,6 +227,58 @@ N3Writer.prototype = {
     this._write(hasPrefixes ? '\n' : '', done);
   },
 
+  // ### `blank` creates a blank node with the given content
+  blank: function (predicate, object) {
+    var children = predicate, child, length;
+    // Empty blank node
+    if (predicate === undefined)
+      children = [];
+    // Blank node passed as blank("predicate", "object")
+    else if (typeof predicate === 'string')
+      children = [{ predicate: predicate, object: object }];
+    // Blank node passed as blank({ predicate: predicate, object: object })
+    else if (!('length' in predicate))
+      children = [predicate];
+
+    switch (length = children.length) {
+    // Generate an empty blank node
+    case 0:
+      return '[]';
+    // Generate a non-nested one-triple blank node
+    case 1:
+      child = children[0];
+      if (child.object[0] !== '[')
+        return '[ ' + this._encodePredicate(child.predicate) + ' ' +
+                      this._encodeObject(child.object) + ' ]';
+    // Generate a multi-triple or nested blank node
+    default:
+      var contents = '[';
+      // Write all triples in order
+      for (var i = 0; i < length; i++) {
+        child = children[i];
+        // Write only the object is the predicate is the same as the previous
+        if (child.predicate === predicate)
+          contents += ', ' + this._encodeObject(child.object);
+        // Otherwise, write the predicate and the object
+        else {
+          contents += (i ? ';\n  ' : '\n  ') +
+                      this._encodePredicate(child.predicate) + ' ' +
+                      this._encodeObject(child.object);
+          predicate = child.predicate;
+        }
+      }
+      return contents + '\n]';
+    }
+  },
+
+  // ### `list` creates a list node with the given content
+  list: function (elements) {
+    var length = elements && elements.length || 0, contents = new Array(length);
+    for (var i = 0; i < length; i++)
+      contents[i] = this._encodeObject(elements[i]);
+    return '(' + contents.join(' ') + ')';
+  },
+
   // ### `_prefixRegex` matches a prefixed name or IRI that begins with one of the added prefixes
   _prefixRegex: /$0^/,
 
@@ -230,16 +292,13 @@ N3Writer.prototype = {
     // Disallow further writing
     this._write = this._blockedWrite;
 
-    // If writing to a string instead of an actual stream, send the string
-    if (this === this._outputStream)
-      return done && done(null, this._output);
-
     // Try to end the underlying stream, ensuring done is called exactly one time
-    var singleDone = done && function () { singleDone = null, done(); };
-    // Ending a stream can error
-    try { this._outputStream.end(singleDone); }
-    // Execute the callback if it hasn't been executed
-    catch (error) { singleDone && singleDone(); }
+    var singleDone = done && function (error, result) { singleDone = null, done(error, result); };
+    if (this._endStream) {
+      try { return this._outputStream.end(singleDone); }
+      catch (error) { /* error closing stream */ }
+    }
+    singleDone && singleDone();
   },
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [
@@ -17,21 +17,21 @@
   },
   "devDependencies": {
     "async": "~0.9.0",
+    "browserify": "~3.x",
     "chai": "~1.4.2",
     "chai-things": "~0.1.1",
     "colors": "~0.6.0",
     "docco": "~0.6.2",
-    "jshint": "~2.1.10",
-    "request": "~2.22.0",
-    "mocha": "~1.15.0",
+    "eslint": "~1.2.1",
     "istanbul": "~0.3.0",
-    "uglify-js": "~2.4.3",
-    "browserify": "~3.x",
-    "pre-commit": "~0.0.9"
+    "mocha": "~2.3.0",
+    "pre-commit": "~0.0.9",
+    "request": "~2.22.0",
+    "uglify-js": "~2.4.3"
   },
   "scripts": {
     "test": "mocha",
-    "hint": "jshint lib perf test spec",
+    "lint": "eslint lib perf test spec",
     "browser": "node browser/build-browser-versions",
     "coverage": "istanbul cover node_modules/.bin/_mocha -- -R spec --timeout 100",
     "spec": "node spec/turtle-spec && node spec/trig-spec && node spec/ntriples-spec && node spec/nquads-spec",
@@ -58,7 +58,7 @@
     ]
   },
   "pre-commit": [
-    "hint",
+    "lint",
     "test"
   ]
 }

package/perf/.eslintrc

@@ -0,0 +1,5 @@
+{
+  rules: {
+    no-console: 0,
+  }
+}

package/perf/N3Parser-perf.js

@@ -1,22 +1,23 @@
 #!/usr/bin/env node
 var N3 = require('../N3');
 var fs = require('fs'),
+    path = require('path'),
     assert = require('assert');
 
 if (process.argv.length !== 3)
   return console.error('Usage: N3Parser-perf.js filename');
 
-var filename = process.argv[2];
+var filename = path.resolve(process.cwd(), process.argv[2]),
+    base = 'file://' + filename;
 
 var TEST = '- Parsing file ' + filename;
 console.time(TEST);
 
 var count = 0;
-new N3.Parser().parse(fs.createReadStream(filename), function (error, triple) {
+new N3.Parser({ documentIRI: base }).parse(fs.createReadStream(filename), function (error, triple) {
   assert(!error, error);
-  if (triple) {
+  if (triple)
     count++;
-  }
   else {
     console.timeEnd(TEST);
     console.log('* Triples parsed: ' + count);

package/perf/N3Store-perf.js

@@ -4,25 +4,48 @@ var assert = require('assert');
 
 console.log('N3Store performance test');
 
-var TEST;
-var dim = parseInt(process.argv[2], 10) || 256;
-var dimSquared = dim * dim;
-var dimCubed = dimSquared * dim;
 var prefix = 'http://example.org/#';
+var TEST, dim, dimSquared, dimCubed, dimQuads, store;
 
-var store = new N3.Store();
+/* Test triples */
+dim = parseInt(process.argv[2], 10) || 256;
+dimSquared = dim * dim;
+dimCubed = dimSquared * dim;
 
-TEST = '- Adding ' + dimCubed + ' triples';
+store = new N3.Store();
+TEST = '- Adding ' + dimCubed + ' triples in the default graph';
 console.time(TEST);
-for (var i = 0; i < dim; i++)
-  for (var j = 0; j < dim; j++)
-    for (var k = 0; k < dim; k++)
+var i, j, k, l;
+for (i = 0; i < dim; i++)
+  for (j = 0; j < dim; j++)
+    for (k = 0; k < dim; k++)
       store.addTriple(prefix + i, prefix + j, prefix + k);
 console.timeEnd(TEST);
 
-console.log('* Memory usage: ' + Math.round(process.memoryUsage().rss / 1024 / 1024) + 'MB');
+console.log('* Memory usage for triples: ' + Math.round(process.memoryUsage().rss / 1024 / 1024) + 'MB');
+
+TEST = '- Finding all ' + dimCubed + ' triples to the default graph ' + dimSquared * 1 + ' times (0 variables)';
+console.time(TEST);
+for (i = 0; i < dim; i++)
+  for (j = 0; j < dim; j++)
+    for (k = 0; k < dim; k++)
+      assert.equal(store.find(prefix + i, prefix + j, prefix + k).length, 1);
+console.timeEnd(TEST);
+
+TEST = '- Finding all ' + dimCubed + ' triples to the default graph ' + dimSquared * 2 + ' times (1 variable)';
+console.time(TEST);
+for (i = 0; i < dim; i++)
+  for (j = 0; j < dim; j++)
+    assert.equal(store.find(prefix + i, prefix + j, null).length, dim);
+for (i = 0; i < dim; i++)
+  for (j = 0; j < dim; j++)
+    assert.equal(store.find(prefix + i, null, prefix + j).length, dim);
+for (i = 0; i < dim; i++)
+  for (j = 0; j < dim; j++)
+    assert.equal(store.find(null, prefix + i, prefix + j).length, dim);
+console.timeEnd(TEST);
 
-TEST = '- Finding all ' + dimCubed + ' triples ' + dimSquared * 3 + ' times';
+TEST = '- Finding all ' + dimCubed + ' triples to the default graph ' + dimSquared * 3 + ' times (2 variables)';
 console.time(TEST);
 for (i = 0; i < dim; i++)
   assert.equal(store.find(prefix + i, null, null).length, dimSquared);
@@ -31,3 +54,35 @@ for (j = 0; j < dim; j++)
 for (k = 0; k < dim; k++)
   assert.equal(store.find(null, null, prefix + k).length, dimSquared);
 console.timeEnd(TEST);
+
+console.log();
+
+/* Test quads */
+dim /= 4,
+dimSquared = dim * dim;
+dimCubed = dimSquared * dim;
+dimQuads = dimCubed * dim;
+
+store = new N3.Store();
+TEST = '- Adding ' + dimQuads + ' quads';
+console.time(TEST);
+for (i = 0; i < dim; i++)
+  for (j = 0; j < dim; j++)
+    for (k = 0; k < dim; k++)
+      for (l = 0; l < dim; l++)
+        store.addTriple(prefix + i, prefix + j, prefix + k, prefix + l);
+console.timeEnd(TEST);
+
+console.log('* Memory usage for quads: ' + Math.round(process.memoryUsage().rss / 1024 / 1024) + 'MB');
+
+TEST = '- Finding all ' + dimQuads + ' quads ' + dimCubed * 4 + ' times';
+console.time(TEST);
+for (i = 0; i < dim; i++)
+  assert.equal(store.find(prefix + i, null, null, null).length, dimCubed);
+for (j = 0; j < dim; j++)
+  assert.equal(store.find(null, prefix + j, null, null).length, dimCubed);
+for (k = 0; k < dim; k++)
+  assert.equal(store.find(null, null, prefix + k, null).length, dimCubed);
+for (l = 0; l < dim; l++)
+  assert.equal(store.find(null, null, null, prefix + l).length, dimCubed);
+console.timeEnd(TEST);

package/spec/.eslintrc

@@ -0,0 +1,10 @@
+{
+  rules: {
+    max-nested-callbacks: 0,
+    no-console: 0,
+    no-loop-func: 0,
+    no-process-exit: 0,
+    no-shadow: 0,
+    no-sync: 0,
+  }
+}

package/spec/SpecTester.js

@@ -65,15 +65,16 @@ SpecTester.prototype.run = function () {
         // 1.2.1 Execute an individual test
         function (test, callback) {
           async.series({ actionStream: self._fetch.bind(self, test.action),
-                         resultStream: self._fetch.bind(self, test.result), },
-            function (err, results) {
+                         resultStream: self._fetch.bind(self, test.result) },
+            function (error, results) {
+              if (error) return callback(error);
               self._performTest(test, results.actionStream, callback);
             });
         },
         // 1.2.2 Show the summary of all performed tests
         function showSummary(error, tests) {
           var score = tests.reduce(function (sum, test) { return sum + test.success; }, 0);
-          manifest.skipped.forEach(function (test) { self._verifyResult(test); });
+          manifest.skipped.forEach(function (test) { self._verifyResult(test); });
           console.log(('* passed ' + score +
                        ' out of ' + manifest.tests.length + ' tests' +
                        ' (' + manifest.skipped.length + ' skipped)').bold);
@@ -87,7 +88,7 @@ SpecTester.prototype.run = function () {
     // 3. Return with the proper exit code
     function (tests) {
       process.exit(tests.every(function (test) { return test.success; }) ? 0 : 1);
-    }
+    },
   ],
   function (error) {
     if (error) {
@@ -156,7 +157,7 @@ SpecTester.prototype._performTest = function (test, actionStream, callback) {
   var resultFile = path.join(this._testFolder, test.action.replace(/\.\w+$/, '-result.nq')),
       resultWriter = new N3.Writer(fs.createWriteStream(resultFile), { format: 'N-Quads' }),
       config = { format: this._name, documentIRI: url.resolve(this._manifest, test.action) },
-      parser = N3.Parser(config), self = this;
+      parser = new N3.Parser(config), self = this;
   parser.parse(actionStream, function (error, triple) {
     if (error)  test.error = error;
     if (triple) resultWriter.addTriple(triple);
@@ -177,14 +178,12 @@ SpecTester.prototype._verifyResult = function (test, resultFile, correctFile, ca
   }
   // Positive tests are successful if the results are equal,
   // or if the correct solution is not given but no error occurred
-  else {
-    if (!correctFile)
-      displayResult(null, !test.error);
-    else if (!resultFile)
-      displayResult(null, false);
-    else
-      this._compareResultFiles(resultFile, correctFile, displayResult);
-  }
+  else if (!correctFile)
+    displayResult(null, !test.error);
+  else if (!resultFile)
+    displayResult(null, false);
+  else
+    this._compareResultFiles(resultFile, correctFile, displayResult);
 
   // Display the test result
   function displayResult(error, success, comparison) {
@@ -219,13 +218,13 @@ SpecTester.prototype._compareResultFiles = function (actual, expected, callback)
     else {
       // SWObjects doesn't support N-Quads, so convert to TriG if necessary
       if (/\.nq/.test(expected)) {
-        fs.writeFileSync(actual   += '.trig', NQuadsToTrig(results.actualContents));
-        fs.writeFileSync(expected += '.trig', NQuadsToTrig(results.expectedContents));
+        fs.writeFileSync(actual   += '.trig', quadsToTrig(results.actualContents));
+        fs.writeFileSync(expected += '.trig', quadsToTrig(results.expectedContents));
       }
       exec('sparql -d ' + expected + ' --compare ' + actual,
            function (error, stdout) { callback(error, /^matched\s*$/.test(stdout), stdout); });
     }
-    function NQuadsToTrig(nquad) {
+    function quadsToTrig(nquad) {
       return nquad.replace(/^([^\s]+)\s+([^\s]+)\s+(.+)\s+([^\s"]+)\s*\.$/mg, '$4 { $1 $2 $3 }');
     }
   });
@@ -239,7 +238,7 @@ SpecTester.prototype._compareResultFiles = function (actual, expected, callback)
 SpecTester.prototype._generateEarlReport = function (tests, callback) {
   // Create the report file
   var reportFile = path.join(this._reportFolder, 'n3js-earl-report-' + this._name + '.ttl'),
-      report = new N3.Writer(fs.createWriteStream(reportFile), { prefixes: prefixes }),
+      report = new N3.Writer(fs.createWriteStream(reportFile), { prefixes: prefixes }),
       date = '"' + new Date().toISOString() + '"^^' + prefixes.xsd + 'dateTime',
       homepage = 'https://github.com/RubenVerborgh/N3.js', app = homepage + '#n3js',
       developer = 'http://ruben.verborgh.org/#me', manifest = this._manifest + '#';

package/spec/trig/LICENSE

@@ -0,0 +1,48 @@
+Summary
+=======
+
+Distributed under both the W3C Test Suite License[1] and the W3C 3-clause BSD License[2]. To contribute to a W3C Test Suite, see the policies and contribution forms [3]
+
+1. http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
+2. http://www.w3.org/Consortium/Legal/2008/03-bsd-license
+3. http://www.w3.org/2004/10/27-testcases
+
+DISCLAIMER
+
+UNDER BOTH MUTUALLY EXCLUSIVE LICENSES, THIS DOCUMENT AND ALL DOCUMENTS, TESTS AND SOFTWARE THAT LINK THIS STATEMENT ARE PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF.
+
+
+W3C Test Suite License
+======================
+
+This document, Test Suites and other documents that link to this statement are provided by the copyright holders under the following license: By using and/or copying this document, or the W3C document from which this statement is linked, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
+
+Permission to copy, and distribute the contents of this document, or the W3C document from which this statement is linked, in any medium for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the document, or portions thereof, that you use:
+
+A link or URL to the original W3C document.
+The pre-existing copyright notice of the original author, or if it doesn't exist, a notice (hypertext is preferred, but a textual representation is permitted) of the form: "Copyright © [$date-of-document] World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University) and others. All Rights Reserved. http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html"
+If it exists, the STATUS of the W3C document.
+When space permits, inclusion of the full text of this NOTICE should be provided. We request that authorship attribution be provided in any software, documents, or other items or products that you create pursuant to the implementation of the contents of this document, or any portion thereof.
+
+No right to create modifications or derivatives of W3C documents is granted pursuant to this license. However, if additional requirements (documented in the Copyright FAQ) are satisfied, the right to create modifications or derivatives is sometimes granted by the W3C to individuals complying with those requirements.
+
+If a Test Suite distinguishes the test harness (or, framework for navigation) and the actual tests, permission is given to remove or alter the harness or navigation if the Test Suite in question allows to do so. The tests themselves shall NOT be changed in any way.
+
+The name and trademarks of W3C and other copyright holders may NOT be used in advertising or publicity pertaining to this document or other documents that link to this statement without specific, written prior permission. Title to copyright in this document will at all times remain with copyright holders. Permission is given to use the trademarked string W3C within claims of performance concerning W3C Specifications or features described therein, and there only, if the test suite so authorizes.
+
+THIS WORK IS PROVIDED BY W3C, MIT, ERCIM, KEIO UNIVERSITY, THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL W3C, MIT, ERCIM, KEIO UNIVERSITY, THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+W3C 3-clause BSD License
+========================
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	Redistributions of works must retain the original copyright notice, this list of conditions and the following disclaimer.
+
+	Redistributions in binary form must reproduce the original copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+	Neither the name of the W3C nor the names of its contributors may be used to endorse or promote products derived from this work without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+