Refactoring to make require statements more straightforward

lib/client/client.js

@@ -4,7 +4,15 @@ var identity = require('./identity'),
     url = require('url');
 
 exports.createClient = function(options, callback) {
-    identity.authorize(options, function(err, auth) {
+
+    if (options.loadFromFile && options.token) {
+        identity.loadIdentity(options.token, options.region, create);
+    }
+    else {
+        identity.authorize(options, create);
+    }
+
+    function create(err, auth) {
         if (err) {
             callback(err);
             return;
@@ -13,7 +21,8 @@ exports.createClient = function(options, callback) {
         var client = new Client(auth, options);
 
         callback(err, client);
-    });
+    }
+
 };
 
 var Client = function(auth, options) {
@@ -31,7 +40,8 @@ var Client = function(auth, options) {
  * @description Global handler for creating a new authorized request to the provided
  * Rackspace API endpoint.
  *
- * @param {Object}      details     provides required values for the request
+ * @param {Object}      service     The service to use for the specified call
+ * @param {Object}    details       provides required values for the request
  * @param {Function}    callback    handles the callback of your api call
  */
 Client.prototype.authorizedRequest = function(service, details, callback) {

lib/client/identity.js

@@ -112,15 +112,7 @@ exports.loadIdentity = function(token, region, callback) {
 exports.saveIdentity = function(identity, callback) {
     var outputFilename = process.cwd() + '/' + identity.token.id + '.json';
 
-    fs.writeFile(outputFilename, JSON.stringify(identity.raw, null, 4), function(err) {
-        if (err) {
-            console.log(err);
-        } else {
-            console.log("JSON saved ");
-        }
-
-        callback(err);
-    });
+    fs.writeFile(outputFilename, JSON.stringify(identity.raw, null, 4), callback);
 };
 
 var Identity = function(details, options) {

lib/client/index.js

@@ -0,0 +1,4 @@
+exports.client = require('./client');
+exports.identity = require('./identity');
+exports.servers = require('./servers');
+exports.services = require('./services');

lib/client/servers.js

@@ -1,7 +1,8 @@
 var services = require('./services').services,
-    Server = require('../models/servers/server').Server,
-    Flavor = require('../models/servers/flavor').Flavor,
-    Image = require('../models/servers/image').Image,
+    models = require('../models'),
+    Server = models.servers.Server,
+    Image = models.servers.Image,
+    Flavor = models.servers.Flavor,
     _ = require('underscore');
 
 var Servers = function(client, options) {

lib/models/index.js

@@ -0,0 +1 @@
+exports.servers = require('./servers');

lib/models/servers/index.js

@@ -0,0 +1,3 @@
+exports.Flavor = require('./flavor').Flavor;
+exports.Image = require('./image').Image;
+exports.Server = require('./server').Server;

lib/rackspace.js

@@ -9,10 +9,14 @@
 var rackspace = exports;
 
 // Expose version through `pkginfo`.
-//require('pkginfo')(module, 'version');
+require('pkginfo')(module, 'version');
 
 // Core functionality
-rackspace.createClient = require('./client/client').createClient;
+rackspace.createClient = require('./client').client.createClient;
+
+rackspace.core = require('./client');
+rackspace.models = require('./models');
+
 //
 ////  Servers
 //rackspace.Server = require('./models/server').Server;

package.json

@@ -9,7 +9,8 @@
     "dependencies": {
         "request": "2.16.x",
         "underscore": "1.4.x",
-        "async": "0.2.x"
+        "async": "0.2.x",
+        "pkginfo": "0.3.x"
     },
     "devDependencies": {
         "nock": "0.16.x",

test/servers-tests.js

@@ -1,7 +1,7 @@
 //
 
 var rackspace = require('../lib/rackspace'),
-    services = require('../lib/client/services').services,
+    services = rackspace.core.services,
     should = require('should'),
     nock = require('nock'),
     _ = require('underscore'),