Updated docs

Added coffeescript loader for node
Added coffeescript test for node
Moved node tests into /test

README.md

@@ -79,6 +79,7 @@ Thanks to the following people:
 * [msaglietto](https://github.com/msaglietto)
 * [adambiggs](https://github.com/adambiggs)
 * [ashwinr](https://github.com/ashwinr)
+* [provegard](https://github.com/provegard)
 * [flrent](https://github.com/flrent)
 
 And thanks also to: [RequireJS](http://requirejs.org/), [Esprima](http://esprima.org/), [node-falafel](https://github.com/substack/node-falafel), [Mocha](http://visionmedia.github.com/mocha/), [Qunit](http://qunitjs.com/).

docs/advanced_browser.md

@@ -1,6 +1,6 @@
 # Advanced Guide (browser version)
 
-This guide details creating a [custom reporter](#reporters) or [custom adapter](#adapters) for Blanket.js
+This guide details creating a [custom reporter](#reporters), [custom adapter](#adapters), or [cusotm loader](#loaders) for Blanket.js
 
 It is assumed that you have already read the Intermediate guide.
 
@@ -100,3 +100,10 @@ An example coverage result object could be:
     }
 }
 ```
+
+## Loaders
+
+Loaders are used to provide custom requirejs loaders to blanket.
+CoffeeScript files can be covered in this manner by providing an overriding version of the requirejs coffeescript plugin.
+
+See the [coffeescript loader](https://raw.github.com/Migrii/blanket/master/src/loaders/blanket_cs.js) as an example of a loader.

docs/intermediate_browser.md

@@ -19,7 +19,7 @@ To begin you will need:
 
 3. Add a `data-cover-only` attribute to avoid having to add `data-cover` to each script you want covered.  You can pass the filter value as a string to match, an array of filename, or a regular expression:
     ```<script src="blanket.min.js" data-cover-adapter="jasmine-blanket.js"  
-        data-cover-only="['source1.js','src/source2.js']"></script>```
+        data-cover-only="[source1.js,src/source2.js]"></script>```
 
 4. Open the test runner in the browser.  The coverage details will be appended below the test results.
 

grunt.js

@@ -9,6 +9,7 @@ module.exports = function(grunt) {
     blanketTest: {
       normal:{
         node: "<%= cmds.mocha %> <%= runners.node %>",
+        nodeCS: "<%= cmds.mochaCS %> <%= runners.nodeCS %>",
         browser: "<%= cmds.phantom %> <%= phantom.qunit %> <%= runners.browser %>",
         browserRequire: "<%= cmds.phantom %> <%= phantom.qunit %> <%= runners.browserRequire %>",
         browserBackbone: "<%= cmds.phantom %> <%= phantom.qunit %> <%= runners.browserBackbone %>",

package.json

@@ -40,7 +40,8 @@
       "threshold": 70
     },
     "blanket": {
-      "pattern": "test"
+      "pattern": "test",
+      "loader": "./node-loaders/coffee-script"
     }
   },
   "keywords": [

src/index.js

@@ -2,29 +2,77 @@
 /*                                 */
  /*---------------------------------*/
   /* Blanket.js                      */
-   /* version 0.9.4 alpha             */
+   /* version 1.0.0                   */
   /* See README.md for revision news */
  /*---------------------------------*/
   /*                                */
   /*-------------------------------*/
 
 
-var fs = require("fs");
-var path = process.cwd() + '/package.json';
-
-var file = JSON.parse(fs.readFileSync(path, 'utf8'));
-
-var packageConfig = file.scripts &&
+var fs = require("fs"),
+    path = require("path"),
+    configPath = process.cwd() + '/package.json',
+    file = JSON.parse(fs.readFileSync(configPath, 'utf8')),
+    packageConfig = file.scripts &&
                     file.scripts.blanket &&
                     file.scripts.blanket.pattern ?
                       file.scripts.blanket.pattern :
-                      "src";
-pattern = packageConfig;
+                      "src",
+    pattern = packageConfig,
+    blanket = require("./blanket").blanket,
+    oldLoader = require.extensions['.js'];
+
 
-var blanket = require("./blanket").blanket;
 blanket.options("filter",pattern);
-require("./node");
 
+//helper functions
+blanket.normalizeBackslashes = function (str) {
+    return str.replace(/\\/g, '/');
+};
+
+//you can pass in a string, a regex, or an array of files
+blanket.matchPattern = function (filename,pattern){
+    if (typeof pattern === 'string'){
+        return filename.indexOf(blanket.normalizeBackslashes(pattern)) > -1;
+    }else if ( pattern instanceof Array ){
+        return pattern.some(function(elem){
+            return filename.indexOf(blanket.normalizeBackslashes(elem)) > -1;
+        });
+    }else if (pattern instanceof RegExp){
+        return pattern.test(filename);
+    }else{
+        throw new Error("Bad file instrument indicator.  Must be a string, regex, or array.");
+    }
+};
+
+//instrument js files
+require.extensions['.js'] = function(localModule, filename) {
+    var pattern = blanket.options("filter");
+    filename = blanket.normalizeBackslashes(filename);
+    if (blanket.matchPattern(filename,pattern)){
+        var content = fs.readFileSync(filename, 'utf8');
+        blanket.instrument({
+            inputFile: content,
+            inputFileName: filename
+        },function(instrumented){
+            var baseDirPath = blanket.normalizeBackslashes(path.dirname(filename))+'/.';
+            try{
+                instrumented = instrumented.replace(/require\s*\(\s*("|')\./g,'require($1'+baseDirPath);
+                localModule._compile(instrumented, filename);
+            }
+            catch(err){
+                console.log("Error parsing instrumented code: "+err);
+            }
+        });
+    }else{
+        oldLoader(localModule,filename);
+    }
+};
+
+//if a loader is specified, use it
+if (file.scripts.blanket.loader){
+    require(file.scripts.blanket.loader)(blanket);
+}
 
 module.exports = blanket;
 

src/node-loaders/coffee-script.js

@@ -0,0 +1,33 @@
+var fs = require("fs"),
+    path = require("path");
+
+module.exports = function(blanket){
+    var coffeeScript = require("coffee-script");
+    var oldLoaderCS = require.extensions['.coffee'];
+
+    require.extensions['.coffee'] = function(localModule, filename) {
+
+        var pattern = blanket.options("filter");
+        filename = blanket.normalizeBackslashes(filename);
+        if (blanket.matchPattern(filename,pattern)){
+
+            var content = fs.readFileSync(filename, 'utf8');
+            content = coffeeScript.compile(content);
+            blanket.instrument({
+                inputFile: content,
+                inputFileName: filename
+            },function(instrumented){
+                var baseDirPath = blanket.normalizeBackslashes(path.dirname(filename))+'/.';
+                try{
+                    instrumented = instrumented.replace(/require\s*\(\s*("|')\./g,'require($1'+baseDirPath);
+                    localModule._compile(instrumented, filename);
+                }
+                catch(err){
+                    console.log("Error parsing instrumented code: "+err);
+                }
+            });
+        }else{
+            oldLoaderCS(localModule,filename);
+        }
+    };
+};

test/test-node/fixture/src/sample.coffee

@@ -0,0 +1,2 @@
+module.exports = ->
+  10

test-node/testrunner.js → test/test-node/testrunner.js

@@ -1,13 +1,13 @@
 var path = require("path");
-var blanket = require("../src/index");
+var blanket = require("../../src/index");
 blanket.options("filter","/src/blanket");
 
 /*
 since we're using blanket to test blanket,
 we need to remove the module entry from the require cache
 so that it can be instrumented.
 */
-delete require.cache[path.normalize(__dirname+"/../src/blanket.js")];
+delete require.cache[path.normalize(__dirname+"/../../src/blanket.js")];
 /*
 now start the tests
 */

test/test-node/testrunner_cs.js

@@ -0,0 +1,4 @@
+var blanket = require("../../src/index");
+blanket.options("filter","src/sample");
+
+require("./tests/coffee-script/test.coffee");

test-node/tests/blanket_core.js → test/test-node/tests/blanket_core.js

@@ -1,8 +1,8 @@
 /*  core test to lib/blanket.js  */
 
 var assert = require("assert"),
-    blanketCore = require("../../src/blanket").blanket,
-    falafel = require("../../src/lib/falafel").falafel,
+    blanketCore = require("../../../src/blanket").blanket,
+    falafel = require("../../../src/lib/falafel").falafel,
     core_fixtures = require("../fixture/core_fixtures");
 
 

test/test-node/tests/coffee-script/test.coffee

@@ -0,0 +1,5 @@
+sampleTest = require("../../fixture/src/sample.coffee")
+assert = require("assert")
+describe "require test", ->
+  it "should return 10", ->
+    assert.equal 10, sampleTest()