Finished reorganization into modules.

Makefile

@@ -20,10 +20,10 @@
 all: build
 
 build:
-	@mkdir -p ./dist; cp -r lib plugins scripts dist; echo 'Geddy built.'
+	@mkdir -p ./dist; cp -r geddy-core geddy-async geddy-auth geddy-model dist; echo 'Geddy built.'
 
 install:
-	@./scripts/jake -f `pwd`/scripts/Jakefile default
+	@./geddy-core/scripts/jake -f `pwd`/geddy-core/scripts/Jakefile default
 
 clean:
 	@rm -fr dist

geddy-auth/lib/auth.js

@@ -18,10 +18,10 @@
 
 var sys = require('sys');
 
-var fleegix = require('geddy/lib/fleegix');
-var async = require('geddy/lib/async');
-var errors = require('geddy/lib/errors');
-var response = require('geddy/lib/response');
+var fleegix = require('geddy-core/lib/fleegix');
+var errors = require('geddy-core/lib/errors');
+var response = require('geddy-core/lib/response');
+var async = require('geddy-async/lib/async');
 
 var auth = {};
 

geddy-core/lib/app.js

@@ -20,11 +20,11 @@ var http = require('http');
 var sys = require('sys');
 var fs = require('fs');
 
-var fleegix = require('geddy/lib/fleegix');
-var errors = require('geddy/lib/errors');
-var session = require('geddy/lib/session');
-var response = require('geddy/lib/response');
-var cookies = require('geddy/lib/cookies');
+var fleegix = require('geddy-core/lib/fleegix');
+var errors = require('geddy-core/lib/errors');
+var session = require('geddy-core/lib/session');
+var response = require('geddy-core/lib/response');
+var cookies = require('geddy-core/lib/cookies');
 
 var Controller = require('./controller').Controller;
 
@@ -100,8 +100,9 @@ var App = function (initData) {
      }
      // Catch all errors, respond with error page & HTTP error code
      catch (e) {
-      var r = new response.Response(resp);
-      r.send(e.message, e.statusCode, {'Content-Type': 'text/html'});
+      throw e;
+      //var r = new response.Response(resp);
+      //r.send(e.message, e.statusCode, {'Content-Type': 'text/html'});
      }
   }
 };

geddy-core/lib/config.js

@@ -18,7 +18,7 @@
 
 var sys = require('sys');
 
