@nakedcreativity/cee-ms-node 0.3.24 → 0.3.26

package/index.js

@@ -114,8 +114,6 @@ function ceems(config) {
 				path = this.match[0]
 			}
 
-			
-			
 			if(site.pages[path]){
 				var page = site.pages[path]
 				
@@ -160,19 +158,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);
 					})
@@ -245,6 +247,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 {
@@ -261,6 +268,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]]
@@ -311,15 +323,31 @@ function ceems(config) {
 		},
 		render: function(scope, hash){
 			
-			console.log('render blog', this.match[0])
-			console.log(site.blogs[this.match[0]])
+			var articlesPerPage = 10
 
 			if(!site.blogs[this.match[0]]){
-				console.log('no match')
 				return
 			}
-			console.log(this.match[1], 'look for liquid template')
-			scope.push(site.blogs[this.match[0]])
+			var blog = site.blogs[this.match[0]]
+			if(scope.scopes[0].page.pagination){
+				blog.pagination = scope.scopes[0].page.pagination
+			}else {
+				blog.pagination = 1
+			}
+
+			blog.start = articlesPerPage * (blog.pagination - 1)
+			blog.end = blog.start + articlesPerPage
+
+			blog.lastPage = Math.ceil(blog.articles.length / articlesPerPage)
+			
+			scope.push(blog)
+
+			// is page greater than the number of articles?
+			// throw a 404
+			if(blog.start >= blog.articles.length){
+				throw new Error('This page does not exist')
+			}
+
 			return engine.handleCache(this.match[1]+'.liquid')
                 .then((templates) => {
                     return engine.renderer.renderTemplates(templates, scope);
@@ -327,7 +355,10 @@ function ceems(config) {
                 .then((html) => {
                     scope.pop();
                     return html;
-                });
+				})
+				.catch((error) => {
+					throw error
+				})
 		}
 
 	})
@@ -386,6 +417,16 @@ ceems.prototype.load = function(req, res){
 	
 	site = this.site //????
 	
+	// this may be better in middleware?
+	// test if path matches a pagination url
+	var regex = new RegExp("(.+)(\/[0-9]{1,})$")
+	if(regex.test(path)){
+		// looks like a blog url
+		var matches = path.match(regex)
+		var path = matches[1]
+		var pagination = parseInt(matches[2].substring(1))
+	}
+
 	if(this.site.pages[path]){
 		var page = this.site.pages[path]
 
@@ -396,6 +437,10 @@ ceems.prototype.load = function(req, res){
 		var page = JSON.parse(fs.readFileSync('./pages/'+page._id+'.json', 'utf8'));
 		page.fullpath = this.site.pages[path].url
 		page.path = page.fullpath.split('/')
+
+		if(pagination)
+			page.pagination = pagination
+
 		return page
 
 	}
@@ -417,17 +462,17 @@ ceems.prototype.render = function(req, res, page=null) {
 		page = this.load(req, res)
 	}
 	// get any external data, and save this into the page	
-	if(page.external){
-		_.each(page.external, function(ext, key){
+	// if(page.external){
+	// 	_.each(page.external, function(ext, key){
 
-			try {
-				page.external[key].data = JSON.parse(fs.readFileSync('./'+ext.file, 'utf8'));
-			}catch(error){
-				console.log(error)
-			}
+	// 		try {
+	// 			page.external[key].data = JSON.parse(fs.readFileSync('./'+ext.file, 'utf8'));
+	// 		}catch(error){
+	// 			console.log(error)
+	// 		}
 
-		})
-	}
+	// 	})
+	// }
 
 	// if there are whitelisted cookies, add these to the page so they can be rendered
 	if(this.config.whitelistedCookies){
@@ -438,7 +483,8 @@ ceems.prototype.render = function(req, res, page=null) {
 			}
 		})
 	}
-	
+
+	console.log('pagination, ', page.pagination)
 
 	var renderedRegions = {}
 	var jobs = []
@@ -476,7 +522,10 @@ ceems.prototype.render = function(req, res, page=null) {
 
 			        renderedRegions[key][index] = html
 			        return resolve();
-			    });
+				})
+				.catch(error=>{
+					reject(error)
+				})
 			}))
 
 		}, this)
@@ -511,7 +560,10 @@ ceems.prototype.render = function(req, res, page=null) {
 		        page.modules[key] = html
 		        return resolve();
 		        
-		    });
+			})
+			.catch(error=>{
+				reject(error)
+			})
 		}))
 
 	}, this)
@@ -540,11 +592,10 @@ ceems.prototype.render = function(req, res, page=null) {
 			res.send(html)
 		})
 		
-	}, reason => {
-		console.log(reason)
 	}).catch(error=>{
+		console.log('error in')
 		console.log(error)
-		res.status(500).send('Internal server error');
+		res.status(500).send(error.message);
 	})
 }
 

package/package.json

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