Merge pull request dwyl#14 from nelsonic/socket.io-expansion-pack

updates dependencies

.travis.yml

@@ -1,4 +1,3 @@
 language: node_js
 node_js:
-  - 0.10
   - 0.12

examples/hellovalidate.js

@@ -1,18 +1,18 @@
 // Start this app from your command line with: node hellovalidate.js
-// then visit: http://localhost:3000/YOURNAME
-
-var Hapi = require('hapi'),
-    Joi  = require('joi');
+// then open in web browser: http://localhost:3000/YOURNAME-HERE
 
+var Hapi = require('hapi');
+var Joi  = require('joi');
 var server = new Hapi.Server();
+
 server.connection({
 	host: '0.0.0.0',
 	port: 3000
 });
 
 server.route({
 	method: 'GET',
-	path: '/{yourname*}',
+	path: '/{name*}',
 	config: {  // validate will ensure YOURNAME is valid before replying to your request
 		validate: { params: { yourname: Joi.string().max(40).min(2).alphanum() } },
 		handler: function (req,reply) {
@@ -22,5 +22,5 @@ server.route({
 });
 
 server.start(function() {
-	console.log('Now Visit: http://localhost:3000/YOURNAME')
+	console.log('Now Visit: http://localhost:3000/YOURNAME');
 });

examples/socketio.js

@@ -1,5 +1,3 @@
-// see: https://github.com/spumko/hapi/blob/master/examples/socketio.js
-// The following initializes a socket.io server.
 // The socket.io client JavaScript is located at http://localhost:8000/socket.io/socket.io.js
 // To create a new socket.io handshake make a POST request to http://localhost:8000/socket.io/1
 // use the resulting session ID for subsequent requests (see https://github.com/LearnBoost/socket.io-spec)
@@ -16,10 +14,9 @@ var SocketIO = require('socket.io');
 
 var internals = {};
 
-
 internals.startServer = function () {
 
-    var server = new Hapi.Server('0.0.0.0', process.env.PORT || 3000);
+    var server = new Hapi.Server('0.0.0.0', process.env.PORT || 8000);
 
     var helloHandler = function (request, reply) {
 
@@ -29,10 +26,19 @@ internals.startServer = function () {
     server.route({ method: 'GET', path: '/', handler: helloHandler });
 
     server.start(function () {
-    	console.dir(server.listener)
+    	// console.dir(server.listener);
         var io = SocketIO.listen(server.listener);
+        io.on('connection', function (socket) {
+
+            socket.emit('Hello!');
+
+            socket.on('message', function () {
+                socket.emit('received');
+            });
+        });
+
     });
 };
 
 
-internals.startServer();
+internals.startServer();

index.js

@@ -10,12 +10,12 @@ var server = new Hapi.Server();
 server.connection({ port: port });
 
 server.route({
-  method: 'GET',
-  path: '/{yourname*}',
+  method: '*',
+  path: '/{name*}',
   config: {  // validate will ensure YOURNAME is valid before replying to your request
-    validate: { params: { yourname: Joi.string().max(40).min(2).alphanum() } },
+    validate: { params: { name: Joi.string().max(40).min(2).alphanum() } },
     handler: function (req,reply) {
-      reply('Hello '+ req.params.yourname + '!');
+      reply('Hello '+ req.params.name + '!');
     }
   }
 });
@@ -33,7 +33,7 @@ server.route({
 });
 
 server.start(function() {
-  console.log('Now Visit: http://localhost:'+port+'/YOURNAME')
+  console.log('Now Visit: http://localhost:' + port + '/YOURNAME');
 });
 
 module.exports = server;

makemehapi/01-HELLO_HAPI.js

@@ -1,12 +1,15 @@
 var Hapi = require('hapi');
-var server = Hapi.createServer('localhost', Number(process.argv[2] || 8080));
-
-server.route({
-	path:'/',
-	method: 'GET',
-	handler: function(request, reply) {
-		reply('Hello Hapi');
-	}
+var server = new Hapi.Server();
+
+server.connection({
+    host: 'localhost',
+    port: Number(process.argv[2] || 8080)
 });
 
-server.start();
+function hellohandler(request, reply) {
+    reply("Hello Hapi");
+}
+
+server.route({path: '/', method:'GET', handler: hellohandler});
+
+server.start();

makemehapi/02-ROUTES.js

@@ -1,14 +1,15 @@
 var Hapi = require('hapi');
-var server = Hapi.createServer('localhost', Number(process.argv[2] || 8080));
+var server = new Hapi.Server();
 
-server.route({
-  path:'/{name*}',
-  method: 'GET',
-  handler: handler
-})
+server.connection({
+    host: 'localhost',
+    port: Number(process.argv[2] || 8080)
+});
 
-function handler (request, reply) {
-  reply('Hello ' + request.params.name);
+function routehandler(request, reply) {
+  reply('Hello ' + encodeURIComponent(request.params.name));
 }
 
+server.route({path: '/{name*}', method:'GET', handler: routehandler});
+
 server.start();

makemehapi/03-HANDLING.js

@@ -1,10 +1,15 @@
 var Hapi = require('hapi');
-var server = Hapi.createServer('localhost', Number(process.argv[2] || 8080));
+var server = new Hapi.Server();
 
-server.route({
-  path:'/',
-  method: 'GET',
-  handler: { file: "index.html" }
+server.connection({
+    host: 'localhost',
+    port: Number(process.argv[2] || 8080)
+});
+
+server.route({path: '/{name*}', method:'GET',
+  handler: {
+    file: "index.html"
+  }
 });
 
 server.start();

makemehapi/04-DIRECTORIES.js

@@ -1,11 +1,18 @@
 var Hapi = require('hapi');
-var server = Hapi.createServer('localhost', Number(process.argv[2] || 8080));
+var server = new Hapi.Server();
 
-server.route({
-  path: "/foo/bar/baz/{param}",
-  method: 'GET',
+server.connection({
+    host: 'localhost',
+    port: Number(process.argv[2] || 8080)
+});
+
+function hellohandler(request, reply) {
+  reply('Hello ' + encodeURIComponent(request.params.name));
+}
+
+server.route({path: '/{name*}', method:'GET',
   handler: {
-      view: "index.html"
+    directory: { path: __dirname }
   }
 });
 

makemehapi/05-VIEWS.js

@@ -1,24 +1,23 @@
-var options = {
-  views: {
-    path: 'templates',
-    engines: {
-      html: require('handlebars')
-    }
-  }
-};
-
 var Hapi = require('hapi');
-var server = Hapi.createServer('localhost',
-  Number(process.argv[2] || 8080),
-  options
-);
+var Path = require('path');
+var server = new Hapi.Server();
+
+server.connection({
+    host: 'localhost',
+    port: Number(process.argv[2] || 8080)
+});
 
-server.route({
-  path:'/',
-  method: 'GET',
+server.route({path: '/{name*}', method:'GET',
   handler: {
     view: "index.html"
   }
 });
 
+server.views({
+    engines: {
+        html: require('handlebars')
+    },
+    path: Path.join(__dirname, 'templates')
+});
+
 server.start();

makemehapi/06-PROXIES.js

@@ -1,14 +1,17 @@
 var Hapi = require('hapi');
-var server = Hapi.createServer('localhost', Number(process.argv[2] || 8080));
+var server = new Hapi.Server();
 
-server.route({
-  path:'/{p*}',
-  method: 'GET',
-  handler: function (request, reply) {
-    reply.proxy({ 
-    	host: '127.0.0.1', 
-    	port: 65535
-    });
+server.connection({
+    host: 'localhost',
+    port: Number(process.argv[2] || 8080)
+});
+
+server.route({path: '/proxy', method:'GET',
+  handler: {
+      proxy: {
+          host: '127.0.0.1',
+          port: 65535
+      }
   }
 });
 

makemehapi/07-HELPING.js

@@ -1,25 +1,24 @@
-var options = {
-  views: {
-    path: 'templates',
-    engines: {
-      html: require('handlebars')
-    },
-    helpersPath: 'helpers'
-  }
-};
-
 var Hapi = require('hapi');
-var server = Hapi.createServer('localhost',
-  Number(process.argv[2] || 8080),
-  options
-);
+var Path = require('path');
+var server = new Hapi.Server();
+
+server.connection({
+    host: 'localhost',
+    port: Number(process.argv[2] || 8080)
+});
 
-server.route({
-  path:'/',
-  method: 'GET',
+server.route({path: '/', method:'GET',
   handler: {
-    view: "index.html"
+    view: "helper-index.html"
   }
 });
 
+server.views({
+    engines: {
+        html: require('handlebars')
+    },
+    path: Path.join(__dirname, 'templates'),
+    helpersPath:  Path.join(__dirname, 'helpers')
+});
+
 server.start();