Change custom reporter format to avoid "define" conflicts.

alex-seville · May 4, 2013 · 4a64aed · 4a64aed
1 parent 237972f
commit 4a64aed
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 30 deletions.
diff --git a/component.json b/component.json
@@ -1,5 +1,5 @@
 {
   "name": "blanket",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "main": ["./dist/qunit/blanket.js"]
 }
diff --git a/dist/jasmine/blanket_jasmine.js b/dist/jasmine/blanket_jasmine.js
@@ -1,4 +1,4 @@
-/*! blanket - v1.1.4 */ 
+/*! blanket - v1.1.5 */ 
 
 (function(define){
 
@@ -4492,9 +4492,8 @@ _blanket.extend({
             delete coverage_data.files.branchFcn;
         }
         if (typeof _blanket.options("reporter") === "string"){
-            require([_blanket.options("reporter").replace(".js","")],function(r){
-                r(coverage_data,_blanket.options("reporter_options"));
-            });
+            _blanket._loadFile(_blanket.options("reporter"));
+            _blanket.customReporter(coverage_data,_blanket.options("reporter_options"));
         }else if (typeof _blanket.options("reporter") === "function"){
             _blanket.options("reporter")(coverage_data);
         }else if (typeof _blanket.defaultReporter === 'function'){

diff --git a/dist/jasmine/blanket_jasmine.min.js b/dist/jasmine/blanket_jasmine.min.js
diff --git a/dist/qunit/blanket.js b/dist/qunit/blanket.js
@@ -1,4 +1,4 @@
-/*! blanket - v1.1.4 */ 
+/*! blanket - v1.1.5 */ 
 
 if (typeof QUnit !== 'undefined'){ QUnit.config.autostart = false; }
 (function(define){
@@ -4493,9 +4493,8 @@ _blanket.extend({
             delete coverage_data.files.branchFcn;
         }
         if (typeof _blanket.options("reporter") === "string"){
-            require([_blanket.options("reporter").replace(".js","")],function(r){
-                r(coverage_data,_blanket.options("reporter_options"));
-            });
+            _blanket._loadFile(_blanket.options("reporter"));
+            _blanket.customReporter(coverage_data,_blanket.options("reporter_options"));
         }else if (typeof _blanket.options("reporter") === "function"){
             _blanket.options("reporter")(coverage_data);
         }else if (typeof _blanket.defaultReporter === 'function'){

diff --git a/dist/qunit/blanket.min.js b/dist/qunit/blanket.min.js
diff --git a/docs/advanced_browser.md b/docs/advanced_browser.md
@@ -40,15 +40,15 @@ Custom reporters are used by Blanket to display the coverage results.  Blanket c
 
 See the [simple_json_reporter](https://raw.github.com/alex-seville/blanket/master/src/reporters/simple_json_reporter.js) as a very basic example of a reporter.
 
-Reporters need to be wrapped in a define statement, and return a function that accept the coverage results object as an argument, ex:
+Reporters are functions assigned to blanket.customReporter, which accept the coverage results object as an argument, ex:
 
 ```
-define([],function myReporter(){
+(function myReporter(){
     //your reporter code
-    return function(coverage_results){
+    blanket.customReporter=function(coverage_results){
         console.log(coverage_results);
     };
-};
+})();
 ```
 
 The example above will create a reporter that will print the coverage result object to the console.  Not useful, but it illustrates the pattern.

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "blanket",
   "description": "seamless js code coverage",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "homepage": "https://github.com/alex-seville/blanket",
   "author": {
     "name": "Alex-Seville",

diff --git a/src/blanket_browser.js b/src/blanket_browser.js
@@ -165,9 +165,8 @@ _blanket.extend({
             delete coverage_data.files.branchFcn;
         }
         if (typeof _blanket.options("reporter") === "string"){
-            require([_blanket.options("reporter").replace(".js","")],function(r){
-                r(coverage_data,_blanket.options("reporter_options"));
-            });
+            _blanket._loadFile(_blanket.options("reporter"));
+            _blanket.customReporter(coverage_data,_blanket.options("reporter_options"));
         }else if (typeof _blanket.options("reporter") === "function"){
             _blanket.options("reporter")(coverage_data);
         }else if (typeof _blanket.defaultReporter === 'function'){

diff --git a/src/reporters/lcov_reporter.js b/src/reporters/lcov_reporter.js
@@ -1,10 +1,11 @@
-define([],function lcov_reporter(){
+//lcov_reporter
+(function (){
     //takes the option: toHTML {boolean}
-    
+
     var body = document.body;
 
     var appendHtml = function ( filename,data,toHTML) {
-       
+
         var str="";
         str += 'SF:' + filename + '\n';
 
@@ -27,8 +28,8 @@ define([],function lcov_reporter(){
             window._$blanket_LCOV = str;
         }
     };
-    
-    return function(coverageData,options){
+
+    blanket.customReporter=function(coverageData,options){
         var toHTML=true;
         if (typeof options !== 'undefined' && typeof options.toHTML !== 'undefined'){
             toHTML = options.toHTML;
@@ -38,4 +39,4 @@ define([],function lcov_reporter(){
           appendHtml(filename,data,toHTML);
         }
     };
-});
+})();
diff --git a/src/reporters/simple_json_reporter.js b/src/reporters/simple_json_reporter.js
@@ -1,14 +1,15 @@
-define([],function simple_json_reporter(){
-
+//simple_json_reporter
+(function (){
+
     var body = document.body;
 
     var appendHtml = function (el, str) {
         var div = document.createElement('div');
         div.innerText = str;
         el.appendChild(div);
     };
-    
-    return function(coverageData){
+
+    blanket.customReporter= function(coverageData){
         appendHtml(body, JSON.stringify(coverageData,null,"\t"));
     };
-});
+})();