Updated the example render servers

Author: markfinger

examples/basic_rendering/package.json

@@ -1,10 +1,11 @@
 {
   "private": true,
   "dependencies": {
-    "babel": "^5.6.14",
+    "babel": "^5.8.23",
     "body-parser": "^1.13.2",
-    "express": "^4.13.1",
+    "express": "^4.13.3",
     "react": "^0.13.3",
-    "react-render": "^0.3.0"
+    "react-render": "^0.3.0",
+    "yargs": "^3.25.0"
   }
 }

examples/basic_rendering/render_server.js

@@ -0,0 +1,58 @@
+var argv = require('yargs')
+	.option('p', {
+		alias: 'port',
+		description: 'Specify the server\'s port',
+		default: 9009
+    })
+    .option('a', {
+		alias: 'address',
+		description: 'Specify the server\'s address',
+		default: '127.0.0.1'
+    })
+    .help('h').alias('h', 'help')
+    .strict()
+    .argv;
+
+var http = require('http');
+var express = require('express');
+var bodyParser = require('body-parser');
+var reactRender = require('react-render');
+
+// Ensure support for loading files that contain ES6+7 & JSX
+require('babel/register');
+
+var ADDRESS = argv.address;
+var PORT = argv.port;
+
+var app = express();
+var server = http.Server(app);
+
+app.use(bodyParser.json());
+
+app.get('/', function(req, res) {
+	res.end('React render server');
+});
+
+app.post('/render', function(req, res) {
+	reactRender(req.body, function(err, markup) {
+		if (err) {
+			res.json({
+				error: {
+					type: err.constructor.name,
+					message: err.message,
+					stack: err.stack
+				},
+				markup: null
+			});
+		} else {
+			res.json({
+				error: null,
+				markup: markup
+			});
+		}
+	});
+});
+
+server.listen(PORT, ADDRESS, function() {
+	console.log('React render server listening at http://' + ADDRESS + ':' + PORT);
+});

examples/basic_rendering/server.js

@@ -1,10 +1,11 @@
 {
   "private": true,
   "dependencies": {
-    "babel": "^5.6.14",
+    "babel": "^5.8.23",
     "body-parser": "^1.13.2",
-    "express": "^4.13.1",
+    "express": "^4.13.3",
     "react": "^0.13.3",
-    "react-render": "^0.3.0"
+    "react-render": "^0.3.0",
+    "yargs": "^3.25.0"
   }
 }

package.json

@@ -16,5 +16,5 @@
 if output.strip() == '':
     output += process.stdout.readline().decode('utf-8')
 
-if 'python-react test render server' not in output:
+if 'React render server' not in output:
     raise Exception('Unexpected output: "{}"'.format(output))

tests/__init__.py

@@ -1,36 +1,58 @@
+var argv = require('yargs')
+	.option('p', {
+		alias: 'port',
+		description: 'Specify the server\'s port',
+		default: 9009
+    })
+    .option('a', {
+		alias: 'address',
+		description: 'Specify the server\'s address',
+		default: '127.0.0.1'
+    })
+    .help('h').alias('h', 'help')
+    .strict()
+    .argv;
+
 var http = require('http');
 var express = require('express');
 var bodyParser = require('body-parser');
 var reactRender = require('react-render');
 
-// Ensure support for JSX files
+// Ensure support for loading files that contain ES6+7 & JSX
 require('babel/register');
 
-var ADDRESS = '127.0.0.1';
-var PORT = 9009;
+var ADDRESS = argv.address;
+var PORT = argv.port;
 
 var app = express();
 var server = http.Server(app);
 
 app.use(bodyParser.json());
 
+app.get('/', function(req, res) {
+	res.end('React render server');
+});
+
 app.post('/render', function(req, res) {
 	reactRender(req.body, function(err, markup) {
-		var error = null;
 		if (err) {
-			error = {
-				type: err.constructor.name,
-				message: err.message,
-				stack: err.stack
-			};
+			res.json({
+				error: {
+					type: err.constructor.name,
+					message: err.message,
+					stack: err.stack
+				},
+				markup: null
+			});
+		} else {
+			res.json({
+				error: null,
+				markup: markup
+			});
 		}
-		res.json({
-			error: error,
-			markup: markup
-		});
 	});
 });
 
 server.listen(PORT, ADDRESS, function() {
-	console.log('python-react test render server listening at http://' + ADDRESS + ':' + PORT);
+	console.log('React render server listening at http://' + ADDRESS + ':' + PORT);
 });