@nakedcreativity/cee-ms-node 0.3.33 → 0.3.35

package/index.js

@@ -162,6 +162,12 @@ function ceems(config) {
 		},
 		render: function(scope, hash){
 			// var filepath = Liquid.evalValue(this.match[1]+'.liquid', scope);
+
+			if(this.match[2]){
+				var itemsPerPage = this.match[2]
+			}else{
+				var itemsPerPage = 10
+			}
 			
 			var collectionName = Liquid.evalValue(this.match[0], scope)
 
@@ -171,6 +177,20 @@ function ceems(config) {
 
 				var scopeObj = {}
 				scopeObj['collection'] = collection
+
+				if(scope.scopes[0].page && scope.scopes[0].page.pagination){
+					scopeObj.pagination = scope.scopes[0].page.pagination
+				}else {
+					scopeObj.pagination = 1
+				}
+	
+				scopeObj.itemsPerPage = parseInt(itemsPerPage);
+
+				scopeObj.start = itemsPerPage * (scopeObj.pagination - 1)
+				scopeObj.end = scopeObj.start + itemsPerPage
+
+				scopeObj.lastPage = Math.ceil(collection.data.length / itemsPerPage)
+
 				scope.push(scopeObj)
 
 				//console.log(scope)
@@ -327,32 +347,61 @@ function ceems(config) {
 			this.match = tagToken.args.split(' ')
 		},
 		render: function(scope, hash){
-			
-			var articlesPerPage = 10
+
+			if(this.match[2]){
+				var articlesPerPage = this.match[2]
+			}else{
+				var articlesPerPage = 10
+			}
 
 			if(!site.blogs[this.match[0]]){
 				return
 			}
+
+			// loop over articles, push articles that match tag or pagination, into array
+
 			var blog = site.blogs[this.match[0]]
+			var pagination = 1
+
 			if(scope.scopes[0].page && scope.scopes[0].page.pagination){
-				blog.pagination = scope.scopes[0].page.pagination
-			}else {
-				blog.pagination = 1
+				pagination = scope.scopes[0].page.pagination
 			}
 
-			blog.start = articlesPerPage * (blog.pagination - 1)
-			blog.end = blog.start + articlesPerPage
+			articlesPerPage = parseInt(articlesPerPage)
+			var start = articlesPerPage * (pagination - 1)
+			var end = start + articlesPerPage
 
-			blog.lastPage = Math.ceil(blog.articles.length / articlesPerPage)
-			
-			scope.push(blog)
+			var lastPage = Math.ceil(blog.articles.length / articlesPerPage)
 
 			// is page greater than the number of articles?
 			// throw a 404
-			if(blog.start >= blog.articles.length){
+			if(start >= blog.articles.length){
 				throw new Error('This page does not exist')
 			}
 
+			var articles = []
+			
+			
+			// if tag set, create filtered array of articles
+			if(this.match[3]){
+				var tag = Liquid.lexical.parseLiteral(this.match[3])
+				
+				blog.articles.forEach((article) => {
+					if (article.tags && article.tags.indexOf(tag) > -1){
+						articles.push(article)
+					}
+				})
+			}else {
+				articles = blog.articles
+			}
+
+			// slice original blog array to send just current page of articles to liquid
+			blog.articles = articles.slice(start,end)
+			blog.pagination = pagination
+			blog.lastPage = lastPage
+			scope.push(blog)
+
+
 			return engine.handleCache(this.match[1]+'.liquid')
                 .then((templates) => {
                     return engine.renderer.renderTemplates(templates, scope);

package/package.json

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