Merge pull request #12 from jmlue42/master

Updating to Hapi 11.x.x
mac- · Nov 18, 2015 · f7381f5 · f7381f5
2 parents 3cff314 + bcccb73
commit f7381f5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 node_modules
 test/coverage*
 .DS*
+.idea/
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,3 @@
 language: node_js
 node_js:
-  - 0.10
+  - 4
diff --git a/README.md b/README.md
@@ -110,7 +110,7 @@ server.statsd.set('your.set', 200);
 
 ## Version Compatibility
 
-### Currently compatible with: Hapi 10.x.x (Node v4)
+### Currently compatible with: Hapi 11.x.x (Node v4)
 
 * 0.1.x - Hapi 1.x.x
 * 0.2.x - Hapi 3.x.x
@@ -121,6 +121,7 @@ server.statsd.set('your.set', 200);
 * 1.2.x - Hapi 8.x.x
 * 2.x.x - Hapi 9.x.x
 * 3.x.x - Hapi 10.x.x (Node v4)
+* 4.x.x - Hapi 11.x.x
 
 # License
 

diff --git a/lib/hapi-statsd.js b/lib/hapi-statsd.js
@@ -48,6 +48,9 @@ module.exports.register = function (server, options, next) {
 			else if (specials.options && request._route === specials.options.route) {
 				path = '/{cors*}';
 			}
+			else if (request._route.path === '/' && request._route.method === 'options'){
+				path = '/{cors*}';
+			}
 
 			var statName = settings.template
 							.replace('{path}', normalizePath(path))

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
 	"contributors": [
 		"Mac Angell <mac.ang311@gmail.com>"
 	],
-	"version": "3.0.0",
+	"version": "4.0.0",
 	"dependencies": {
 		"statsd-client": "0.x.x",
 		"eidetic": "0.x.x",
@@ -16,12 +16,12 @@
 		"travis-cov": "0.x.x",
 		"blanket": "1.x.x",
 		"node-dependencies": "0.x.x",
-		"hapi": "^10.0.0",
+		"hapi": "^11.0.0",
 		"coveralls": "2.x.x",
 		"mocha-lcov-reporter": "0.x.x"
 	},
 	"peerDependencies": {
-		"hapi": "^10.0.0"
+		"hapi": "^11.0.0"
 	},
 	"keywords": [
 		"hapi",

diff --git a/test/integration/hapi-statsd.tests.js b/test/integration/hapi-statsd.tests.js
@@ -22,8 +22,7 @@ beforeEach(function(done) {
 
 	server.connection({
 		host: 'localhost',
-		port: 8085,
-		routes: { cors: true }
+		port: 8085
 	});
 
 	var get = function (request, reply) {
@@ -34,9 +33,9 @@ beforeEach(function(done) {
 		reply(new Error());
 	};
 
-	server.route({ method: 'GET', path: '/', handler: get });
-	server.route({ method: 'GET', path: '/err', handler: err });
-	server.route({ method: 'GET', path: '/test/{param}', handler: get });
+	server.route({ method: ['GET','OPTIONS'], path: '/', handler: get, config: {cors: true}});
+	server.route({ method: 'GET', path: '/err', handler: err, config: {cors: true} });
+	server.route({ method: 'GET', path: '/test/{param}', handler: get, config: {cors: true}});
 
 	server.register({
 		register: plugin,