fixing json compiler and updating uglify-js version and associated tests

examples/src/js/app.js

@@ -1,13 +1,13 @@
 var $ = require('jquery'),
     backbone = require('backbone'),
     template = require('templates/world'),
-    hbarsTemplate = require('templates/hello'),
+    hbarsTemplate = require('./templates/hello'),
     name = require("./foo").name,
-    myconfig = require("./myconfig");
+    config = require("./config");
 
 console.log("foo's name is.....", name);
 console.log("backbone version is", backbone.VERSION);
-console.log("Config variable some_key: " + myconfig.some_key);
+console.log("Config is: " + JSON.stringify(config));
 
 exports.app = {
   foo : "moar...",

lib/assembly/compilers/json.js

@@ -3,11 +3,7 @@ var utile = require('utile');
 exports.name = "json compiler";
 exports.mimeType = "application/javascript";
 
-var JsonCompiler = exports.JsonCompiler = function(options) {
-  this.options = options;
-};
-
-JsonCompiler.prototype.compile = function(file, data, cb) {
+exports.compile = function(file, data, cb) {
   try {
     var result = "module.exports =" + JSON.stringify(JSON.parse(data));
     cb(null, result);
@@ -17,9 +13,7 @@ JsonCompiler.prototype.compile = function(file, data, cb) {
 };
 
 exports.attach = function (options) {
-  var compilerOptions = utile.mixin({}, options);
-  var compiler = new JsonCompiler(compilerOptions);
-
   var worker = this.worker;
-  worker.registerCompiler(".json", compiler);
+
+  worker.registerCompiler(".json", module.exports);
 };

package.json

@@ -13,7 +13,7 @@
       "url": "http://www.apache.org/licenses/LICENSE-2.0"
     }
    ],
-  "keywords": ["client", "templates", "handlebars", "middleware","flatiron", "web"],
+  "keywords": ["client", "backbone", "templates", "handlebars", "middleware", "web"],
   "dependencies": {
     "broadway" : "0.1.x",
     "less" : "1.3.x",
@@ -24,21 +24,22 @@
     "read-dir-files" : "0.1.x",
     "detective" : "~0.1.0",
     "resolve" : "0.1.x",
-    "uglify-js" : "1.2.x",
+    "uglify-js" : "1.3.x",
     "traverse" : "0.6.x",
     "optimist" : "0.3.x"
   },
   "devDependencies": {
     "mocha" : "1.3.x",
     "should": "0.6.x",
-    "coffee-script" : "1.2.x",
+    "coffee-script" : "1.3.x",
     "handlebars" : "1.0.x",
     "underscore" : "1.3.x",
     "express" : "2.5.x"
   },
   "bin": { "assembly": "./bin/assembly" },
   "scripts": {
-    "test"  : "make test"
+    "test"  : "make test",
+    "start" : "node examples/server.js"
   },
   "engines": { "node": ">= 0.6.0" },
   "main": "./lib/assembly"

test/compilers/json-test.js

@@ -1,20 +1,18 @@
 var TestHelper = require("../test-helper"),
-    JsonCompiler = require("../../lib/assembly/compilers/json").JsonCompiler,
+    JsonCompiler = require("../../lib/assembly/compilers/json"),
     util = require('util'),
     should = require('should'),
     fs = require("fs"),
     path = require('path');
 
 describe("JsonCompiler", function() {
-  var compiler;
   beforeEach(function(){
     var app = TestHelper.mockApp();
-    compiler = new JsonCompiler();
   });
 
   describe("Compile", function(){
     it('should only have dev variables', function(done) {
-      compiler.compile(TestHelper.jsRoot + "/config.json", TestHelper.fixture("/js/config.json"), function(err, data) {
+      JsonCompiler.compile(TestHelper.jsRoot + "/config.json", TestHelper.fixture("/js/config.json"), function(err, data) {
         should.not.exist(err);
 
         data.should.include('def');

test/fixtures/amd/coffee_in.coffee

@@ -0,0 +1,4 @@
+$ = require('jquery');
+
+exports =
+  foo: "bar"

test/fixtures/amd/coffee_out_expected.js

@@ -1,9 +1,9 @@
 define("amd/coffee_out", [ "require", "module", "exports", "jquery" ], function(require, module, exports) {
-    ((function() {
+    (function() {
         var $, exports;
         $ = require("jquery");
         exports = {
             foo: "bar"
         };
-    })).call(this);
+    }).call(this);
 });

test/processors/amdify-test.js

@@ -21,7 +21,7 @@ describe("Amdify Processor", function() {
       var src = amdify.process(TestHelper.testSrcDir +"/app.js", foo);
       src.should.eql(TestHelper.fixture("amd/expected.js"));
       done();
-    });    
+    });
 
     it("should amdify coffeescript compiled code", function(done) {
       var coffee = TestHelper.fixture("/amd/coffee_out.js");