Add errors & use request.arch object

Author: Tiago Azevedo

index.js

@@ -1,7 +1,8 @@
 module.exports = function(req, res, next) {
-  req.appState = req.appState || {};
+  if (typeof req.arch === 'undefined') throw new Error('request.arch not defined. Use arch default middlewares first.');
+  if (typeof req.arch.appState === 'undefined') throw new Error('request.arch.appState not defined. Use arch default middlewares first.');
 
-  req.appState.requestInfo = {
+  req.arch.appState.requestInfo = {
     ip: req.ip
   };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "arch-request",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Express middleware for arch-server to update application state with request information",
   "main": "index.js",
   "scripts": {

spec/index-spec.js

@@ -3,24 +3,42 @@ var middleware = require('../index');
 describe("request middleware", function() {
   it("puts the ip address in appState", function(done) {
     var request = {
-      appState: {},
+      arch: {
+        appState: {}
+      },
       ip: '127.0.0.1'
     };
 
     middleware(request, null, function() {
-      expect(request.appState.requestInfo.ip).toBe(request.ip);
+      expect(request.arch.appState.requestInfo.ip).toBe(request.ip);
       done();
     });
   });
 
-  it("creates an appState object when none provided", function(done) {
+  it("throws when arch not defined", function(done) {
     var request = {
       ip: '127.0.0.1'
     };
 
-    middleware(request, null, function() {
-      expect(request.appState).toBeDefined();
+    try {
+      middleware(request, null, fail);
+    } catch (e) {
+      expect(e.message).toEqual('request.arch not defined. Use arch default middlewares first.')
+      done();
+    }
+  });
+
+  it("throws when arch.appState not defined", function(done) {
+    var request = {
+      arch: {},
+      ip: '127.0.0.1'
+    };
+
+    try {
+      middleware(request, null, fail);
+    } catch (e) {
+      expect(e.message).toEqual('request.arch.appState not defined. Use arch default middlewares first.')
       done();
-    })
+    }
   });
 });