Updated version

.eslintrc

@@ -8,7 +8,6 @@
         "generators": true
     },
     "env": {
-        "browser": true,
         "node": true,
         "es6": true
     },
@@ -26,7 +25,8 @@
         "object-shorthand": [0, "never"],
         "wrap-iife": [2, "any"],
         "no-loop-func": 0,
-        "no-console": 0
+        "no-console": 0,
+        "padded-blocks": 0
     },
     "globals" :{
         "require": true

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 npm-debug.log
 local-mocks/
+.idea/

README.md

@@ -19,7 +19,7 @@ Minimum usage: `easy-mocker -c config.json -d folder/`
 | `-c`*  | `path/to/config.json` | Path to api definition |
 | `-d`*  | `path/to/mock-directory` | Path to mock folder |
 | `-p`   | `port` | Webserver port |
-| `-u`   | `null` | Return different file for different user (to be implemented) |
+| `-u`   | `null` | Return different models for different user |
 
  _Options marked with * are mandatory.mv m_
 
@@ -28,20 +28,25 @@ Minimum usage: `easy-mocker -c config.json -d folder/`
 This is a sample structure for a configuration file:
 
 ```
-[
-  {
-    "url": "users",
-    "base": "api/",
-    "methods": ["GET"],
-    "param": "id"
+{
+  "auth": {
+    "headerField": "x-randomField" //optional (default to `x-userid`)
   },
-  {
-    "url": "posts",
-    "base": "api/",
-    "methods": ["GET", "POST"],
-    "param": "id"
-  }
-]
+  "endpoints": [
+    {
+      "url": "users",
+      "base": "api/",
+      "methods": ["GET"],
+      "param": "id"
+    },
+    {
+      "url": "posts",
+      "base": "api/",
+      "methods": ["GET", "POST"],
+      "param": "id"
+    }
+  ]
+}
 ```
 
 That will generate the following endpoints:
@@ -59,13 +64,3 @@ You can provide data to be loaded as a starting point for your development serve
 
 Examples for this files can be found in `spec/mocks`, anyway they are plain `JSON` arrays of objects.
 
-## TODO
-
-- Create and endpont (or command to restore the original data)
-- Add a delay option to slow down responses
-- How to handle similar endpoints (`api/user/devices`, `api/other/devices`)? Now thery'll look for the same definition file `devices.json`. Probably adding an optional `filename` to the `config` should work.
-- Handle users
-- Add config options to allow specify a header different form `x-userid` to identify user
-- If `-u` is set create `login` and `logout` endpoint
-
-

package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-mocker",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "keywords": [
     "server",
     "cli",
@@ -20,12 +20,12 @@
   },
   "author": "Matteo Scandolo",
   "homepage": "https://github.com/teone/easy-mocker",
-  "bugs": { 
-    "url" : "https://github.com/teone/easy-mocker/issues"
+  "bugs": {
+    "url": "https://github.com/teone/easy-mocker/issues"
   },
-  "repository" :{
-    "type" : "git",
-    "url" : "https://github.com/teone/easy-mocker"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/teone/easy-mocker"
   },
   "license": "MIT",
   "dependencies": {
@@ -41,6 +41,7 @@
     "eslint": "1.10.3",
     "eslint-config-airbnb": "^5.0.1",
     "mocha": "^2.4.5",
+    "mockery": "^1.4.0",
     "nodemon": "^1.8.1",
     "supertest": "^1.1.0"
   }

spec/api.test.js

@@ -2,20 +2,41 @@
   'use strict';
 
   const request = require('supertest');
-  const app = require('../src/server');
   const chai = require('chai');
   const expect = chai.expect;
+  const mockery = require('mockery');
+  const path = require('path');
   let memory;
+  let app;
 
   describe('From the base config', () => {
     beforeEach((done) => {
+      mockery.enable({
+        warnOnReplace: false,
+        warnOnUnregistered: false,
+        useCleanCache: true,
+      });
+      mockery.resetCache();
+      const configMock = {
+        user: false,
+        definitionFile: path.join(__dirname, './config/base.json'),
+        mockDir: path.join(__dirname, './mocks/base/'),
+      };
+      mockery.registerMock('./lib/config', configMock);
+      mockery.registerMock('./config', configMock);
+      app = require('../src/server');
       memory = require('../src/lib/in_memory');
       memory.setup()
       .then(() => {
         done();
       });
     });
 
+    afterEach(() => {
+      mockery.deregisterMock('./config');
+      mockery.disable();
+    });
+
     describe('when quering items', () => {
       it('should return an array', (done) => {
         request(app)

spec/config.test.js

@@ -31,7 +31,7 @@
 
     describe('given a mocks folder', () => {
       it('should fill the in-memory storage with base data', (done) => {
-        memory.loadBaseData(path.join(__dirname, './mocks/'))
+        memory.loadBaseData(path.join(__dirname, './mocks/base/'))
         .then(() => {
           expect(memory.memoryStorage).to.have.property('users').with.length(2);
           expect(memory.memoryStorage).to.have.property('posts').with.length(0);

spec/config/base.json

@@ -1,14 +1,16 @@
-[
-  {
-    "url": "users",
-    "base": "api/",
-    "methods": ["GET", "POST", "DELETE"],
-    "param": "id"
-  },
-  {
-    "url": "posts",
-    "base": "api/",
-    "methods": ["GET", "POST"],
-    "param": "id"
-  }
-]
+{
+  "endpoints": [
+    {
+      "url": "users",
+      "base": "api/",
+      "methods": ["GET", "POST", "DELETE"],
+      "param": "id"
+    },
+    {
+      "url": "posts",
+      "base": "api/",
+      "methods": ["GET", "POST"],
+      "param": "id"
+    }
+  ]
+}

spec/config/users_enabled.json

@@ -0,0 +1,13 @@
+{
+  "auth": {
+    "headerField": "x-randomField"
+  },
+  "endpoints": [
+    {
+      "url": "posts",
+      "base": "api/",
+      "methods": ["GET", "POST", "DELETE"],
+      "param": "id"
+    }
+  ]
+}

spec/mocks/users_enabled/posts.json

@@ -0,0 +1,22 @@
+[
+  {
+    "id": 1,
+    "name": "Jhon Snow",
+    "user": 1
+  },
+  {
+    "id": 2,
+    "name": "Igritte",
+    "user": 1
+  },
+  {
+    "id": 3,
+    "name": "Tyrion Lannister",
+    "user": 2
+  },
+  {
+    "id": 4,
+    "name": "Brienne of Tarth",
+    "user": 2
+  }
+]