Merge pull request #59 from sintaxi/release-v0.9.1

Release v0.9.1

lib/javascript/index.js

@@ -1,7 +1,7 @@
-
 var path    = require("path")
 var fs      = require("fs")
 var helpers = require('../helpers')
+var minify  = require('minify')
 
 /**
  * Build Processor list for javascripts.
@@ -41,8 +41,19 @@ module.exports = function(root, filePath, callback){
      * Lookup Directories
      */
 
-    var render = processors[ext].compile(srcPath, data, callback)
+    var render = processors[ext].compile(srcPath, data, function(err, js) {
+      if (err) return callback(err);
+
+      /**
+       * Consistently minify
+       */
+      var post = minify.js(js, {
+        compress: false,
+        mangle: true
+      });
+      callback(null, post);
+    })
 
   })
 
-}
+}

lib/stylesheet/index.js

@@ -2,6 +2,7 @@ var path         = require("path")
 var fs           = require("fs")
 var helpers      = require('../helpers')
 var autoprefixer = require('autoprefixer')
+var minify = require('minify')
 
 /**
  * Build Processor list for stylesheets.
@@ -56,8 +57,11 @@ module.exports = function(root, filePath, callback){
     var render = processors[ext].compile(srcPath, dirs, data, function(err, css) {
       if (err) return callback(err);
 
-      var prefixed = autoprefixer.process(css).css;
-      callback(null, prefixed);
+      /**
+       * Autoprefix, then consistently minify
+       */
+      var post = minify.css(autoprefixer.process(css).css);
+      callback(null, post);
     })
 
   })

lib/template/index.js

@@ -1,7 +1,7 @@
-
 var fs      = require("fs")
 var path    = require("path")
 var helpers = require('../helpers')
+var minify  = require('minify')
 
 
 /**
@@ -157,10 +157,10 @@ var scope = module.exports = function(projectPath, partentLocals){
 
 
       /**
-       * render the layout (if there is one) with the output of the template as yield.
+       * render the layout (if there is one) with the minified output of the template as yield.
        */
 
-      if(layout) output = scope(projectPath, locals).partial(layout, { yield: output })
+      if(layout) output = scope(projectPath, locals).partial(layout, { yield: minify.html(output) })
 
       return output
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "terraform",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "pre-processor engine that powers the harp web server",
   "repository": {
     "type": "git",
@@ -30,7 +30,8 @@
     "marked": "0.2.9",
     "less": "1.7.4",
     "stylus": "0.47.3",
-    "autoprefixer": "~2.2.0"
+    "autoprefixer": "~2.2.0",
+    "minify": "git://github.com/ianstormtaylor/minify#0.2.0"
   },
   "devDependencies": {
     "mocha": "1.8.2",

test/fixtures/javascripts/coffee/main.coffee

@@ -1,2 +1,5 @@
+
+
+
 add = (x, y) ->
-  return x + y
+  return x + y

test/fixtures/javascripts/coffee/unused.coffee

@@ -0,0 +1 @@
+() -> alert("hello world")

test/fixtures/templates/bio.ejs

@@ -1,2 +1,7 @@
+
+
+
+
+
 <h1>Hello EJS</h1>
-<%- partial("stuff.md") %>
+<%- partial("stuff.md") %>

test/fixtures/templates/index.jade

@@ -1,7 +1,11 @@
+
+
+
+
 h2 Hello World
 != partial("profile.jade")
 != partial("stuff.md")
 h4= place
 pre
   != JSON.stringify(locals, null, 2)
-include location
+include location

test/fixtures/templates/nest/stuff.jade

@@ -1 +1,5 @@
-h2 hi
+
+
+
+
+h2 hi

test/fixtures/templates/stuff.md

@@ -1,3 +1,7 @@
+
+
+
+
 # hello markdown
 
 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
@@ -9,4 +13,4 @@ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
     "date": "1610-01-01"
   }
 }
-```
+```

test/javascripts.js

@@ -14,6 +14,20 @@ describe("javascripts", function(){
         done()
       })
     })
