From 290e51da1fd6a6c8f07581bba347dbed31c93a88 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Fri, 15 Aug 2014 10:00:20 -0400
Subject: [PATCH] feature(minify) update Minify to v0.8.0

---
 cloudcmd.js          |  4 +---
 lib/server.js        |  4 ++--
 lib/server/join.js   | 40 ++++++++++++----------------------------
 lib/server/minify.js |  4 +---
 4 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/cloudcmd.js b/cloudcmd.js
index c1faac49..5bf349e4 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -271,9 +271,7 @@
     function buildIndex(json, callback) {
         var isMinify = Minify && Config.minify;
         
-        Util.exec.if(!isMinify, function(error, params) {
-            var name = params && params.name;
-            
+        Util.exec.if(!isMinify, function(error, name) {
             fs.readFile(name || PATH_INDEX, 'utf8', function(error, template) {
                 var panel, data;
                 
diff --git a/lib/server.js b/lib/server.js
index 5060e46c..c2244ca4 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -213,8 +213,8 @@
         result  = isMin && check;
         
         Util.exec.if(!result,
-            function(error, params) {
-                var sendName = params && params.name || name;
+            function(error, nameMin) {
+                var sendName = nameMin || name;
                 
                 ponse.sendFile({
                     name        : sendName,
diff --git a/lib/server/join.js b/lib/server/join.js
index 6da68e34..d1ab6830 100644
--- a/lib/server/join.js
+++ b/lib/server/join.js
@@ -55,11 +55,13 @@
             else
                 names = parse(prefix, dir, path);
             
-            exec.if(!isMinify, function(namesNew) {
-                var is      = Util.isArray(namesNew);
+            exec.if(!isMinify, function(error, namesObj) {
+                var is      = Util.isObject(namesObj);
                 
                 if (is)
-                    names = namesNew;
+                    names = names.map(function(key) {
+                        return namesObj[key];
+                    });
                 
                 read(names);
             }, function(callback) {
@@ -130,40 +132,22 @@
     }
     
     function minify(name, callback) {
-        Minify.optimize(name, callback);
+        Minify.optimize(name, {returnName:true}, function(error, name) {
+            callback(null, name);
+        });
     }
     
     function retMinify(name) {
         return minify.bind(null, name);
     }
     
-    function checkExt(name) {
-        var ret;
-        
-        ret = Util.checkExt(name, ['js', 'css', 'html']);
-        
-        return ret;
-    }
-    
     function uglify(names, callback) {
-        var func,
-            funcs   = [];
+        var funcs = {};
         
-        names = names.map(function(name) {
-            var is;
-            
-            funcs.push(retMinify(name));
-            is      = checkExt(name);
-            
-            if (is) {
-                name = Minify.getName(name);
-            }
-            
-            return name;
+        names.forEach(function(name) {
+            funcs[name] = retMinify(name);
         });
         
-        func = Util.exec.ret(callback, names);
-        
-        Util.exec.parallel(funcs, func);
+        Util.exec.parallel(funcs, callback);
     }
 })();
diff --git a/lib/server/minify.js b/lib/server/minify.js
index 4e9e9c1d..5fef146d 100644
--- a/lib/server/minify.js
+++ b/lib/server/minify.js
@@ -48,9 +48,7 @@
                 if (changed || !exists)
                     Minify.optimize(name, params, callback);
                 else
-                    callback(null, {
-                        name: minifyName
-                    });
+                    callback(null, minifyName);
             });
         }
     };