From 1c10b8193ba26d38d7247d2c59f7df4821f5d138 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Wed, 24 Sep 2014 19:17:51 +0200
Subject: [PATCH] Adds dot to compile templates

---
 lib/cartodb/template_maps.js | 33 ++++++++++++++-------------------
 package.json                 |  1 +
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/lib/cartodb/template_maps.js b/lib/cartodb/template_maps.js
index 255f367a..63b16971 100644
--- a/lib/cartodb/template_maps.js
+++ b/lib/cartodb/template_maps.js
@@ -1,7 +1,7 @@
-var crypto    = require('crypto');
-var Step      = require('step');
-var _         = require('underscore');
-
+var crypto  = require('crypto'),
+    Step    = require('step'),
+    _       = require('underscore'),
+    dot     = require('dot');
 
 // Class handling map templates
 //
@@ -40,12 +40,11 @@ function TemplateMaps(redis_pool, signed_maps, opts) {
   //           reference, see signed_maps.js
 
   // User templates (HASH:tpl_id->tpl_val)
-  this.key_usr_tpl = "map_tpl|<%= owner %>";
+  this.key_usr_tpl = dot.template("map_tpl|{{=it.owner}}");
 
   // User template locks (HASH:tpl_id->ctime)
-  this.key_usr_tpl_lck = "map_tpl|<%= owner %>|locks";
-
-};
+  this.key_usr_tpl_lck = dot.template("map_tpl|{{=it.owner}}|locks");
+}
 
 var o = TemplateMaps.prototype;
 
@@ -94,13 +93,12 @@ o._redisCmd = function(redisFunc, redisArgs, callback) {
 
 // @param callback function(err, obtained)
 o._obtainTemplateLock = function(owner, tpl_id, callback) {
-  var usr_tpl_lck_key = _.template(this.key_usr_tpl_lck, {owner:owner});
   var that = this;
   var gotLock = false;
   Step (
     function obtainLock() {
       var ctime = Date.now();
-      that._redisCmd('HSETNX', [usr_tpl_lck_key, tpl_id, ctime], this);
+      that._redisCmd('HSETNX', [that.key_usr_tpl_lck({owner:owner}), tpl_id, ctime], this);
     },
     function checkLock(err, locked) {
       if ( err ) throw err;
@@ -119,8 +117,7 @@ o._obtainTemplateLock = function(owner, tpl_id, callback) {
 
 // @param callback function(err, deleted)
 o._releaseTemplateLock = function(owner, tpl_id, callback) {
-  var usr_tpl_lck_key = _.template(this.key_usr_tpl_lck, {owner:owner});
-  this._redisCmd('HDEL', [usr_tpl_lck_key, tpl_id], callback);
+    this._redisCmd('HDEL', [this.key_usr_tpl_lck({owner:owner}), tpl_id], callback);
 };
 
 o._reValidIdentifier = /^[a-zA-Z][0-9a-zA-Z_]*$/;
@@ -205,7 +202,7 @@ o.addTemplate = function(owner, template, callback) {
   //
   //
 
-  var usr_tpl_key = _.template(this.key_usr_tpl, {owner:owner});
+  var usr_tpl_key = this.key_usr_tpl({owner:owner});
   var gotLock = false;
   var that = this;
   var limit = that._userTemplateLimit();
@@ -289,7 +286,7 @@ o.addTemplate = function(owner, template, callback) {
 // @param callback function(err)
 //
 o.delTemplate = function(owner, tpl_id, callback) {
-  var usr_tpl_key = _.template(this.key_usr_tpl, {owner:owner});
+  var usr_tpl_key = this.key_usr_tpl({owner:owner});
   var gotLock = false;
   var that = this;
   Step(
@@ -398,7 +395,7 @@ o.updTemplate = function(owner, tpl_id, template, callback) {
     return;
   }
 
-  var usr_tpl_key = _.template(this.key_usr_tpl, {owner:owner});
+  var usr_tpl_key = this.key_usr_tpl({owner:owner});
   var gotLock = false;
   var that = this;
   Step(
@@ -492,8 +489,7 @@ o.updTemplate = function(owner, tpl_id, template, callback) {
 //        Returns a list of template identifiers
 // 
 o.listTemplates = function(owner, callback) {
-  var usr_tpl_key = _.template(this.key_usr_tpl, {owner:owner});
-  this._redisCmd('HKEYS', [ usr_tpl_key ], callback);
+    this._redisCmd('HKEYS', [ this.key_usr_tpl({owner:owner}) ], callback);
 };
 
 // Get a templates
@@ -507,11 +503,10 @@ o.listTemplates = function(owner, callback) {
 //        Return full template definition
 //
 o.getTemplate = function(owner, tpl_id, callback) {
-  var usr_tpl_key = _.template(this.key_usr_tpl, {owner:owner});
   var that = this;
   Step(
     function getTemplate() {
-      that._redisCmd('HGET', [ usr_tpl_key, tpl_id ], this);
+      that._redisCmd('HGET', [ that.key_usr_tpl({owner:owner}), tpl_id ], this);
     },
     function parseTemplate(err, tpl_val) {
       if ( err ) throw err;
diff --git a/package.json b/package.json
index 1f542da7..f126a5d8 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "dependencies": {
         "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0",
         "underscore"  : "~1.6.0",
+        "dot": "~1.0.2",
         "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.27.0",
         "step": "~0.0.5",
         "request": "~2.9.203",