@nakedcreativity/cee-ms-node 0.3.19 → 0.3.21

package/index.js

@@ -105,25 +105,37 @@ function ceems(config) {
 		},
 		render: function(scope, hash){
 			// var filepath = Liquid.evalValue(this.match[1]+'.liquid', scope);
-			var page = scope.scopes[0]
 
-			console.log('look for page with path', this.match[0])
+			var path = Liquid.evalValue(this.match[0], scope)
+			if(!path){
+				path = Liquid.lexical.parseLiteral(this.match[0])
+			}
+			if(!path){
+				path = this.match[0]
+			}
+
 			
-			if(site.pages[this.match[0]]){
-				var page = site.pages[this.match[0]]
-				console.log(page)
+			
+			if(site.pages[path]){
+				var page = site.pages[path]
+				
 				if(page.redirect){
 					res.redirect(parseInt(page.redirect.type), page.redirect.to)
 				}
 
 				var page = JSON.parse(fs.readFileSync('./pages/'+page._id+'.json', 'utf8'));
-				page.fullpath = site.pages[this.match[0]].url
+				page.fullpath = site.pages[path].url
 				page.path = page.fullpath.split('/')
 
-				console.log(page)
+	
 				scope.push(page)
 
-				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);
 					})
@@ -185,6 +197,39 @@ function ceems(config) {
 		}
 
 	})
+
+	this.engine.registerTag('image', {
+	    parse: function(tagToken, remainTokens) {
+	        this.args = tagToken.args.split(' '); 
+	    },
+	    render: function(scope, hash) {
+			var image = Liquid.evalExp(this.args[0], scope);
+			console.log(image)
+			if(this.args[1] && image.variants && image.variants[this.args[1]]){
+				var src = image.variants[this.args[1]]
+			}else {
+				var src = image.src
+			}
+			var alt = image.alt || ''
+	        return Promise.resolve('<img src="'+src+'" alt="'+alt+'"/>');
+	    }
+	});
+
+	this.engine.registerTag('imageurl', {
+	    parse: function(tagToken, remainTokens) {
+	        this.args = tagToken.args.split(' '); 
+	    },
+	    render: function(scope, hash) {
+			var image = Liquid.evalExp(this.args[0], scope);
+			console.log(image)
+			if(this.args[1] && image.variants && image.variants[this.args[1]]){
+				var src = image.variants[this.args[1]]
+			}else {
+				var src = image.src
+			}
+	        return Promise.resolve(src);
+	    }
+	});
 	
 	this.engine.registerTag('breadcrumb', {
 		parse: function(tagToken, remainTokens) {

package/package.json

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