Update demo site

Author: geraintluff

.gitignore

@@ -174,3 +174,5 @@ node_modules
 bower_components
 
 demos/json/data.json
+
+node-package/public-suffix-list.txt

node-package/jsonary-bundle.js

@@ -2,6 +2,7 @@ var fs = require('fs');
 var http = require('http');
 var https = require('https');
 var path = require('path');
+var urlModule = require('url');
 
 var bundleModule = require('./create-bundle.js');
 var cookieClient = require('./cookie-client');
@@ -100,19 +101,9 @@ function modifyJsonaryForServer(Jsonary) {
 	// Make an actual HTTP request, defaulting to the current server if just path is given
 	Jsonary.ajaxFunction = function (params, callback) {
 		requestCount++;
-		var uri = new Jsonary.Uri(params.url);
-		var isHttps = (uri.scheme == 'https');
+		var options = urlModule.parse(params.url);
+		var isHttps = (options.protocol == 'https');
 		var httpModule = isHttps ? https : http;
-		var options = {};
-		if (uri.domain) {
-			options.domain = uri.domain;
-			options.host = options.domain;
-			options.path = params.url.split(options.host).slice(1).join(options.host);
-		} else {
-			options.domain = 'localhost';
-			options.port = SERVER_PORT;
-			options.path = params.url;
-		}
 		options.method = params.method;
 		var cookieString = Jsonary.server.cookies.cookieStringForRequest(options.domain, options.path, isHttps);
 		options.headers = {

test/site.js

@@ -2,7 +2,7 @@ var express = require('express');
 var url = require('url');
 var http = require('http');
 var https = require('https');
-var jsonaryBundle = require('./jsonary-bundle');
+var jsonaryBundle = require('../node-package/jsonary-bundle');
 
 var app = express();
 app.use(express.bodyParser());
@@ -11,18 +11,29 @@ var jsonaryJsBundle;
 function createBundles() {
 	var bundle = jsonaryBundle.fresh();
 	bundle.add('renderers/site');
+	// extra plugins and renderers
+	bundle.add('../plugins/jsonary.location');
+	bundle.add('../plugins/jsonary.undo');
+	bundle.add('../plugins/jsonary.jstl');
+	bundle.add('../plugins/jsonary.render.table');
+	bundle.add('../plugins/jsonary.render.generate');
+	bundle.add('../renderers/string-formats');
+	bundle.add('../renderers/contributed/full-preview');
+	bundle.add('../renderers/contributed/full-instances');
+	bundle.add('../renderers/contributed/adaptive-table');
 	bundle.add('../renderers/contributed/markdown');
 
 	bundle.writeCss('bundle.css');
 	//bundle.writeCss('bundle.min.css', true);
-	masterBundle.writeJs('bundle.js');
+	bundle.writeJs('bundle.js');
 	//masterBundle.writeJs('bundle.min.js', true);
 	return bundle;
 }
 var jsonaryJsBundle = createBundles();
 
 var createJsonary = function () {
 	var Jsonary = jsonaryJsBundle.instance();
+	Jsonary.baseUri = 'http://localhost:8080/';
 	var buttons = [];
 	Jsonary.render.clearButtons = function () {
 		buttons = [];