Less wrapper code.

Author: ezzatron

lib/handler/CommonCoffeeHandler.js

@@ -8,14 +8,8 @@ HandlerError = require './error/HandlerError'
 module.exports = class CommonCoffeeHandler
 
     constructor: (@template) ->
-        @template ?= '''
-            function () {
-            var module = {};
-
-            %s
-            return module.exports.apply(this, arguments);
-            }
-        '''
+        @template ?=
+            "(function () {\n\n%s\nreturn module.exports;\n}).call(this);"
 
     handleFile: (filePath) => new Promise (resolve, reject) =>
         return resolve null if path.extname(filePath) isnt '.coffee'
@@ -29,7 +23,7 @@ module.exports = class CommonCoffeeHandler
             coffee = require 'coffee-script'
 
             try
-                js = coffee.compile data.toString()
+                js = coffee.compile data.toString(), bare: true
             catch error
                 error = new HandlerError 'CommonCoffeeHandler', filePath, error
 

lib/handler/CommonJsHandler.js

@@ -8,16 +8,8 @@ HandlerError = require './error/HandlerError'
 module.exports = class CommonJsHandler
 
     constructor: (@template) ->
-        @template ?= '''
-            function () {
-            var module = {};
-            (function () {
-
-            %s
-            }).call(this);
-            return module.exports.apply(this, arguments);
-            }
-        '''
+        @template ?=
+            "(function () {\n\n%s\nreturn module.exports;\n}).call(this);"
 
     handleFile: (filePath) => new Promise (resolve, reject) =>
         return resolve null if path.extname(filePath) isnt '.js'

src/handler/CommonCoffeeHandler.coffee

@@ -1,5 +1,3 @@
-fs = require 'fs'
-
 CommonCoffeeHandler = require '../../../src/handler/CommonCoffeeHandler'
 HandlerError = require '../../../src/handler/error/HandlerError'
 
@@ -15,22 +13,18 @@ describe 'CommonCoffeeHandler', ->
         expected = [
             'coffee'
             '''
-                function () {
-                var module = {};
+                (function () {
 
-                (function() {
-                  var test;
+                var test;
 
-                  test = 'It works.';
+                test = 'It works.';
 
-                  module.exports = function() {
-                    return [test, Array.prototype.slice.call(arguments)];
-                  };
+                module.exports = function() {
+                  return [test, Array.prototype.slice.call(arguments)];
+                };
 
+                return module.exports;
                 }).call(this);
-
-                return module.exports.apply(this, arguments);
-                }
             '''
         ]
 
@@ -41,8 +35,7 @@ describe 'CommonCoffeeHandler', ->
     it 'produces code that will work with CouchDB', ->
         return @subject.handleFile @filePath
         .then (actual) =>
-            fs.writeFileSync @tmpPath, "module.exports = #{actual[1]};"
-            actual = (require @tmpPath) 'a', 'b'
+            actual = (eval actual[1])('a', 'b');
 
             assert.deepEqual actual, ['It works.', ['a', 'b']]
 

src/handler/CommonJsHandler.coffee

@@ -1,5 +1,3 @@
-fs = require 'fs'
-
 CommonJsHandler = require '../../../src/handler/CommonJsHandler'
 HandlerError = require '../../../src/handler/error/HandlerError'
 
@@ -15,16 +13,13 @@ describe 'CommonJsHandler', ->
         expected = [
             'js'
             '''
-                function () {
-                var module = {};
                 (function () {
 
                 var test = 'It works.';
                 module.exports = function () { return [test, Array.prototype.slice.call(arguments)] };
 
+                return module.exports;
                 }).call(this);
-                return module.exports.apply(this, arguments);
-                }
             '''
         ]
 
@@ -35,8 +30,7 @@ describe 'CommonJsHandler', ->
     it 'produces code that will work with CouchDB', ->
         return @subject.handleFile @filePath
         .then (actual) =>
-            fs.writeFileSync @tmpPath, "module.exports = #{actual[1]};"
-            actual = (require @tmpPath) 'a', 'b'
+            actual = (eval actual[1])('a', 'b');
 
             assert.deepEqual actual, ['It works.', ['a', 'b']]
 

test/suite/handler/CommonCoffeeHandler.spec.coffee

@@ -7,34 +7,27 @@ describe 'Module', ->
 
     it 'builds a result using the correct handlers', ->
         expectedCoffee = '''
-            function () {
-            var module = {};
+            (function () {
 
-            (function() {
-              var test;
+            var test;
 
-              test = 'It works.';
+            test = 'It works.';
 
-              module.exports = function() {
-                return [test, Array.prototype.slice.call(arguments)];
-              };
+            module.exports = function() {
+              return [test, Array.prototype.slice.call(arguments)];
+            };
 
+            return module.exports;
             }).call(this);
-
-            return module.exports.apply(this, arguments);
-            }
         '''
         expectedJs = '''
-            function () {
-            var module = {};
             (function () {
 
             var test = 'It works.';
             module.exports = function () { return [test, Array.prototype.slice.call(arguments)] };
 
+            return module.exports;
             }).call(this);
-            return module.exports.apply(this, arguments);
-            }
         '''
         expected =
             'coffee': expectedCoffee