feelinc · August 29, 2015 14:02 · Jun 4, 2014 · Jun 4, 2014 · Jun 4, 2014 · Jun 4, 2014
diff --git a/aname-async.js b/aname-async.js
@@ -42,7 +42,7 @@ function aname(models, model, options, callback) {
         }
     }
 
-    /* Define each resource attributes */
+    /* Define each resource attribute */
     async.waterfall([
         function(done) {
             setAttribute('id', model.uniqueCode);

diff --git a/aname.js b/aname.js
@@ -42,7 +42,7 @@ function aname(models, model, options, callback) {
         }
     }
 
-    /* Define each resource attributes */
+    /* Define each resource attribute */
     setAttribute('id', model.uniqueCode);
     setAttribute('name');
     setAttribute('slug');

diff --git a/aname-async.js b/aname-async.js
@@ -42,6 +42,7 @@ function aname(models, model, options, callback) {
         }
     }
 
+    /* Define each resource attributes */
     async.waterfall([
         function(done) {
             setAttribute('id', model.uniqueCode);

diff --git a/aname.js b/aname.js
@@ -42,6 +42,7 @@ function aname(models, model, options, callback) {
         }
     }
 
+    /* Define each resource attributes */
     setAttribute('id', model.uniqueCode);
     setAttribute('name');
     setAttribute('slug');

diff --git a/aname-async.js b/aname-async.js
@@ -2,7 +2,8 @@
  * Module dependencies.
  */
 var async = require('async')
-    , countryTemplate = require('./country');
+    , countryTemplate = require('./country')
+    , _ = require('underscore');
 
 function aname(models, model, options, callback) {
     if ( ! _.isObject(model)) {

diff --git a/aname.js b/aname.js
@@ -1,6 +1,8 @@
 /**
  * Module dependencies.
  */
+var _ = require('underscore');
+
 var defaultOptions = {};
 
 function aname(models, model, options, callback) {

diff --git a/async.js → aname-async.js b/async.js → aname-async.js
diff --git a/simple.js → aname.js b/simple.js → aname.js
diff --git a/how_to_use.js b/how_to_use.js
@@ -0,0 +1,12 @@
+/**
+ * Module dependencies.
+ */
+var apiTemplates = require('./templates');
+
+/* Use the simple one */
+res.send(apiTemplates.aname(model));
+
+/* Use the async one */
+res.send(apiTemplates.aname(models, model, function(err, anameTemplate) {
+    res.send(anameTemplate);
+}));
diff --git a/index.js b/index.js
@@ -0,0 +1,3 @@
+module.exports.country = require('./country');
+module.exports.city = require('./city');
+module.exports.aname = require('./aname');
diff --git a/async.js b/async.js
@@ -0,0 +1,91 @@
+/**
+ * Module dependencies.
+ */
+var async = require('async')
+    , countryTemplate = require('./country');
+
+function aname(models, model, options, callback) {
+    if ( ! _.isObject(model)) {
+        if (typeof callback != 'undefined') {
+            callback(new Error('Model is undefined'));
+        } else {
+            return null;
+        }
+    }
+
+    if (typeof options == 'function') {
+        callback = options;
+        options  = {};
+    }
+
+    options = _.extend(options, defaultOptions);
+
+    var self = this;
+
+    Object.defineProperty(this, '__data', {
+        writable: true,
+        enumerable: false,
+        configurable: true,
+        value: {}
+    });
+
+    function setAttribute(field, value) {
+        if (typeof value == 'undefined') {
+            if ( ! _.has(model.__data, field)) {
+                self.__data[field] = null;
+            } else {
+                self.__data[field] = model.__data[field];
+            }
+        } else {
+            self.__data[field] = value;
+        }
+    }
+
+    async.waterfall([
+        function(done) {
+            setAttribute('id', model.uniqueCode);
+
+            done(null);
+        }, 
+        function(done) {
+            setAttribute('slug');
+
+            done(null);
+        }, 
+        function(done) {
+            setAttribute('name');
+
+            done(null);
+        }, 
+        function(done) {
+            models.countries.findOne({
+                where: {code: model.countryCode}
+            }, function(err, country) {
+                if (err) {
+                    setAttribute('country', null);
+
+                    return done(null);
+                }
+
+                countryTemplate(country, function(err, countryTemplate) {
+                    if (err) {
+                        setAttribute('country', null);
+                    } else {
+                        setAttribute('country', countryTemplate);
+                    }
+
+                    done(null);
+                });
+            });
+        }
+    ], function() {
+        return callback(null, self.__data);
+    });
+
+    return self.__data;
+}
+
+/**
+ * Expose `aname`.
+ */
+module.exports = aname;
diff --git a/simple.js b/simple.js
@@ -0,0 +1,53 @@
+/**
+ * Module dependencies.
+ */
+var defaultOptions = {};
+
+function aname(models, model, options, callback) {
+    if ( ! _.isObject(model)) {
+        if (typeof callback != 'undefined') {
+            callback(new Error('Model is undefined'));
+        } else {
+            return null;
+        }
+    }
+
+    if (typeof options == 'function') {
+        callback = options;
+        options  = {};
+    }
+
+    options = _.extend(options, defaultOptions);
+
+    var self = this;
+
+    Object.defineProperty(this, '__data', {
+        writable: true,
+        enumerable: false,
+        configurable: true,
+        value: {}
+    });
+
+    function setAttribute(field, value) {
+        if (typeof value == 'undefined') {
+            if ( ! _.has(model.__data, field)) {
+                self.__data[field] = null;
+            } else {
+                self.__data[field] = model.__data[field];
+            }
+        } else {
+            self.__data[field] = value;
+        }
+    }
+
+    setAttribute('id', model.uniqueCode);
+    setAttribute('name');
+    setAttribute('slug');
+
+    return self.__data;
+}
+
+/**
+ * Expose `aname`.
+ */
+module.exports = aname;