Browse files

Ignoring trailing whitespace in require directives (fixes #2)

  • Loading branch information...
1 parent 0ad1ed5 commit ec94f74330328383a4ea55ec6242336ca7bfa6a5 @TrevorBurnham committed Jan 9, 2012
View
1 docs/snockets.html
@@ -252,6 +252,7 @@
<span class="p">),</span> <span class="mi">10</span>
<span class="nv">parseDirectives = </span><span class="nf">(code) -&gt;</span>
+ <span class="nv">code = </span><span class="nx">code</span><span class="p">.</span><span class="nx">replace</span> <span class="sr">/[\r\t ]+$/gm</span><span class="p">,</span> <span class="s1">&#39;\n&#39;</span> <span class="c1"># fix for issue #2</span>
<span class="k">return</span> <span class="p">[]</span> <span class="nx">unless</span> <span class="nv">match = </span><span class="nx">HEADER</span><span class="p">.</span><span class="nx">exec</span><span class="p">(</span><span class="nx">code</span><span class="p">)</span>
<span class="nv">header = </span><span class="nx">match</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
<span class="nx">match</span><span class="p">[</span><span class="mi">1</span><span class="p">]</span> <span class="k">while</span> <span class="nv">match = </span><span class="nx">DIRECTIVE</span><span class="p">.</span><span class="nx">exec</span> <span class="nx">header</span>
View
307 lib/snockets.js
@@ -1,44 +1,43 @@
(function() {
- var CoffeeScript, DIRECTIVE, DepGraph, EXPLICIT_PATH, HEADER, HoldingQueue, Snockets, compilers, fs, jsExts, minify, parseDirectives, path, stripExt, timeEq, uglify, _;
- var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, __slice = Array.prototype.slice, __indexOf = Array.prototype.indexOf || function(item) {
- for (var i = 0, l = this.length; i < l; i++) {
- if (this[i] === item) return i;
- }
- return -1;
- };
+ var CoffeeScript, DIRECTIVE, DepGraph, EXPLICIT_PATH, HEADER, HoldingQueue, Snockets, compilers, fs, jsExts, minify, parseDirectives, path, stripExt, timeEq, uglify, _,
+ __slice = Array.prototype.slice,
+ __indexOf = Array.prototype.indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+
DepGraph = require('dep-graph');
+
CoffeeScript = require('coffee-script');
+
fs = require('fs');
+
path = require('path');
+
uglify = require('uglify-js');
+
_ = require('underscore');
+
module.exports = Snockets = (function() {
+
+ Snockets.name = 'Snockets';
+
function Snockets(options) {
- var _base, _base2, _ref, _ref2;
+ var _base, _base2;
this.options = options != null ? options : {};
- if ((_ref = (_base = this.options).src) == null) {
- _base.src = '.';
- }
- if ((_ref2 = (_base2 = this.options).async) == null) {
- _base2.async = true;
- }
+ if ((_base = this.options).src == null) _base.src = '.';
+ if ((_base2 = this.options).async == null) _base2.async = true;
this.cache = {};
this.concatCache = {};
this.depGraph = new DepGraph;
}
+
Snockets.prototype.scan = function(filePath, flags, callback) {
- var _ref;
+ var _this = this;
if (typeof flags === 'function') {
callback = flags;
flags = {};
}
- if (flags == null) {
- flags = {};
- }
- if ((_ref = flags.async) == null) {
- flags.async = this.options.async;
- }
- return this.updateDirectives(filePath, flags, __bind(function(err, graphChanged) {
+ if (flags == null) flags = {};
+ if (flags.async == null) flags.async = this.options.async;
+ return this.updateDirectives(filePath, flags, function(err, graphChanged) {
if (err) {
if (callback) {
return callback(err);
@@ -47,24 +46,21 @@
}
}
if (typeof callback === "function") {
- callback(null, this.depGraph, graphChanged);
+ callback(null, _this.depGraph, graphChanged);
}
- return this.depGraph;
- }, this));
+ return _this.depGraph;
+ });
};
+
Snockets.prototype.getCompiledChain = function(filePath, flags, callback) {
- var _ref;
+ var _this = this;
if (typeof flags === 'function') {
callback = flags;
flags = {};
}
- if (flags == null) {
- flags = {};
- }
- if ((_ref = flags.async) == null) {
- flags.async = this.options.async;
- }
- return this.updateDirectives(filePath, flags, __bind(function(err, graphChanged) {
+ if (flags == null) flags = {};
+ if (flags.async == null) flags.async = this.options.async;
+ return this.updateDirectives(filePath, flags, function(err, graphChanged) {
var chain, compiledChain, link, o;
if (err) {
if (callback) {
@@ -74,7 +70,7 @@
}
}
try {
- chain = this.depGraph.getChain(filePath);
+ chain = _this.depGraph.getChain(filePath);
} catch (e) {
if (callback) {
return callback(e);
@@ -83,11 +79,11 @@
}
}
compiledChain = (function() {
- var _i, _len, _ref2, _results;
- _ref2 = chain.concat(filePath);
+ var _i, _len, _ref, _results;
+ _ref = chain.concat(filePath);
_results = [];
- for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
- link = _ref2[_i];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ link = _ref[_i];
o = {};
if (this.compileFile(link)) {
o.filename = stripExt(link) + '.js';
@@ -98,28 +94,26 @@
_results.push(o);
}
return _results;
- }).call(this);
+ }).call(_this);
if (typeof callback === "function") {
callback(null, compiledChain, graphChanged);
}
return compiledChain;
- }, this));
+ });
};
+
Snockets.prototype.getConcatenation = function(filePath, flags, callback) {
- var concatenationChanged, _ref;
+ var concatenationChanged,
+ _this = this;
if (typeof flags === 'function') {
callback = flags;
flags = {};
}
- if (flags == null) {
- flags = {};
- }
- if ((_ref = flags.async) == null) {
- flags.async = this.options.async;
- }
+ if (flags == null) flags = {};
+ if (flags.async == null) flags.async = this.options.async;
concatenationChanged = true;
- return this.updateDirectives(filePath, flags, __bind(function(err, graphChanged) {
- var chain, concatenation, link, result, _ref2, _ref3;
+ return this.updateDirectives(filePath, flags, function(err, graphChanged) {
+ var chain, concatenation, link, result, _ref, _ref2;
if (err) {
if (callback) {
return callback(err);
@@ -128,25 +122,23 @@
}
}
try {
- if ((_ref2 = this.concatCache[filePath]) != null ? _ref2.data : void 0) {
- concatenation = this.concatCache[filePath].data.toString('utf8');
- if (!flags.minify) {
- concatenationChanged = false;
- }
+ if ((_ref = _this.concatCache[filePath]) != null ? _ref.data : void 0) {
+ concatenation = _this.concatCache[filePath].data.toString('utf8');
+ if (!flags.minify) concatenationChanged = false;
} else {
- chain = this.depGraph.getChain(filePath);
+ chain = _this.depGraph.getChain(filePath);
concatenation = ((function() {
- var _i, _len, _ref3, _results;
- _ref3 = chain.concat(filePath);
+ var _i, _len, _ref2, _results;
+ _ref2 = chain.concat(filePath);
_results = [];
- for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
- link = _ref3[_i];
+ for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+ link = _ref2[_i];
this.compileFile(link);
_results.push(this.cache[link].js.toString('utf8'));
}
return _results;
- }).call(this)).join('\n');
- this.concatCache[filePath] = {
+ }).call(_this)).join('\n');
+ _this.concatCache[filePath] = {
data: new Buffer(concatenation)
};
}
@@ -158,12 +150,12 @@
}
}
if (flags.minify) {
- if ((_ref3 = this.concatCache[filePath]) != null ? _ref3.minifiedData : void 0) {
- result = this.concatCache[filePath].minifiedData.toString('utf8');
+ if ((_ref2 = _this.concatCache[filePath]) != null ? _ref2.minifiedData : void 0) {
+ result = _this.concatCache[filePath].minifiedData.toString('utf8');
concatenationChanged = false;
} else {
result = minify(concatenation);
- this.concatCache[filePath].minifiedData = new Buffer(result);
+ _this.concatCache[filePath].minifiedData = new Buffer(result);
}
} else {
result = concatenation;
@@ -172,19 +164,19 @@
callback(null, result, concatenationChanged);
}
return result;
- }, this));
+ });
};
+
Snockets.prototype.updateDirectives = function() {
- var callback, depList, excludes, filePath, flags, graphChanged, q, require, requireTree, _i;
+ var callback, depList, excludes, filePath, flags, graphChanged, q, require, requireTree, _i,
+ _this = this;
filePath = arguments[0], flags = arguments[1], excludes = 4 <= arguments.length ? __slice.call(arguments, 2, _i = arguments.length - 1) : (_i = 2, []), callback = arguments[_i++];
- if (__indexOf.call(excludes, filePath) >= 0) {
- return callback();
- }
+ if (__indexOf.call(excludes, filePath) >= 0) return callback();
excludes.push(filePath);
depList = [];
graphChanged = false;
q = new HoldingQueue({
- task: __bind(function(depPath, next) {
+ task: function(depPath, next) {
var err, _ref;
if (_ref = path.extname(depPath), __indexOf.call(jsExts(), _ref) < 0) {
return next();
@@ -193,85 +185,67 @@
err = new Error("Script tries to require itself: " + filePath);
return callback(err);
}
- if (__indexOf.call(depList, depPath) < 0) {
- depList.push(depPath);
- }
- return this.updateDirectives.apply(this, [depPath, flags].concat(__slice.call(excludes), [function(err) {
- if (err) {
- return callback(err);
- }
+ if (__indexOf.call(depList, depPath) < 0) depList.push(depPath);
+ return _this.updateDirectives.apply(_this, [depPath, flags].concat(__slice.call(excludes), [function(err) {
+ if (err) return callback(err);
return next();
}]));
- }, this),
- onComplete: __bind(function() {
- if (!_.isEqual(depList, this.depGraph.map[filePath])) {
- this.depGraph.map[filePath] = depList;
+ },
+ onComplete: function() {
+ if (!_.isEqual(depList, _this.depGraph.map[filePath])) {
+ _this.depGraph.map[filePath] = depList;
graphChanged = true;
}
- if (graphChanged) {
- this.concatCache[filePath] = null;
- }
+ if (graphChanged) _this.concatCache[filePath] = null;
return callback(null, graphChanged);
- }, this)
+ }
});
- require = __bind(function(relPath) {
+ require = function(relPath) {
var depName, depPath, relName;
q.waitFor(relName = stripExt(relPath));
if (relName.match(EXPLICIT_PATH)) {
depPath = relName + '.js';
return q.perform(relName, depPath);
} else {
depName = path.join(path.dirname(filePath), relName);
- return this.findMatchingFile(depName, flags, function(err, depPath) {
- if (err) {
- return callback(err);
- }
+ return _this.findMatchingFile(depName, flags, function(err, depPath) {
+ if (err) return callback(err);
return q.perform(relName, depPath);
});
}
- }, this);
- requireTree = __bind(function(dirName) {
+ };
+ requireTree = function(dirName) {
q.waitFor(dirName);
- return this.readdir(this.absPath(dirName), flags, __bind(function(err, items) {
+ return _this.readdir(_this.absPath(dirName), flags, function(err, items) {
var item, itemPath, _j, _len, _results;
- if (err) {
- return callback(err);
- }
+ if (err) return callback(err);
q.unwaitFor(dirName);
_results = [];
for (_j = 0, _len = items.length; _j < _len; _j++) {
item = items[_j];
itemPath = path.join(dirName, item);
- if (this.absPath(itemPath) === this.absPath(filePath)) {
- continue;
- }
+ if (_this.absPath(itemPath) === _this.absPath(filePath)) continue;
q.waitFor(itemPath);
- _results.push(__bind(function(itemPath) {
- return this.stat(this.absPath(itemPath), flags, __bind(function(err, stats) {
- if (err) {
- return callback(err);
- }
+ _results.push((function(itemPath) {
+ return _this.stat(_this.absPath(itemPath), flags, function(err, stats) {
+ if (err) return callback(err);
if (stats.isFile()) {
return q.perform(itemPath, itemPath);
} else {
requireTree(itemPath);
return q.unwaitFor(itemPath);
}
- }, this));
- }, this)(itemPath));
+ });
+ })(itemPath));
}
return _results;
- }, this));
- }, this);
- return this.readFile(filePath, flags, __bind(function(err, fileChanged) {
+ });
+ };
+ return this.readFile(filePath, flags, function(err, fileChanged) {
var command, directive, relPath, relPaths, words, _j, _k, _l, _len, _len2, _len3, _ref;
- if (err) {
- return callback(err);
- }
- if (fileChanged) {
- graphChanged = true;
- }
- _ref = parseDirectives(this.cache[filePath].data.toString('utf8'));
+ if (err) return callback(err);
+ if (fileChanged) graphChanged = true;
+ _ref = parseDirectives(_this.cache[filePath].data.toString('utf8'));
for (_j = 0, _len = _ref.length; _j < _len; _j++) {
directive = _ref[_j];
words = directive.replace(/['"]/g, '').split(/\s+/);
@@ -291,28 +265,26 @@
}
}
return q.finalize();
- }, this));
+ });
};
+
Snockets.prototype.findMatchingFile = function(filename, flags, callback) {
- var tryFiles;
- tryFiles = __bind(function(filePaths) {
+ var tryFiles,
+ _this = this;
+ tryFiles = function(filePaths) {
var filePath, _i, _len;
for (_i = 0, _len = filePaths.length; _i < _len; _i++) {
filePath = filePaths[_i];
- if (stripExt(this.absPath(filePath)) === this.absPath(filename)) {
+ if (stripExt(_this.absPath(filePath)) === _this.absPath(filename)) {
callback(null, filePath);
return true;
}
}
- }, this);
- if (tryFiles(_.keys(this.cache))) {
- return;
- }
- return this.readdir(path.dirname(this.absPath(filename)), flags, __bind(function(err, files) {
+ };
+ if (tryFiles(_.keys(this.cache))) return;
+ return this.readdir(path.dirname(this.absPath(filename)), flags, function(err, files) {
var file;
- if (err) {
- return callback(err);
- }
+ if (err) return callback(err);
if (tryFiles((function() {
var _i, _len, _results;
_results = [];
@@ -325,8 +297,9 @@
return;
}
return callback(new Error("File not found: '" + filename + "'"));
- }, this));
+ });
};
+
Snockets.prototype.readdir = function(dir, flags, callback) {
var files;
if (flags.async) {
@@ -340,6 +313,7 @@
}
}
};
+
Snockets.prototype.stat = function(filePath, flags, callback) {
var stats;
if (flags.async) {
@@ -353,30 +327,28 @@
}
}
};
+
Snockets.prototype.readFile = function(filePath, flags, callback) {
- return this.stat(filePath, flags, __bind(function(err, stats) {
+ var _this = this;
+ return this.stat(filePath, flags, function(err, stats) {
var data, _ref;
- if (err) {
- return callback(err);
- }
- if (timeEq((_ref = this.cache[filePath]) != null ? _ref.mtime : void 0, stats.mtime)) {
+ if (err) return callback(err);
+ if (timeEq((_ref = _this.cache[filePath]) != null ? _ref.mtime : void 0, stats.mtime)) {
return callback(null, false);
}
if (flags.async) {
- return fs.readFile(this.absPath(filePath), __bind(function(err, data) {
- if (err) {
- return callback(err);
- }
- this.cache[filePath] = {
+ return fs.readFile(_this.absPath(filePath), function(err, data) {
+ if (err) return callback(err);
+ _this.cache[filePath] = {
mtime: stats.mtime,
data: data
};
return callback(null, true);
- }, this));
+ });
} else {
try {
- data = fs.readFileSync(this.absPath(filePath));
- this.cache[filePath] = {
+ data = fs.readFileSync(_this.absPath(filePath));
+ _this.cache[filePath] = {
mtime: stats.mtime,
data: data
};
@@ -385,8 +357,9 @@
return callback(e);
}
}
- }, this));
+ });
};
+
Snockets.prototype.compileFile = function(filePath) {
var ext, js, src;
if ((ext = path.extname(filePath)) === '.js') {
@@ -399,6 +372,7 @@
return true;
}
};
+
Snockets.prototype.absPath = function(relPath) {
if (relPath.match(EXPLICIT_PATH)) {
return relPath;
@@ -408,8 +382,11 @@
return path.join(process.cwd(), this.options.src, relPath);
}
};
+
return Snockets;
+
})();
+
module.exports.compilers = compilers = {
coffee: {
match: /\.js$/,
@@ -420,54 +397,70 @@
}
}
};
+
EXPLICIT_PATH = /^\/|^\.|:/;
+
HEADER = /(?:(\#\#\#.*\#\#\#\n?)|(\/\/.*\n?)|(\#.*\n?))+/;
+
DIRECTIVE = /^[\W]*=\s*(\w+.*?)(\*\\\/)?$/gm;
+
HoldingQueue = (function() {
+
+ HoldingQueue.name = 'HoldingQueue';
+
function HoldingQueue(_arg) {
this.task = _arg.task, this.onComplete = _arg.onComplete;
this.holdKeys = [];
}
+
HoldingQueue.prototype.waitFor = function(key) {
return this.holdKeys.push(key);
};
+
HoldingQueue.prototype.unwaitFor = function(key) {
return this.holdKeys = _.without(this.holdKeys, key);
};
+
HoldingQueue.prototype.perform = function() {
- var args, key;
+ var args, key,
+ _this = this;
key = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
- return this.task.apply(this, __slice.call(args).concat([__bind(function() {
- return this.unwaitFor(key);
- }, this)]));
+ return this.task.apply(this, __slice.call(args).concat([function() {
+ return _this.unwaitFor(key);
+ }]));
};
+
HoldingQueue.prototype.finalize = function() {
- var h;
+ var h,
+ _this = this;
if (this.holdKeys.length === 0) {
return this.onComplete();
} else {
- return h = setInterval((__bind(function() {
- if (this.holdKeys.length === 0) {
- this.onComplete();
+ return h = setInterval((function() {
+ if (_this.holdKeys.length === 0) {
+ _this.onComplete();
return clearInterval(h);
}
- }, this)), 10);
+ }), 10);
}
};
+
return HoldingQueue;
+
})();
+
parseDirectives = function(code) {
var header, match, _results;
- if (!(match = HEADER.exec(code))) {
- return [];
- }
+ code = code.replace(/[\r\t ]+$/gm, '\n');
+ if (!(match = HEADER.exec(code))) return [];
header = match[0];
_results = [];
while (match = DIRECTIVE.exec(header)) {
_results.push(match[1]);
}
return _results;
};
+
stripExt = function(filePath) {
var _ref;
if (_ref = path.extname(filePath), __indexOf.call(jsExts(), _ref) >= 0) {
@@ -476,6 +469,7 @@
return filePath;
}
};
+
jsExts = function() {
var ext;
return ((function() {
@@ -487,6 +481,7 @@
return _results;
})()).concat('.js');
};
+
minify = function(js) {
var ast, jsp, pro;
jsp = uglify.parser;
@@ -496,7 +491,9 @@
ast = pro.ast_squeeze(ast);
return pro.gen_code(ast);
};
+
timeEq = function(date1, date2) {
return (date1 != null) && (date2 != null) && date1.getTime() === date2.getTime();
};
+
}).call(this);
View
1 node_modules/dep-graph
View
1 node_modules/dep-graph/.gitignore
@@ -0,0 +1 @@
+node_modules
View
49 node_modules/dep-graph/Cakefile
@@ -0,0 +1,49 @@
+fs = require 'fs'
+{print} = require 'sys'
+{spawn, exec} = require 'child_process'
+{watchTree} = require 'watch-tree'
+
+build = (watch, callback) ->
+ if typeof watch is 'function'
+ callback = watch
+ watch = false
+ options = ['-c', '-o', 'lib', 'src']
+ options.unshift '-w' if watch
+
+ coffee = spawn 'coffee', options
+ coffee.stdout.on 'data', (data) -> print data.toString()
+ coffee.stderr.on 'data', (data) -> print data.toString()
+ coffee.on 'exit', (status) -> callback?() if status is 0
+
+task 'docs', 'Generate annotated source code with Docco', ->
+ fs.readdir 'src', (err, contents) ->
+ files = ("src/#{file}" for file in contents when /\.coffee$/.test file)
+ docco = spawn 'docco', files
+ docco.stdout.on 'data', (data) -> print data.toString()
+ docco.stderr.on 'data', (data) -> print data.toString()
+ docco.on 'exit', (status) -> callback?() if status is 0
+
+task 'build', 'Compile CoffeeScript source files', ->
+ build()
+
+task 'watch', 'Recompile CoffeeScript source files when modified', ->
+ build true
+
+task 'test', 'Run the test suite (and re-run if anything changes)', ->
+ suite = null
+ build ->
+ do runTests = ->
+ suite?.kill()
+ suiteNames = ['test']
+ suiteIndex = 0
+ do runNextTestSuite = ->
+ return unless suiteName = suiteNames[suiteIndex]
+ suite = spawn "coffee", ["-e", "{reporters} = require 'nodeunit'; reporters.default.run ['#{suiteName}.coffee']"], cwd: 'test'
+ suite.stdout.on 'data', (data) -> print data.toString()
+ suite.stderr.on 'data', (data) -> print data.toString()
+ suite.on 'exit', -> suiteIndex++; runNextTestSuite()
+ invoke 'docs' # lest I forget
+ testWatcher = watchTree 'test', 'sample-rate': 5
+ testWatcher.on 'fileModified', runTests
+ libWatcher = watchTree 'src', 'sample-rate': 5
+ libWatcher.on 'fileModified', -> build(-> runTests())
View
40 node_modules/dep-graph/README.mdown
@@ -0,0 +1,40 @@
+# dep-graph.js
+
+This is a small project spun off from [connect-assets](http://github.com/TrevorBurnham/connect-assets). Written in [CoffeeScript](coffeescript.org) by the author of [CoffeeScript: Accelerated JavaScript Development](http://pragprog.com/book/tbcoffee/coffeescript).
+
+## What's it for?
+
+Say you have a set of resources that depend on each other in some way. These resources can be anything—files, chains of command, plot twists on *Lost*—whatever. All that matters is that each one has a unique string identifier, and a list of direct dependencies.
+
+`dep-graph` makes it easy to compute "chains" of dependencies, with guaranteed logical ordering and no duplicates. That's trivial in most cases, but if `A` depends on `B` and `B` depends on `A`, a naïve dependency graph would get trapped in an infinite loop. `dep-graph` throws an error if any such "cycles" are detected.
+
+## How to use it?
+
+### In the browser
+
+ deps = new DepGraph
+ deps.add 'A', 'B' # A requires B
+ deps.add 'B', 'C' # B requires C
+ deps.getChain 'A' # ['C', 'B', 'A']
+
+### In Node.js
+
+Same as above, but first run
+
+ npm install dep-graph
+
+from your project's directory, and put
+
+ DepGraph = require 'dep-graph'
+
+at the top of your file.
+
+## License
+
+©2011 Trevor Burnham and available under the [MIT license](http://www.opensource.org/licenses/mit-license.php):
+
+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.
View
30 node_modules/dep-graph/docs/dep-graph.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html> <html> <head> <title>dep-graph.coffee</title> <meta http-equiv="content-type" content="text/html; charset=UTF-8"> <link rel="stylesheet" media="all" href="docco.css" /> </head> <body> <div id="container"> <div id="background"></div> <table cellpadding="0" cellspacing="0"> <thead> <tr> <th class="docs"> <h1> dep-graph.coffee </h1> </th> <th class="code"> </th> </tr> </thead> <tbody> <tr id="section-1"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-1">&#182;</a> </div> <p><a href="http://github.com/TrevorBurnham/dep-graph">dep-graph</a></p> </td> <td class="code"> <div class="highlight"><pre><span class="k">class</span> <span class="nx">DepGraph</span>
+ <span class="nv">constructor: </span><span class="o">-&gt;</span></pre></div> </td> </tr> <tr id="section-2"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-2">&#182;</a> </div> <p>The internal representation of the dependency graph in the format
+<code>id: [ids]</code>, indicating only <em>direct</em> dependencies.</p> </td> <td class="code"> <div class="highlight"><pre> <span class="vi">@map = </span><span class="p">{}</span></pre></div> </td> </tr> <tr id="section-3"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-3">&#182;</a> </div> <p>Add a direct dependency. Returns <code>false</code> if that dependency is a duplicate.</p> </td> <td class="code"> <div class="highlight"><pre> <span class="nv">add: </span><span class="nf">(id, depId) -&gt;</span>
+ <span class="nx">@map</span><span class="p">[</span><span class="nx">id</span><span class="p">]</span> <span class="o">?=</span> <span class="p">[]</span>
+ <span class="k">return</span> <span class="kc">false</span> <span class="k">if</span> <span class="nx">depId</span> <span class="k">in</span> <span class="nx">@map</span><span class="p">[</span><span class="nx">id</span><span class="p">]</span>
+ <span class="nx">@map</span><span class="p">[</span><span class="nx">id</span><span class="p">].</span><span class="nx">push</span> <span class="nx">depId</span>
+ <span class="nx">@map</span><span class="p">[</span><span class="nx">id</span><span class="p">]</span></pre></div> </td> </tr> <tr id="section-4"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-4">&#182;</a> </div> <p>Generate a list of all dependencies (direct and indirect) for the given id,
+in logical order with no duplicates.</p> </td> <td class="code"> <div class="highlight"><pre> <span class="nv">getChain: </span><span class="nf">(id, traversedPaths = [], traversedBranch = []) -&gt;</span>
+ <span class="nx">traversedPaths</span><span class="p">.</span><span class="nx">unshift</span> <span class="nx">id</span>
+ <span class="nx">traversedBranch</span><span class="p">.</span><span class="nx">unshift</span> <span class="nx">id</span>
+ <span class="k">return</span> <span class="p">[]</span> <span class="nx">unless</span> <span class="nx">@map</span><span class="p">[</span><span class="nx">id</span><span class="p">]</span>
+
+ <span class="nv">depIds = </span><span class="nx">@map</span><span class="p">[</span><span class="nx">id</span><span class="p">]</span>
+ <span class="k">for</span> <span class="nx">depId</span> <span class="k">in</span> <span class="nx">depIds</span><span class="p">.</span><span class="nx">slice</span><span class="p">(</span><span class="mi">0</span><span class="p">).</span><span class="nx">reverse</span><span class="p">()</span>
+ <span class="k">if</span> <span class="nx">depId</span> <span class="k">in</span> <span class="nx">traversedBranch</span> <span class="c1"># cycle</span>
+ <span class="k">throw</span> <span class="k">new</span> <span class="nb">Error</span><span class="p">(</span><span class="s2">&quot;Cyclic dependency from #{id} to #{depId}&quot;</span><span class="p">)</span>
+ <span class="k">if</span> <span class="nx">depId</span> <span class="k">in</span> <span class="nx">traversedPaths</span> <span class="c1"># duplicate, push to front</span>
+ <span class="nv">depIdIndex = </span><span class="nx">traversedPaths</span><span class="p">.</span><span class="nx">indexOf</span> <span class="nx">depId</span>
+ <span class="nx">traversedPaths</span><span class="p">[</span><span class="nx">depIdIndex</span><span class="p">..</span><span class="nx">depIdIndex</span><span class="p">]</span> <span class="o">=</span> <span class="p">[]</span>
+ <span class="nx">traversedPaths</span><span class="p">.</span><span class="nx">unshift</span> <span class="nx">depId</span>
+ <span class="k">continue</span>
+
+ <span class="nx">@getChain</span> <span class="nx">depId</span><span class="p">,</span> <span class="nx">traversedPaths</span><span class="p">,</span> <span class="nx">traversedBranch</span><span class="p">.</span><span class="nx">slice</span><span class="p">(</span><span class="mi">0</span><span class="p">)</span>
+
+ <span class="nx">traversedPaths</span><span class="p">[</span><span class="mi">0</span><span class="p">...</span><span class="o">-</span><span class="mi">1</span><span class="p">]</span></pre></div> </td> </tr> <tr id="section-5"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-5">&#182;</a> </div> <p>Export the class in Node, make it global in the browser.</p> </td> <td class="code"> <div class="highlight"><pre><span class="k">if</span> <span class="nx">module</span><span class="o">?</span><span class="p">.</span><span class="nx">exports</span><span class="o">?</span>
+ <span class="nv">module.exports = </span><span class="nx">DepGraph</span>
+<span class="k">else</span>
+ <span class="vi">@DepGraph = </span><span class="nx">DepGraph</span>
+
+</pre></div> </td> </tr> </tbody> </table> </div> </body> </html>
View
186 node_modules/dep-graph/docs/docco.css
@@ -0,0 +1,186 @@
+/*--------------------- Layout and Typography ----------------------------*/
+body {
+ font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif;
+ font-size: 15px;
+ line-height: 22px;
+ color: #252519;
+ margin: 0; padding: 0;
+}
+a {
+ color: #261a3b;
+}
+ a:visited {
+ color: #261a3b;
+ }
+p {
+ margin: 0 0 15px 0;
+}
+h1, h2, h3, h4, h5, h6 {
+ margin: 0px 0 15px 0;
+}
+ h1 {
+ margin-top: 40px;
+ }
+#container {
+ position: relative;
+}
+#background {
+ position: fixed;
+ top: 0; left: 525px; right: 0; bottom: 0;
+ background: #f5f5ff;
+ border-left: 1px solid #e5e5ee;
+ z-index: -1;
+}
+#jump_to, #jump_page {
+ background: white;
+ -webkit-box-shadow: 0 0 25px #777; -moz-box-shadow: 0 0 25px #777;
+ -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomleft: 5px;
+ font: 10px Arial;
+ text-transform: uppercase;
+ cursor: pointer;
+ text-align: right;
+}
+#jump_to, #jump_wrapper {
+ position: fixed;
+ right: 0; top: 0;
+ padding: 5px 10px;
+}
+ #jump_wrapper {
+ padding: 0;
+ display: none;
+ }
+ #jump_to:hover #jump_wrapper {
+ display: block;
+ }
+ #jump_page {
+ padding: 5px 0 3px;
+ margin: 0 0 25px 25px;
+ }
+ #jump_page .source {
+ display: block;
+ padding: 5px 10px;
+ text-decoration: none;
+ border-top: 1px solid #eee;
+ }
+ #jump_page .source:hover {
+ background: #f5f5ff;
+ }
+ #jump_page .source:first-child {
+ }
+table td {
+ border: 0;
+ outline: 0;
+}
+ td.docs, th.docs {
+ max-width: 450px;
+ min-width: 450px;
+ min-height: 5px;
+ padding: 10px 25px 1px 50px;
+ overflow-x: hidden;
+ vertical-align: top;
+ text-align: left;
+ }
+ .docs pre {
+ margin: 15px 0 15px;
+ padding-left: 15px;
+ }
+ .docs p tt, .docs p code {
+ background: #f8f8ff;
+ border: 1px solid #dedede;
+ font-size: 12px;
+ padding: 0 0.2em;
+ }
+ .pilwrap {
+ position: relative;
+ }
+ .pilcrow {
+ font: 12px Arial;
+ text-decoration: none;
+ color: #454545;
+ position: absolute;
+ top: 3px; left: -20px;
+ padding: 1px 2px;
+ opacity: 0;
+ -webkit-transition: opacity 0.2s linear;
+ }
+ td.docs:hover .pilcrow {
+ opacity: 1;
+ }
+ td.code, th.code {
+ padding: 14px 15px 16px 25px;
+ width: 100%;
+ vertical-align: top;
+ background: #f5f5ff;
+ border-left: 1px solid #e5e5ee;
+ }
+ pre, tt, code {
+ font-size: 12px; line-height: 18px;
+ font-family: Monaco, Consolas, "Lucida Console", monospace;
+ margin: 0; padding: 0;
+ }
+
+
+/*---------------------- Syntax Highlighting -----------------------------*/
+td.linenos { background-color: #f0f0f0; padding-right: 10px; }
+span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
+body .hll { background-color: #ffffcc }
+body .c { color: #408080; font-style: italic } /* Comment */
+body .err { border: 1px solid #FF0000 } /* Error */
+body .k { color: #954121 } /* Keyword */
+body .o { color: #666666 } /* Operator */
+body .cm { color: #408080; font-style: italic } /* Comment.Multiline */
+body .cp { color: #BC7A00 } /* Comment.Preproc */
+body .c1 { color: #408080; font-style: italic } /* Comment.Single */
+body .cs { color: #408080; font-style: italic } /* Comment.Special */
+body .gd { color: #A00000 } /* Generic.Deleted */
+body .ge { font-style: italic } /* Generic.Emph */
+body .gr { color: #FF0000 } /* Generic.Error */
+body .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+body .gi { color: #00A000 } /* Generic.Inserted */
+body .go { color: #808080 } /* Generic.Output */
+body .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+body .gs { font-weight: bold } /* Generic.Strong */
+body .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+body .gt { color: #0040D0 } /* Generic.Traceback */
+body .kc { color: #954121 } /* Keyword.Constant */
+body .kd { color: #954121; font-weight: bold } /* Keyword.Declaration */
+body .kn { color: #954121; font-weight: bold } /* Keyword.Namespace */
+body .kp { color: #954121 } /* Keyword.Pseudo */
+body .kr { color: #954121; font-weight: bold } /* Keyword.Reserved */
+body .kt { color: #B00040 } /* Keyword.Type */
+body .m { color: #666666 } /* Literal.Number */
+body .s { color: #219161 } /* Literal.String */
+body .na { color: #7D9029 } /* Name.Attribute */
+body .nb { color: #954121 } /* Name.Builtin */
+body .nc { color: #0000FF; font-weight: bold } /* Name.Class */
+body .no { color: #880000 } /* Name.Constant */
+body .nd { color: #AA22FF } /* Name.Decorator */
+body .ni { color: #999999; font-weight: bold } /* Name.Entity */
+body .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+body .nf { color: #0000FF } /* Name.Function */
+body .nl { color: #A0A000 } /* Name.Label */
+body .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+body .nt { color: #954121; font-weight: bold } /* Name.Tag */
+body .nv { color: #19469D } /* Name.Variable */
+body .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+body .w { color: #bbbbbb } /* Text.Whitespace */
+body .mf { color: #666666 } /* Literal.Number.Float */
+body .mh { color: #666666 } /* Literal.Number.Hex */
+body .mi { color: #666666 } /* Literal.Number.Integer */
+body .mo { color: #666666 } /* Literal.Number.Oct */
+body .sb { color: #219161 } /* Literal.String.Backtick */
+body .sc { color: #219161 } /* Literal.String.Char */
+body .sd { color: #219161; font-style: italic } /* Literal.String.Doc */
+body .s2 { color: #219161 } /* Literal.String.Double */
+body .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+body .sh { color: #219161 } /* Literal.String.Heredoc */
+body .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+body .sx { color: #954121 } /* Literal.String.Other */
+body .sr { color: #BB6688 } /* Literal.String.Regex */
+body .s1 { color: #219161 } /* Literal.String.Single */
+body .ss { color: #19469D } /* Literal.String.Symbol */
+body .bp { color: #954121 } /* Name.Builtin.Pseudo */
+body .vc { color: #19469D } /* Name.Variable.Class */
+body .vg { color: #19469D } /* Name.Variable.Global */
+body .vi { color: #19469D } /* Name.Variable.Instance */
+body .il { color: #666666 } /* Literal.Number.Integer.Long */
View
61 node_modules/dep-graph/lib/dep-graph.js
@@ -0,0 +1,61 @@
+(function() {
+ var DepGraph;
+ var __indexOf = Array.prototype.indexOf || function(item) {
+ for (var i = 0, l = this.length; i < l; i++) {
+ if (this[i] === item) return i;
+ }
+ return -1;
+ };
+ DepGraph = (function() {
+ function DepGraph() {
+ this.map = {};
+ }
+ DepGraph.prototype.add = function(id, depId) {
+ var _base, _ref;
+ if ((_ref = (_base = this.map)[id]) == null) {
+ _base[id] = [];
+ }
+ if (__indexOf.call(this.map[id], depId) >= 0) {
+ return false;
+ }
+ this.map[id].push(depId);
+ return this.map[id];
+ };
+ DepGraph.prototype.getChain = function(id, traversedPaths, traversedBranch) {
+ var depId, depIdIndex, depIds, _i, _len, _ref, _ref2;
+ if (traversedPaths == null) {
+ traversedPaths = [];
+ }
+ if (traversedBranch == null) {
+ traversedBranch = [];
+ }
+ traversedPaths.unshift(id);
+ traversedBranch.unshift(id);
+ if (!this.map[id]) {
+ return [];
+ }
+ depIds = this.map[id];
+ _ref = depIds.slice(0).reverse();
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ depId = _ref[_i];
+ if (__indexOf.call(traversedBranch, depId) >= 0) {
+ throw new Error("Cyclic dependency from " + id + " to " + depId);
+ }
+ if (__indexOf.call(traversedPaths, depId) >= 0) {
+ depIdIndex = traversedPaths.indexOf(depId);
+ [].splice.apply(traversedPaths, [depIdIndex, depIdIndex - depIdIndex + 1].concat(_ref2 = [])), _ref2;
+ traversedPaths.unshift(depId);
+ continue;
+ }
+ this.getChain(depId, traversedPaths, traversedBranch.slice(0));
+ }
+ return traversedPaths.slice(0, -1);
+ };
+ return DepGraph;
+ })();
+ if ((typeof module !== "undefined" && module !== null ? module.exports : void 0) != null) {
+ module.exports = DepGraph;
+ } else {
+ this.DepGraph = DepGraph;
+ }
+}).call(this);
View
17 node_modules/dep-graph/package.json
@@ -0,0 +1,17 @@
+{
+ "author": "Trevor Burnham (http://trevorburnham.com)",
+ "name": "dep-graph",
+ "description": "Simple dependency graph management",
+ "version": "1.0.1",
+ "homepage": "http://github.com/TrevorBurnham/dep-graph",
+ "repository": {
+ "type": "git",
+ "url": "git://github.com/TrevorBurnham/dep-graph.git"
+ },
+ "main": "lib/dep-graph.js",
+ "devDependencies": {
+ "coffee-script": "1.1.2",
+ "nodeunit": "0.5.4",
+ "watch-tree": "0.1.1"
+ }
+}
View
41 node_modules/dep-graph/src/dep-graph.coffee
@@ -0,0 +1,41 @@
+# [dep-graph](http://github.com/TrevorBurnham/dep-graph)
+
+class DepGraph
+ constructor: ->
+ # The internal representation of the dependency graph in the format
+ # `id: [ids]`, indicating only *direct* dependencies.
+ @map = {}
+
+ # Add a direct dependency. Returns `false` if that dependency is a duplicate.
+ add: (id, depId) ->
+ @map[id] ?= []
+ return false if depId in @map[id]
+ @map[id].push depId
+ @map[id]
+
+ # Generate a list of all dependencies (direct and indirect) for the given id,
+ # in logical order with no duplicates.
+ getChain: (id, traversedPaths = [], traversedBranch = []) ->
+ traversedPaths.unshift id
+ traversedBranch.unshift id
+ return [] unless @map[id]
+
+ depIds = @map[id]
+ for depId in depIds.slice(0).reverse()
+ if depId in traversedBranch # cycle
+ throw new Error("Cyclic dependency from #{id} to #{depId}")
+ if depId in traversedPaths # duplicate, push to front
+ depIdIndex = traversedPaths.indexOf depId
+ traversedPaths[depIdIndex..depIdIndex] = []
+ traversedPaths.unshift depId
+ continue
+
+ @getChain depId, traversedPaths, traversedBranch.slice(0)
+
+ traversedPaths[0...-1]
+
+# Export the class in Node, make it global in the browser.
+if module?.exports?
+ module.exports = DepGraph
+else
+ @DepGraph = DepGraph
View
35 node_modules/dep-graph/test/test.coffee
@@ -0,0 +1,35 @@
+DepGraph = require('../lib/dep-graph.js')
+depGraph = new DepGraph
+
+exports['Direct dependencies are chained in original order'] = (test) ->
+ depGraph.add '0', '1'
+ depGraph.add '0', '2'
+ depGraph.add '0', '3'
+ test.deepEqual depGraph.getChain('0'), ['1', '2', '3']
+ test.done()
+
+exports['Indirect dependencies are chained before their dependents'] = (test) ->
+ depGraph.add '2', 'A'
+ depGraph.add '2', 'B'
+ test.deepEqual depGraph.getChain('0'), ['1', 'A', 'B', '2', '3']
+ test.done()
+
+exports['getChain can safely be called for unknown resources'] = (test) ->
+ test.doesNotThrow -> depGraph.getChain('Z')
+ test.deepEqual depGraph.getChain('Z'), []
+ test.done()
+
+exports['Cyclic dependencies are detected'] = (test) ->
+ depGraph.add 'yin', 'yang'
+ depGraph.add 'yang', 'yin'
+ test.throws -> depGraph.getChain 'yin'
+ test.throws -> depGraph.getChain 'yang'
+ test.done()
+
+exports['Arc direction is taken into account (issue #1)'] = (test) ->
+ depGraph.add "MAIN", "One"
+ depGraph.add "MAIN", "Three"
+ depGraph.add "One", "Two"
+ depGraph.add "Two", "Three"
+ test.deepEqual depGraph.getChain("MAIN"), ['Three', 'Two', 'One']
+ test.done()
View
1 src/snockets.coffee
@@ -287,6 +287,7 @@ class HoldingQueue
), 10
parseDirectives = (code) ->
+ code = code.replace /[\r\t ]+$/gm, '\n' # fix for issue #2
return [] unless match = HEADER.exec(code)
header = match[0]
match[1] while match = DIRECTIVE.exec header

0 comments on commit ec94f74

Please sign in to comment.