-var fleegix = require('geddy/lib/fleegix');
+var fleegix = require('geddy-core/lib/fleegix');
 
 var Config = function (dirname) {
 

geddy-core/lib/controller.js

@@ -19,12 +19,11 @@
 var sys = require('sys');
 var fs = require('fs');
 
-var async = require('geddy/lib/async');
-var errors = require('geddy/lib/errors');
-var response = require('geddy/lib/response');
-var templates = require('geddy/lib/templates');
-var fleegix = require('geddy/lib/fleegix');
-var async = require('geddy/lib/async');
+var errors = require('geddy-core/lib/errors');
+var response = require('geddy-core/lib/response');
+var templates = require('geddy-core/lib/templates');
+var fleegix = require('geddy-core/lib/fleegix');
+var async = require('geddy-async/lib/async');
 
 var Controller = function (obj) {
 //var Controller = function (app, name, params, req, resp) {

geddy-core/lib/cookies.js

@@ -17,7 +17,7 @@
 */
 
 var sys = require('sys');
-var fleegix = require('geddy/lib/fleegix');
+var fleegix = require('geddy-core/lib/fleegix');
 
 var cookies = new function () {}();
 

geddy-core/lib/init.js

@@ -20,12 +20,12 @@ var fs = require('fs');
 var sys = require('sys');
 //var child_process = require('child_process');
 
-var fleegix = require('geddy/lib/fleegix');
-var meta = require('geddy/lib/util/meta');
-var async = require('geddy/lib/async');
-var model = require('geddy/lib/model/model');
-var session = require('geddy/lib/session');
-var hooks = require('geddy/lib/hooks');
+var fleegix = require('geddy-core/lib/fleegix');
+var meta = require('geddy-core/lib/util/meta');
+var session = require('geddy-core/lib/session');
+var hooks = require('geddy-core/lib/hooks');
+var async = require('geddy-async/lib/async');
+var model = require('geddy-model/lib/model');
 
 var Init = function (config, callback) {
 
@@ -112,6 +112,7 @@ var Init = function (config, callback) {
       callback: this.registerTemplates
     }
   ]);
+
   group.last = _callback;
   group.run();
 

geddy-core/lib/router.js

@@ -16,7 +16,7 @@
  *
 */
 
-var fleegix = require('geddy/lib/fleegix');
+var fleegix = require('geddy-core/lib/fleegix');
 var sys = require('sys');
 
 /*

geddy-core/lib/session.js

@@ -17,7 +17,7 @@
 */
 
 var sys = require('sys');
-var fleegix = require('geddy/lib/fleegix');
+var fleegix = require('geddy-core/lib/fleegix');
 
 var session = new function () {
   var KEY_LENGTH = 32;
@@ -39,7 +39,7 @@ var session = new function () {
 
   this.createStore = function (type, callback) {
     var key = fleegix.string.capitalize(type);
-    var constructor = require('geddy/lib/session_stores/' + type)[key];
+    var constructor = require('geddy-core/lib/session_stores/' + type)[key];
     session.store = new constructor(callback);
   };
 

geddy-core/lib/util/meta.js

@@ -16,7 +16,7 @@
  *
 */
 
-var fleegix = require('geddy/lib/fleegix');
+var fleegix = require('geddy-core/lib/fleegix');
 
 var meta = new function () {
   this.registerConstructors = function (dirname, dirList) {

geddy-core/scripts/Jakefile.js

@@ -25,10 +25,10 @@ exports.tasks = {
     'deps': [],
     'task': function (env) {
       var cmds = [
-        'mkdir -p ~/.node_libraries/geddy',
-        'cp -R ./dist/* ~/.node_libraries/geddy/',
-        'cp scripts/geddy-gen /usr/local/bin/',
-        'cp scripts/geddy /usr/local/bin/'
+        'mkdir -p ~/.node_libraries',
+        'cp -R ./dist/* ~/.node_libraries/',
+        'cp geddy-core/scripts/geddy-gen /usr/local/bin/',
+        'cp geddy-core/scripts/geddy /usr/local/bin/'
       ];
       runCmds(cmds, function () {
         sys.puts('Geddy installed.');
@@ -44,13 +44,14 @@ exports.tasks = {
       var cmds = [
         'mkdir -p ./' + dir,
         'mkdir -p ./' + dir + '/config',
+        'mkdir -p ./' + dir + '/app/models',
         'mkdir -p ./' + dir + '/app/controllers',
         'mkdir -p ./' + dir + '/app/views',
         'mkdir -p ./' + dir + '/public',
-        'cp ~/.node_libraries/geddy/scripts/gen/router.js ' + dir + '/config/',
-        'cp ~/.node_libraries/geddy/scripts/gen/config.js ' + dir + '/config/',
-        'cp ~/.node_libraries/geddy/scripts/gen/main.js ' + dir + '/app/controllers/',
-        'cp ~/.node_libraries/geddy/scripts/gen/application.js ' + dir + '/app/controllers/'
+        'cp ~/.node_libraries/geddy-core/scripts/gen/router.js ' + dir + '/config/',
+        'cp ~/.node_libraries/geddy-core/scripts/gen/config.js ' + dir + '/config/',
+        'cp ~/.node_libraries/geddy-core/scripts/gen/main.js ' + dir + '/app/controllers/',
+        'cp ~/.node_libraries/geddy-core/scripts/gen/application.js ' + dir + '/app/controllers/'
       ]
       runCmds(cmds, function () {
         sys.puts('Created app ' + dir + '.');
@@ -96,7 +97,7 @@ exports.tasks = {
 
       var cmds = [
         'mkdir -p ./app/views/' + fileName,
-        'cp ~/.node_libraries/geddy/scripts/gen/views/* ' + './app/views/' + fileName + '/'
+        'cp ~/.node_libraries/geddy-core/scripts/gen/views/* ' + './app/views/' + fileName + '/'
       ]
       runCmds(cmds, function () {
         sys.puts('Created view templates.');

geddy-core/scripts/geddy

@@ -17,4 +17,4 @@
 
 #!/bin/bash
 
-node ~/.node_libraries/geddy/scripts/runserv.js `pwd`
+node ~/.node_libraries/geddy-core/scripts/runserv.js `pwd`

geddy-core/scripts/geddy-gen

@@ -17,5 +17,5 @@
 
 #!/bin/bash
 
-node ~/.node_libraries/geddy/scripts/jake.js -f ~/.node_libraries/geddy/scripts/Jakefile $1 firstArg=$2
+node ~/.node_libraries/geddy-core/scripts/jake.js -f ~/.node_libraries/geddy-core/scripts/Jakefile $1 firstArg=$2
 

geddy-core/scripts/gen/router.js

@@ -16,7 +16,7 @@
  *
 */
 
-var Router = require('geddy/lib/router').Router;
+var Router = require('geddy-core/lib/router').Router;
 
 router = new Router();
 router.match('/').to({controller: 'Main', action: 'index'});

geddy-core/scripts/jake

@@ -17,5 +17,5 @@
 
 #!/bin/bash
 
-node ./scripts/jake.js $@
+node ./geddy-core/scripts/jake.js $@
 

geddy-core/scripts/runserv.js

@@ -21,11 +21,11 @@ var appDirname = process.argv[2];
 var sys = require('sys');
 var http = require('http');
 
-var fleegix = require('geddy/lib/fleegix');
+var fleegix = require('geddy-core/lib/fleegix');
 
-var Config = require('geddy/lib/config').Config;
-var Init = require('geddy/lib/init').Init;
-var App = require('geddy/lib/app').App;
+var Config = require('geddy-core/lib/config').Config;
+var Init = require('geddy-core/lib/init').Init;
+var App = require('geddy-core/lib/app').App;
 
 var runServ = function () {
   http.createServer(function (req, resp) {

geddy-core/lib/model/model.js → geddy-model/lib/model.js

@@ -46,8 +46,8 @@ var model = new function () {
   if (typeof window == 'undefined') {
     mode = SERVER;
     var sys = require('sys');
-    var meta = require('geddy/lib/util/meta');
-    GLOBAL.fleegix = require('geddy/lib/fleegix');
+    var meta = require('geddy-core/lib/util/meta');
+    GLOBAL.fleegix = require('geddy-core/lib/fleegix');
   }
   else {
     mode = CLIENT;