bassmaster - npm Package Compare versions

Comparing version 0.1.0 to 0.2.0

lib/batch.js

@@ -21,3 +21,3 @@ // Load modules
         var requests = [];
-        var requestRegex = /(?:\/)(?:\$(\d)+\.)?([\w:\.]+)/g;       // /project/$1.project/tasks, does not allow using array responses
+        var requestRegex = /(?:\/)(?:\$(\d)+\.)?([\w:\.]*)/g;       // /project/$1.project/tasks, does not allow using array responses
 
@@ -35,3 +35,3 @@ // Validate requests
                 else {
-                    errorMessage = 'Request reference is beyond array size (' + i + ')';
+                    errorMessage = 'Request reference is beyond array size: ' + i;
                     return $0;
@@ -63,3 +63,3 @@ }
             else {
-                errorMessage = errorMessage || 'Invalid request format (' + i + ')';
+                errorMessage = errorMessage || 'Invalid request format in item: ' + i;
                 break;
@@ -66,0 +66,0 @@ }

lib/index.js

@@ -13,10 +13,8 @@ // Load modules
 
-exports.register = function (pack, options, next) {
+exports.register = function (plugin, options, next) {
 
-    Hoek.assert(typeof pack.route === 'function', 'Plugin permissions must allow route');
-
     var settings = Hoek.applyToDefaults(Defaults, options);
 
-    pack.route({
-    	method: 'POST',
+    plugin.route({
+        method: 'POST',
         path: settings.batchEndpoint,
@@ -23,0 +21,0 @@ config: Batch.config

package.json

@@ -10,3 +10,3 @@ {
   "repository": "git://github.com/spumko/bassmaster",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "main": "index",
@@ -19,16 +19,16 @@ "keywords": [
   "engines": {
-    "node": "0.8.x"
+    "node": "0.10.x"
   },
   "peerDependencies": {
-    "hapi": "0.16.x"
+    "hapi": "1.x.x"
   },
   "dependencies": {
     "async": "0.2.x",
-    "hoek": "0.7.x",
-    "boom": "0.3.x"
+    "hoek": "0.8.x",
+    "boom": "0.4.x"
   },
   "devDependencies": {
-    "hapi": "0.16.x",
+    "hapi": "1.x.x",
     "sinon": "1.x.x",
-    "lab": "0.0.x",
+    "lab": "0.1.x",
     "complexity-report": "0.x.x"
@@ -45,2 +45,2 @@ },
   ]
-}
+}

test/batch.js

@@ -25,3 +25,3 @@ // Load modules
 
-    var _server = null;
+    var server = null;
 
@@ -52,2 +52,10 @@ var profileHandler = function (request) {
 
+    var item2Handler = function (request) {
+
+        request.reply({
+            'id': request.params.id || 'mystery-guest',
+            'name': 'Item'
+        });
+    };
+
     var badCharHandler = function (request) {
@@ -106,7 +114,8 @@
 
-        _server = new Hapi.Server(0);
-        _server.route([
+        server = new Hapi.Server(0);
+        server.route([
             { method: 'GET', path: '/profile', handler: profileHandler },
             { method: 'GET', path: '/item', handler: activeItemHandler },
             { method: 'GET', path: '/item/{id}', handler: itemHandler },
+            { method: 'GET', path: '/item2/{id?}', handler: item2Handler },
             { method: 'GET', path: '/error', handler: errorHandler },
@@ -131,3 +140,3 @@ { method: 'GET', path: '/badchar', handler: badCharHandler },
 
-        _server.plugin.require('../', done)
+        server.pack.require('../', done)
     }
@@ -142,3 +151,3 @@
 
-        _server.inject({
+        server.inject({
             method: 'post',
@@ -176,2 +185,13 @@ url: '/batch',
 
+    it('shows two ordered responses when requesting two endpoints (with optional path param)', function (done) {
+
+        makeRequest('{ "requests": [{"method": "get", "path": "/item2/john"}, {"method": "get", "path": "/item2/"}] }', function (res) {
+
+            expect(res.length).to.equal(2);
+            expect(res[0].id).to.equal('john');
+            expect(res[1].id).to.equal('mystery-guest');
+            done();
+        });
+    });
+
     it('handles a large number of batch requests in parallel', function (done) {
@@ -178,0 +198,0 @@

test/plugin.js

@@ -26,3 +26,3 @@ // Load modules
         var server = new Hapi.Server();
-        server.plugin.require('../', function (err) {
+        server.pack.require('../', function (err) {
 
@@ -29,0 +29,0 @@ expect(err).to.not.exist;

No alert changes

Improved metrics

Total package byte prevSize

62991

increased by1.08%

Lines of code

557

increased by2.58%

Dependency changes

• + Addedalce@1.0.0(transitive)

• + Addedboom@0.4.21.2.1(transitive)

• + Addedcatbox@1.2.0(transitive)

• + Addedconfidence@0.8.1(transitive)

• + Addedcore-util-is@1.0.3(transitive)

• + Addedcryptiles@1.0.1(transitive)

• + Addedesprima@1.0.4(transitive)

• + Addedestraverse@1.3.2(transitive)

• + Addedhapi@1.20.0(transitive)

• + Addedhawk@1.1.2(transitive)

• + Addedhoek@0.8.50.9.11.5.22.16.3(transitive)

• + Addedinherits@2.0.4(transitive)

• + Addediron@1.0.0(transitive)

• + Addedisarray@0.0.1(transitive)

• + Addedjoi@2.9.0(transitive)

• + Addedjoi-v1@1.2.5(transitive)

• + Addedlru-cache@2.3.1(transitive)

• + Addedminimist@0.0.10(transitive)

• + Addedmultiparty@3.0.0(transitive)

• + Addedoptimist@0.6.1(transitive)

• + Addedreadable-stream@1.1.14(transitive)

• + Addedsemver@2.0.11(transitive)

• + Addedshot@1.7.0(transitive)

• + Addedsntp@1.0.9(transitive)

• + Addedstream-counter@0.2.0(transitive)

• + Addedstring_decoder@0.10.31(transitive)

• - Removedasync@0.1.22(transitive)

• - Removedaws-sign@0.2.1(transitive)

• - Removedboom@0.3.8(transitive)

• - Removedcatbox@0.4.0(transitive)

• - Removedcombined-stream@0.0.7(transitive)

• - Removedcookie-jar@0.2.0(transitive)

• - Removedcryptiles@0.1.3(transitive)

• - Removeddelayed-stream@0.0.5(transitive)

• - Removedforever-agent@0.2.0(transitive)

• - Removedform-data@0.0.10(transitive)

• - Removedformidable@1.0.17(transitive)

• - Removedhapi@0.16.0(transitive)

• - Removedhawk@0.10.20.11.1(transitive)

• - Removedhoek@0.6.20.7.6(transitive)

• - Removediron@0.2.4(transitive)

• - Removedjoi@0.2.6(transitive)

• - Removedjson-stringify-safe@3.0.0(transitive)

• - Removedlru-cache@2.2.4(transitive)

• - Removednode-uuid@1.4.8(transitive)

• - Removedoauth-sign@0.2.0(transitive)

• - Removedoptimist@0.3.7(transitive)

• - Removedoz@0.1.2(transitive)

• - Removedqs@0.5.6(transitive)

• - Removedrequest@2.16.6(transitive)

• - Removedshot@0.1.3(transitive)

• - Removedsntp@0.1.4(transitive)

• - Removedtunnel-agent@0.2.0(transitive)

• Updatedboom@0.4.x

• Updatedhoek@0.8.x