diff --git a/lib/cartodb/backends/template_maps.js b/lib/cartodb/backends/template_maps.js index a4e7dbe3..bb728181 100644 --- a/lib/cartodb/backends/template_maps.js +++ b/lib/cartodb/backends/template_maps.js @@ -55,11 +55,9 @@ util.inherits(TemplateMaps, EventEmitter); module.exports = TemplateMaps; -var o = TemplateMaps.prototype; - //--------------- PRIVATE METHODS -------------------------------- -o._userTemplateLimit = function() { +TemplateMaps.prototype._userTemplateLimit = function() { return this.opts.max_user_templates || 0; }; @@ -70,7 +68,7 @@ o._userTemplateLimit = function() { * @param redisArgs - the arguments for the redis function in an array * @param callback - function to pass results too. */ -o._redisCmd = function(redisFunc, redisArgs, callback) { +TemplateMaps.prototype._redisCmd = function(redisFunc, redisArgs, callback) { var redisClient; var that = this; var db = that.db_signatures; @@ -97,7 +95,7 @@ o._redisCmd = function(redisFunc, redisArgs, callback) { var _reValidNameIdentifier = /^[a-z0-9][0-9a-z_\-]*$/i; var _reValidPlaceholderIdentifier = /^[a-z][0-9a-z_]*$/i; // jshint maxcomplexity:15 -o._checkInvalidTemplate = function(template) { +TemplateMaps.prototype._checkInvalidTemplate = function(template) { if ( template.version !== '0.0.1' ) { return new Error("Unsupported template version " + template.version); } @@ -200,7 +198,7 @@ function templateDefaults(template) { // @param callback function(err, tpl_id) // Return template identifier (only valid for given user) // -o.addTemplate = function(owner, template, callback) { +TemplateMaps.prototype.addTemplate = function(owner, template, callback) { var self = this; template = templateDefaults(template); @@ -258,7 +256,7 @@ o.addTemplate = function(owner, template, callback) { // // @param callback function(err) // -o.delTemplate = function(owner, tpl_id, callback) { +TemplateMaps.prototype.delTemplate = function(owner, tpl_id, callback) { var self = this; step( function deleteTemplate() { @@ -297,7 +295,8 @@ o.delTemplate = function(owner, tpl_id, callback) { // // @param callback function(err) // -o.updTemplate = function(owner, tpl_id, template, callback) { +TemplateMaps.prototype.updTemplate = function(owner, tpl_id, template, callback) { + var self = this; template = templateDefaults(template); @@ -356,7 +355,7 @@ o.updTemplate = function(owner, tpl_id, template, callback) { // @param callback function(err, tpl_id_list) // Returns a list of template identifiers // -o.listTemplates = function(owner, callback) { +TemplateMaps.prototype.listTemplates = function(owner, callback) { this._redisCmd('HKEYS', [ this.key_usr_tpl({owner:owner}) ], callback); }; @@ -370,7 +369,7 @@ o.listTemplates = function(owner, callback) { // @param callback function(err, template) // Return full template definition // -o.getTemplate = function(owner, tpl_id, callback) { +TemplateMaps.prototype.getTemplate = function(owner, tpl_id, callback) { var self = this; step( function getTemplate() { @@ -386,7 +385,7 @@ o.getTemplate = function(owner, tpl_id, callback) { ); }; -o.isAuthorized = function(template, authTokens) { +TemplateMaps.prototype.isAuthorized = function(template, authTokens) { if (!template) { return false; } @@ -438,7 +437,7 @@ function _replaceVars (str, params) { }); return str; } -o.instance = function(template, params) { +TemplateMaps.prototype.instance = function(template, params) { var all_params = {}; var phold = template.placeholders || {}; Object.keys(phold).forEach(function(k) { @@ -500,7 +499,7 @@ o.instance = function(template, params) { }; // Return a fingerPrint of the object -o.fingerPrint = function(template) { +TemplateMaps.prototype.fingerPrint = function(template) { return crypto.createHash('md5') .update(JSON.stringify(template)) .digest('hex')