Update

.gitignore

@@ -1,2 +1,2 @@
-data
+node_modules
 *.swp

app.js

@@ -1,21 +1,8 @@
 var express = require('express');
-var routes = require('./routes');
-var http = require('http');
-var path = require('path');
-
-var mongoose = require('mongoose');
-var mongoUri = process.env.MONGOLAB_URI || process.env.MONGOHQ_URL || 'mongodb://localhost/cellpack';
-mongoose.connect(mongoUri);
-var recipeSchema = mongoose.Schema({
-    recipeIdentifier: String,
-    recipeOptions: mongoose.Schema.Types.Mixed,
-    recipeChildren: []
-}, {collection: 'recipes'});
-var Recipe = mongoose.model('Recipe', recipeSchema);
-
 var app = express();
+var path = require('path');
 
-app.set('port', process.env.PORT || 3000);
+app.set('port', process.env.PORT || 8000);
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
 app.use(express.logger('dev'));
@@ -25,24 +12,17 @@ app.use(express.methodOverride());
 app.use(app.router);
 app.use(express.static(__dirname + '/public'));
 
-// development only
 if ('development' == app.get('env')) {
   app.use(express.errorHandler());
 }
 
-app.get('/', routes.index(Recipe));
-app.post('/versioner', routes.versioner(Recipe));
-
-app.get('/modify', routes.modify(Recipe));
-app.post('/hierarchy', routes.hierarchy(Recipe));
-app.post('/tabler', routes.tabler(Recipe));
-app.post('/commit', routes.commit(Recipe));
+// mongoose connection
+var mongoose = require('./mongoose');
 
-app.get('/create', routes.create(Recipe));
-app.post('/create', routes.createRecipe(Recipe));
-
-app.post('/download', routes.downloadRecipe(Recipe));
+// load routes
+require('./routes')(app);
 
+var http = require('http');
 http.createServer(app).listen(app.get('port'), function(){
   console.log('Express server listening on port ' + app.get('port'));
 });

models/index.js

@@ -0,0 +1,8 @@
+// load models
+Recipe = require("./recipe");
+
+// export models and functions
+exports.oid = Recipe.oid;
+exports.RecipeModel = Recipe.RecipeModel;
+exports.flattenRecipe = Recipe.flattenRecipe;
+exports.nestRecipe = Recipe.nestRecipe;

models/recipe.js

@@ -0,0 +1,94 @@
+var mongoose = require("mongoose");
+exports.oid = mongoose.Types.ObjectId;
+
+var recipeSchema = mongoose.Schema({
+    name: String,
+    version: Number,
+    current: Boolean,
+    option: String,
+    children: []
+}, {collection: "recipes"});
+exports.RecipeModel = mongoose.model("Recipe", recipeSchema);
+
+function flattenRecipe(r) {
+    var innerFlatten = function(rec, result) {
+
+        var id = "";
+        if (rec["_id"]) {
+            id = rec["_id"];
+        } else {
+            id = rec["cid"];
+        }
+
+        var newName = rec["name"];
+        var newVersion = rec["version"];
+        var newCurrent = rec["current"];
+        var newOption = rec["option"];
+
+        var childArray = [];
+        for (var d = 0; d < rec["children"].length; d++) {
+            var childId = "";
+            if (rec["children"][d]["_id"]) {
+                childId = rec["children"][d]["_id"];
+            } else {
+                childId = rec["children"][d]["cid"];
+            }
+            childArray.push(childId);
+        }
+
+        var newRec = {name: newName, version: newVersion, option: newOption, children: childArray, _id: id, current: newCurrent};
+        result.push(newRec);
+        if (rec["children"].length > 0) {
+            for (var c = 0; c < rec["children"].length; c++) {
+                innerFlatten(rec["children"][c], result);
+            }
+        }
+        return result;
+    }
+    return innerFlatten(r, []);
+}
+exports.flattenRecipe = flattenRecipe;
+
+
+function nestRecipe(ra) {
+    while (ra.length > 1) {
+        var inner = function () {
+            for (var z = (ra.length-1); z >= 0; z--) {
+                //console.log(ra);
+                if (ra[z]["children"].length < 1 || ra[z]["children"].every(function(ele, ind, arr) {return ("name" in ele);})) {
+                    //console.log(ra[z]);
+                    //console.log(ra[z]["_id"]);
+                    for (var y = (ra.length-1); y >= 0; y--) {
+                        //console.log(ra[z]["_id"]);
+                        for (var x = 0; x < ra[y]["children"].length; x++) {
+                            //console.log(ra);
+                            //console.log(z);
+                            //console.log(ra[z]);
+                            if (ra[y]["children"][x].toString() == ra[z]["_id"]) {
+                                var tRec = ra.splice(z, 1)[0];
+                                var insertRec = {};
+                                insertRec["_id"] = tRec["_id"];
+                                insertRec["name"] = tRec["name"];
+                                insertRec["version"] = tRec["version"];
+                                insertRec["current"] = tRec["current"];
+                                insertRec["option"] = tRec["option"];
+                                insertRec["children"] = tRec["children"];
+                                ra[y]["children"][x] = insertRec;
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        inner();
+    }
+    var topRec = {};
+    topRec["_id"] = ra[0]["_id"];
+    topRec["name"] = ra[0]["name"];
+    topRec["version"] = ra[0]["version"];
+    topRec["option"] = ra[0]["option"];
+    topRec["children"] = ra[0]["children"];
+    return topRec;
+}
+exports.nestRecipe = nestRecipe;

mongoose/index.js

@@ -0,0 +1,3 @@
+var mongoose = require('mongoose');
+var mongoUri = process.env.MONGOLAB_URI || process.env.MONGOHQ_URL || 'mongodb://localhost/cellpack';
+mongoose.connect(mongoUri);