@nakedcreativity/cee-ms-node 0.3.23 → 0.3.25

package/index.js

@@ -160,19 +160,23 @@ function ceems(config) {
 		render: function(scope, hash){
 			// var filepath = Liquid.evalValue(this.match[1]+'.liquid', scope);
 			
-			//console.log('look for data collection', this.match[0])
-			
-			if(site.collections[this.match[0]]){
-				//console.log(site.collections[this.match[0]]._id)
-				var collection = JSON.parse(fs.readFileSync('./data/'+site.collections[this.match[0]]._id+'.json', 'utf8'));
+			var collectionName = Liquid.evalValue(this.match[0], scope)
+
+			if(site.collections[collectionName]){
+				//console.log(site.collections[collection]._id)
+				var collection = JSON.parse(fs.readFileSync('./data/'+site.collections[collectionName]._id+'.json', 'utf8'));
 
 				var scopeObj = {}
-				scopeObj[this.match[0]] = collection.data
+				scopeObj['collection'] = collection
 				scope.push(scopeObj)
 
 				//console.log(scope)
-
-				return engine.handleCache(this.match[1]+'.liquid')
+				var template = Liquid.lexical.parseLiteral(this.match[1])
+				if (!template) {
+					template = this.match[1]
+				}
+				
+				return engine.handleCache(template+'.liquid')
 					.then((templates) => {
 						return engine.renderer.renderTemplates(templates, scope);
 					})
@@ -186,6 +190,39 @@ function ceems(config) {
 			}
 	    }
 	})
+
+	this.engine.registerTag('external', {
+        parse: function (tagToken, remainTokens) {
+            this.match = tagToken.args.split(' '); // name // path[0] == navigation name
+        },
+        render: function (scope, hash) {
+
+            var filepath = Liquid.lexical.parseLiteral(this.match[0])
+            var jsonData = JSON.parse(fs.readFileSync(filepath, 'utf8'))
+
+            var scopeObj = {}
+            scopeObj['external'] = jsonData
+            scope.push(scopeObj)
+
+            //console.log(scope)
+            var template = Liquid.lexical.parseLiteral(this.match[1])
+            if (!template) {
+                template = this.match[1]
+            }
+
+            return engine.handleCache(template + '.liquid')
+                .then((templates) => {
+                    return engine.renderer.renderTemplates(templates, scope);
+                })
+                .then((html) => {
+                    scope.pop();
+                    return html;
+                });
+
+        }
+	})
+	
+
 	this.engine.registerFilter('active', (path, match, cssClass) => {
 		
 		var regex = new RegExp("^"+match)
@@ -212,6 +249,11 @@ function ceems(config) {
 	    render: function(scope, hash) {
 			var image = Liquid.evalExp(this.args[0], scope);
 			//console.log(image)
+
+			if(!image){
+				return Promise.resolve('')
+			}
+
 			if(this.args[1] && image.variants && image.variants[this.args[1]]){
 				var src = image.variants[this.args[1]]
 			}else {
@@ -228,6 +270,11 @@ function ceems(config) {
 	    },
 	    render: function(scope, hash) {
 			var image = Liquid.evalExp(this.args[0], scope);
+
+			if(!image){
+				return Promise.resolve('')
+			}
+
 			//console.log(image)
 			if(this.args[1] && image.variants && image.variants[this.args[1]]){
 				var src = image.variants[this.args[1]]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nakedcreativity/cee-ms-node",
-  "version": "0.3.23",
+  "version": "0.3.25",
   "description": "Cee.ms for Node.js",
   "main": "index.js",
   "scripts": {