Use the utilities available in the global geddy object rather than re…

…-requiring utilities in nearly every file.

bin/cli.js

@@ -4,7 +4,6 @@
 var geddy = require('../lib/geddy')
   , exec = require('child_process').exec
   , path = require('path')
-  , utils = require('utilities')
   , parseopts = require('../lib/parseopts');
 
 // Variables
@@ -223,7 +222,7 @@ if (cmds.length) {
 // Just `geddy` -- start the server
 else {
   // Search for 'config' directory in parent directories
-  utils.file.searchParentPath('config', function (err, filePath) {
+  geddy.file.searchParentPath('config', function (err, filePath) {
     if (err) {
       die(usage);
     }

lib/app.js

@@ -25,7 +25,6 @@ var fs = require('fs')
   , cwd = process.cwd()
   , errors = require('./response/errors')
   , response = require('./response')
-  , utils = require('utilities')
   , init = require('./init')
   , helpers = require('./template/helpers')
   , actionHelpers = require('./template/helpers/action')

lib/base_config.js

@@ -1,4 +1,4 @@
- var path = require('path')
+var path = require('path')
   , config
   , cwd = process.cwd();
 

lib/cluster/master.js

@@ -4,10 +4,7 @@ var Master
   , path = require('path')
   , Log = require('../../deps/log')
   , dispatch = require('./master_dispatch')
-  , config = require('../config')
-  , utils = require('utilities')
-  , file = utils.file
-  , date = utils.date;
+  , config = require('../config');
 
 var processModes = {
   KEEP_ALIVE: 'keepAlive'
@@ -43,7 +40,7 @@ Master.prototype = new (function () {
     , _initLogging = function (next) {
         var self = this
           , types = ['stdout', 'stderr', 'access']
-          , now = date.strftime(new Date(), '%FT%T')
+          , now = geddy.date.strftime(new Date(), '%FT%T')
           , dir = this.config.logDir
           , levelsByType = {access: 'access', stderr: 'error', stdout: 0}
           , writing = dir != null
@@ -73,22 +70,22 @@ Master.prototype = new (function () {
         // If we are writing, then attempt to create the directory
         // if it doesn't exist
         if (writing) {
-          file.mkdirP(dir);
+          geddy.file.mkdirP(dir);
         }
 
         types.forEach(function (type) {
           var currentLog = path.join(dir, type + '.log')
             , archivedLog = path.join(dir, type + '.' + now + '.log');
 
           // If the main log file exists, then rename it to the archived log file
-          if (writing && file.existsSync(currentLog)) {
+          if (writing && geddy.file.existsSync(currentLog)) {
             try {
               fs.renameSync(currentLog, archivedLog);
             }
             // renameSync doesn't work correctly here for some reason,
             // fall back to copy/delete
             catch (e) {
-              file.cpR(currentLog, archivedLog);
+              geddy.file.cpR(currentLog, archivedLog);
               fs.unlinkSync(currentLog);
             }
           }
@@ -116,7 +113,7 @@ Master.prototype = new (function () {
           , port;
         if (this.config.metrics) {
           port = this.config.metrics.port;
-          metrics = file.requireLocal('metrics');
+          metrics = geddy.file.requireLocal('metrics');
           this.stdoutLog.info('Metrics server started on port ' + port);
           this.metricsServer = new metrics.Server(port);
         }
@@ -211,11 +208,11 @@ Master.prototype = new (function () {
             };
         // Watch individual files so we can compare mtimes and restart
         // on code-changes
-        file.watch(dir + '/config', callback);
-        file.watch(dir + '/lib', callback);
-        file.watch(dir + '/app/controllers', callback);
-        file.watch(dir + '/app/models', callback);
-        file.watch(dir + '/app/views', callback);
+        geddy.file.watch(dir + '/config', callback);
+        geddy.file.watch(dir + '/lib', callback);
+        geddy.file.watch(dir + '/app/controllers', callback);
+        geddy.file.watch(dir + '/app/models', callback);
+        geddy.file.watch(dir + '/app/views', callback);
       };
 
   this.init = function () {

lib/cluster/worker.js

@@ -1,5 +1,4 @@
 var fs = require('fs')
-  , utils = require('utilities')
   , dispatch = require('./worker_dispatch')
   , Logger = require('./worker_logger').Logger
   , Worker;
@@ -52,7 +51,7 @@ Worker.prototype = new (function () {
     // If SPDY options were given
     else if (spdy) {
       if (spdy.cert && spdy.key) {
-        this.server = utils.file.requireLocal('spdy').createServer({
+        this.server = geddy.file.requireLocal('spdy').createServer({
             key: fs.readFileSync(spdy.key)
           , cert: fs.readFileSync(spdy.cert)
         });
@@ -76,7 +75,7 @@ Worker.prototype = new (function () {
         , ssl = this.config.ssl ? ' (SSL)' : ''
         , spdy = this.config.spdy ? '(SPDY)' : '';
 
-      utils.network.isPortOpen(port, hostname, function (err, isOpen) {
+      geddy.network.isPortOpen(port, hostname, function (err, isOpen) {
         if (err) {
           self.log.error(err);
         }

lib/geddy.js

@@ -1,10 +1,27 @@
+/*
+ * Geddy JavaScript Web development framework
+ * Copyright 2112 Matthew Eernisse (mde@fleegix.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*/
 
 var geddy = global.geddy || {}
   , cluster = require('cluster')
+  , utils = require('./utils')
+  , pkg = require('../package')
   , master
   , worker
-  , utils = require('utilities')
-  , pkg = require('../package')
   , App;
 
 geddy.isMaster = cluster.isMaster;
@@ -57,9 +74,5 @@ utils.mixin(geddy, new (function () {
 
 })());
 
-// Set the One True Geddy Global
-global.geddy = geddy;
-
-// Also allow export/local
-module.exports = geddy;
-
+// Set geddy as global and as an export/local
+global.geddy = module.exports = geddy;

lib/init/i18n.js

@@ -1,8 +1,5 @@
 var path = require('path')
-  , fs = require('fs')
-  , utils = require('utilities')
-  , i18n = utils.i18n
-  , file = utils.file;
+  , fs = require('fs');
 
 module.exports = new (function () {
   var LOCALE_PAT = /([^\/]*).json$/;
@@ -14,9 +11,9 @@ module.exports = new (function () {
       , loadLocaleData = function () {
           localePaths.forEach(function (directory) {
             directory = path.normalize(directory);
-            if (file.existsSync(directory)) {
+            if (geddy.file.existsSync(directory)) {
               var f
-                , files = file.readdirR(directory);
+                , files = geddy.file.readdirR(directory);
               for (var i = 0; i < files.length; i++) {
                 f = files[i];
                 if (f && /.json$/.test(f)) {
@@ -31,7 +28,7 @@ module.exports = new (function () {
                       throw new Error('Could not parse locale-data in file: ' +
                         f);
                     }
-                    i18n.loadLocale(locale[1], data);
+                    geddy.i18n.loadLocale(locale[1], data);
                   }
                 }
               }
@@ -41,7 +38,7 @@ module.exports = new (function () {
         };
 
     localePaths = localePaths.concat(geddy.config.i18n.loadPaths || []);
-    i18n.setDefaultLocale(geddy.config.i18n.defaultLocale);
+    geddy.i18n.setDefaultLocale(geddy.config.i18n.defaultLocale);
     loadLocaleData();
   };
 

lib/init/index.js

@@ -1,25 +1,25 @@
-
 // Look through the './init' directory, and run the `init`
 // method for all listed files -- each `init` method should
 // take a callback that runs the next one. When all finished
 // call the original top-level callback for the whole init
 // process
 exports.init = function (app, callback) {
   var items = [
-        'router'
-      , 'model'
-      , 'i18n'
-      , 'helpers'
-      ]
-    , initItem = function () {
-        var item = items.shift();
-        if (item) {
-          item = require('./' + item);
-          item.init(app, initItem);
-        }
-        else {
-          callback();
-        }
-      };
+      'router'
+    , 'model'
+    , 'i18n'
+    , 'helpers'
+  ];
+
+  var initItem = function () {
+    var item = items.shift();
+    if (item) {
+      item = require('./' + item);
+      item.init(app, initItem);
+    }
+    else {
+      callback();
+    }
+  };
   initItem();
 };

lib/init/model.js

@@ -1,23 +1,22 @@
 var model = require('model')
   , path = require('path')
-  , utils = require('utilities')
   , useCoffee = false;
 
 module.exports = new (function () {
 
   var _getAdapterPath = function (base, name) {
-        var p = path.join(base, utils.string.snakeize(name))
+        var p = path.join(base, geddy.string.snakeize(name))
         , testPath;
 
         // Fucking CoffeeScript
         testPath = p + '.coffee';
-        if (utils.file.existsSync(testPath)) {
-          useCoffee = useCoffee || utils.file.requireLocal('coffee-script');
+        if (geddy.file.existsSync(testPath)) {
+          useCoffee = useCoffee || geddy.file.requireLocal('coffee-script');
           return testPath;
         }
         // Normal JS
         testPath = p + '.js';
-        if (utils.file.existsSync(testPath)) {
+        if (geddy.file.existsSync(testPath)) {
           return testPath;
         }
         // Nothing found
@@ -45,14 +44,14 @@ module.exports = new (function () {
       , ctors;
 
     // May be running totally model-less
-    if (!utils.file.existsSync(path.join(cwd, modelDir))) {
+    if (!geddy.file.existsSync(path.join(cwd, modelDir))) {
       return callback();
     }
 
     // Set any model properties from the app config
-    utils.mixin(model, geddy.config.model);
+    geddy.mixin(model, geddy.config.model);
 
-    models = utils._getConstructorsFromDirectory(modelDir);
+    models = geddy._getConstructorsFromDirectory(modelDir);
     models.forEach(function (m) {
       var name = m.ctorName
         , filePath = m.filePath

lib/init/router.js

@@ -1,5 +1,4 @@
 var path = require('path')
-  , utils = require('utilities')
   , FunctionRouter = require('../routers/function_router').FunctionRouter
   , RegExpRouter = require('barista').Router;
 
@@ -13,8 +12,8 @@ module.exports = new (function () {
       , routerCsFile = path.join(cwd, '/config/router.coffee')
       , router;
 
-    if (utils.file.existsSync(routerCsFile)) {
-      utils.file.requireLocal('coffee-script');
+    if (geddy.file.existsSync(routerCsFile)) {
+      geddy.file.requireLocal('coffee-script');
     }
     router = require(path.join(cwd, '/config/router'));
     router = router.router || router;

lib/response/format.js

@@ -1,5 +1,4 @@
-var utils = require('utilities')
-  , format
+var format
   , Format
   , builtInFormats;
 

lib/sessions/stores/memcache.js

@@ -28,8 +28,7 @@ Config section should look like this:
 'servers' is your array of Memcache servers.
 */
 
-var file = require('utilities').file
-  , Memcached = file.requireLocal('memcached');
+var Memcached = geddy.file.requireLocal('memcached');
 
 var Memcache = function (callback) {
   this.setup(callback);

lib/sessions/stores/mongodb.js

@@ -36,8 +36,7 @@ Config section should look like this:
 
 If don't provide an expiry in your config file your sessions will live forever.
 */
-var file = require('utilities').file
-  , mongo = file.requireLocal('mongodb-wrapper');
+var mongo = geddy.file.requireLocal('mongodb-wrapper');
 
 var MongoDB = function (callback) {
   this.setup(callback);

lib/sessions/stores/redis.js

@@ -33,8 +33,7 @@ Config section should look like this:
 
 'server' is your Redis server.
 */
-var file = require('utilities').file
-  , RedisServer = file.requireLocal('redis');
+var RedisServer = geddy.file.requireLocal('redis');
 
 var Redis = function (callback) {
   this.setup(callback);

lib/template/index.js

@@ -197,14 +197,14 @@ getTemplateData = function (templateRoot, partialURL, parentNode, isLayout) {
       // If default layout doesn't exist we have no other layout so throw error
       else {
         err = new geddy.errors.InternalServerError('Layout template "' +
-              partialURL + '" not found in ' + geddy.utils.array.humanize(dirs));
+              partialURL + '" not found in ' + geddy.array.humanize(dirs));
         throw err;
       }
     }
     // If it's a normal template then it doesn't exist
     else {
       err = new geddy.errors.InternalServerError('Partial template "' +
-            partialURL + '" not found in ' + geddy.utils.array.humanize(dirs));
+            partialURL + '" not found in ' + geddy.array.humanize(dirs));
       throw err;
     }
   }