@nakedcreativity/cee-ms-node 0.1.3 → 0.1.4

package/index.js

@@ -4,8 +4,7 @@ const fs = require('fs');
 const _ = require('underscore');
 var Liquid = require('nakedcreativity-liquid');
 var cheerio = require('cheerio');
-
-
+var bodyParser = require("body-parser");
 
 function ceems(config) {
 
@@ -14,6 +13,7 @@ function ceems(config) {
 	// process config and set defaults
 	// // set up static file hosting
 	this.app.use(express.static(config.assets))
+	this.app.use(bodyParser.json());
 
 	this.engine = Liquid({
 		root: path.resolve('./views/'),  // for layouts and partials
@@ -67,36 +67,39 @@ function ceems(config) {
 
 
 	this.app.get(/(.*)/, (req, res)=>{
-		this.auto(req,res);
-	})
-
-}
 
-ceems.prototype.auto = function(req, res) {
+		this.site = JSON.parse(fs.readFileSync('./pages/site.json', 'utf8'));
+		this.pages_map = _.indexBy(this.site.pages, 'url');
 
-	this.site = JSON.parse(fs.readFileSync('./pages/site.json', 'utf8'));
-  	this.pages_map = _.indexBy(this.site.pages, 'url');
+		if(this.pages_map[req._parsedUrl.pathname]){
+			var page = this.pages_map[req._parsedUrl.pathname]
 
-	var start = Date.now()
+			if(page.redirect){
+				res.redirect(parseInt(page.redirect.type), page.redirect.to)
+			}
 
-	if(this.pages_map[req._parsedUrl.pathname]){
-		var page = this.pages_map[req._parsedUrl.pathname]
+			var page = JSON.parse(fs.readFileSync('./pages/'+page.handle+'.json', 'utf8'));
 
-		if(page.redirect){
-			res.redirect(parseInt(page.redirect.type), page.redirect.to)
+		}else{
+			res.status(404).send('Sorry, this page does not exist');
 		}
+		
+		this.render(page,req,res);
 
-		var page = JSON.parse(fs.readFileSync('./pages/'+page.handle+'.json', 'utf8'));
+	})
 
-	}else{
-		try {
-			var page = JSON.parse(fs.readFileSync('./drafts/'+req._parsedUrl.pathname.replace('/drafts/','')+'.json', 'utf8'));
-		}catch (error){
-			res.status(404).send('Sorry, this page does not exist');
-		}
-	}
+	this.app.post(/draft\/(.*)/, (req, res)=>{
+
+		// validate authorisation JWT here
+		this.site = JSON.parse(fs.readFileSync('./pages/site.json', 'utf8'));
+		this.render(req.body.page,req,res);
+
+	})
+
+}
+
+ceems.prototype.render = function(page, req, res) {
 
-	
 	// get any external data, and save this into the page	
 	_.each(page.external, function(ext, key){
 
@@ -196,10 +199,8 @@ ceems.prototype.auto = function(req, res) {
 			if(err){
 				console.log(err)
 			}
-			var finish = Date.now()
-			console.log(finish - start, 'render time')
-			console.log('..................')
-			res.header('X-FRAME-OPTIONS', 'ALLOW-FROM localhost:3006');
+			//res.header('X-FRAME-OPTIONS', 'allow-from http://localhost:3002');
+			console.log(res)
 			res.send(html)
 		})
 		
@@ -214,13 +215,11 @@ ceems.prototype.auto = function(req, res) {
 ceems.prototype.init = function(){
 
 	// needs to be dealt with on each request, or results cache in someway
-	
-
 
 }
 
 ceems.prototype.viewsPath = function(){
 	return './views/'
-}	
+}
 
 module.exports = ceems;

package/package.json

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