+    it("should minify beyond preprocessor", function(done){
+      poly.render("main.coffee", function(errors, body){
+        should.not.exist(errors)
+        body.should.not.include("\n\n")
+        done()
+      })
+    })
+    it("shouldn’t strip unused javascript when minifying", function(done){
+      poly.render("unused.coffee", function(errors, body){
+        should.not.exist(errors)
+        body.should.include("alert")
+        done()
+      })
+    })
 
     it("should return errors if invalid", function(done){
       poly.render("invalid.coffee", function(errors, body){

test/render.js

@@ -177,7 +177,7 @@ describe("render(path, callback)", function(){
       poly.render("less.less", function(errors, body){
         should.not.exist(errors)
         should.exist(body)
-        body.should.include("body{background:#FF00AA}")
+        body.should.include("body{background:#F0A}")
         done()
       })
     })
@@ -188,7 +188,7 @@ describe("render(path, callback)", function(){
       poly.render("scss.scss", function(errors, body){
         should.not.exist(errors)
         should.exist(body)
-        body.should.include("body{background:#FF00AA;}")
+        body.should.include("body{background:#F0A}")
         done()
       })
     })

test/stylesheets.js

@@ -12,11 +12,25 @@ describe("stylesheets", function(){
       poly.render("main.less", function(error, body){
         should.not.exist(error)
         body.should.include("background:#ffc0cb")
+        done()
+      })
+    })
+    it("should autoprefix css", function(done){
+      poly.render("main.less", function(error, body){
+        should.not.exist(error)
         body.should.include("-webkit-font-feature-settings")
         done()
       })
     })
 
+    it("should minify beyond preprocessor", function(done){
+      poly.render("main.less", function(error, body){
+        should.not.exist(error)
+        body.should.not.include(";}")
+        done()
+      })
+    })
+
 
 
   })
@@ -31,11 +45,26 @@ describe("stylesheets", function(){
         should.not.exist(error)
         should.exist(body)
         body.should.include("background:#ffc0cb")
+        done()
+      })
+    })
+
+    it("should autoprefix css", function(done){
+      poly.render("main.styl", function(error, body){
+        should.not.exist(error)
         body.should.include("-webkit-font-feature-settings")
         done()
       })
     })
 
+    it("should minify beyond preprocessor", function(done){
+      poly.render("main.styl", function(error, body){
+        should.not.exist(error)
+        body.should.not.include(";}")
+        done()
+      })
+    })
+
   })
 
   describe(".scss", function(){
@@ -51,10 +80,23 @@ describe("stylesheets", function(){
         should.exist(body)
         body.should.include("background:#ffc3cd")
         body.should.include("color:#000")
+        done()
+      })
+    })
+    it("should autoprefix css", function(done){
+      poly.render("main.scss", function(error, body){
+        should.not.exist(error)
         body.should.include("-webkit-font-feature-settings")
         done()
       })
     })
+    it("should minify beyond preprocessor", function(done){
+      poly.render("main.scss", function(error, body){
+        should.not.exist(error)
+        body.should.not.include(";}")
+        done()
+      })
+    })
 
   })
 
@@ -71,10 +113,23 @@ describe("stylesheets", function(){
         should.exist(body)
         body.should.include("background:#ffc3cd")
         body.should.include("color:#000")
+        done()
+      })
+    })
+    it("should autoprefix css", function(done){
+      poly.render("main.sass", function(error, body){
+        should.not.exist(error)
         body.should.include("-webkit-font-feature-settings")
         done()
       })
     })
+    it("should minify beyond preprocessor", function(done){
+      poly.render("main.sass", function(error, body){
+        should.not.exist(error)
+        body.should.not.include(";}")
+        done()
+      })
+    })
 
   })
 

test/templates.js

@@ -15,6 +15,14 @@ describe("templates", function(){
         done()
       })
     })
+
+    it("should minify beyond preprocessor", function(done){
+      poly.render("bio.ejs", function(error, body){
+        should.not.exist(error)
+        body.should.not.include("\n\n")
+        done()
+      })
+    })
   })
 
   describe(".md", function(){
@@ -30,6 +38,14 @@ describe("templates", function(){
       })
     })
 
+    it("should minify beyond preprocessor", function(done){
+      poly.render("stuff.md", function(error, body){
+        should.not.exist(error)
+        body.should.not.include("\n\n")
+        done()
+      })
+    })
+
     it("should render markdown file encoded in UTF-8 with BOM", function(done){
       poly.render("bom.md", function(error, body){
         should.not.exist(error)
@@ -54,6 +70,14 @@ describe("templates", function(){
       })
     })
 
+    it("should minify beyond preprocessor", function(done){
+      poly.render("index.jade", function(error, body){
+        should.not.exist(error)
+        body.should.not.include("\n\n")
+        done()
+      })
+    })
+
     it("should pass in partials from the global object", function(done){
       poly.render("index.jade", function(error, body){
         should.not.exist(error)