Merge pull request #21 from NickGlenn/master

Lots of bug fixes, no API changes

Author: brunnerjosh

.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}

.npmignore

@@ -1 +0,0 @@
-src/

.travis.yml

@@ -0,0 +1,6 @@
+language: node_js
+node_js:
+  - "4.1"
+  - "4.0"
+  - "0.12"
+  - "iojs"

README.md

@@ -1,24 +1,9 @@
+[![Build Status](https://travis-ci.org/HelpfulHuman/Restfool.svg)](https://travis-ci.org/HelpfulHuman/Restfool)
+
 RESTfool is largely just a set of higher order functions that produce middleware for mocking responses with assertions and fixture data.  These middleware also report request and response information to a RESTfool Dashboard instance for debugging and analysis of each made call.
 
 ## Getting Started
 
-### CLI
-
-Install via npm:
-
-```
-npm install -g restfool
-```
-
-Run the `setup` command in the folder you want to create a project in:
-
-```
-mkdir restfool; cd restfool
-restfool setup
-```
-
-### Manual
-
 Install via npm:
 
 ```
@@ -113,20 +98,30 @@ server.get('/posts', postFixture.send(10, { published: true }))
 
 You know what's even cooler than sending completely dynamic fixture data?  Mocking data persistence complete with scaffolded routes!
 
-_Note: RESTfool simply stores any data in memory that will be lost once closing the server._
+_Note: RESTfool simply stores the data in memory.  This means that the data will be lost once the server is closed._
 
 ```javascript
 var uuid = require('uuid')
 
 var posts = restfool.resource({
   // define the endpoint/resource name
-  type: 'posts',
+  name: 'posts',
 
   // provide an initial set seed data
   seed: postFixture.make(10),
 
-  // define the primary key ("id" by default)
-  primaryKey: 'id',
+  // format the resource data on output
+  format: function (data) {
+    var req = this
+    var output = { data: data }
+
+    if (Array.isArray(data)) {
+      data.page = req.query.page || 1
+      data.results = data.length
+    }
+
+    return data;
+  }
 
   // run this function when a post is made
   onCreate: function (post) {

dev-server.js

@@ -1,35 +1,36 @@
-require('babel/register');
+require('babel-core/register');
 var restfool = require('./src/index');
+var faker = require('faker');
 
+// create a new RESTfool server (along with the UI server)
 var app = restfool.create({
   notify: true
 });
 
-app.get('/', function (req, res, next) {
-  res.send('OK');
-});
-
-var faker = require('faker')
-
-
 // posts fixture factory
-var postFixture = restfool.fixture({
+var postsFixture = restfool.fixture({
   title: faker.lorem.sentence,
   body: faker.lorem.paragraphs
-})
+});
 
-var shortid = require('shortid')
-var postsResource = restfool.resource({
+// posts resource
+app.use(restfool.resource({
   name: 'posts',
-  seed: postFixture.make(10, {published:true}),
-  onCreate: function (data) {
-    data.id = shortid()
-    return data
-  }
-})
+  seed: postsFixture.make(10, { published: true })
+}));
+
+// users fixture factory
+var usersFixture = restfool.fixture({
+  first_name: faker.name.firstName,
+  last_name: faker.name.lastName,
+  email: faker.internet.emal
+});
 
-app.use(postsResource)
+// users resource
+app.use(restfool.resource({
+  name: 'users',
+  seed: usersFixture.make(4)
+}));
 
-app.listen(5602, function () {
-  console.log('listening on port', 5602);
-});
+// start listening
+app.listen(5602);

dist/factories/bridge.js

@@ -1,10 +1,9 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', {
+Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+exports.factory = factory;
 
 var _lodash = require('lodash');
 
@@ -22,17 +21,18 @@ var _moment = require('moment');
 
 var _moment2 = _interopRequireDefault(_moment);
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 /**
  * Creates and returns a new bridge object that can be used to
  * tie RESTfool middleware together.
  *
  * @param  {Object} options
  * @return {Object}
  */
-
-exports['default'] = function (options) {
+function factory(options) {
   var _records = [];
-  var _events = new _events3['default'].EventEmitter();
+  var _events = new _events3.default.EventEmitter();
 
   return {
     on: _events.on.bind(_events),
@@ -42,7 +42,6 @@ exports['default'] = function (options) {
     all: function all() {
       return _records;
     },
-
     find: function find(id) {
       for (var i = 0; i < _records.length; i++) {
         if (_records[i].id === id) {
@@ -52,20 +51,18 @@ exports['default'] = function (options) {
 
       return false;
     },
-
     clear: function clear() {
       _records = [];
     },
-
     record: function record(req) {
-      var id = _shortid2['default'].generate();
+      var id = _shortid2.default.generate();
       var record = {
         id: id,
         status: 'open',
         method: req.method,
         path: req.path,
         request: req,
-        started_at: (0, _moment2['default'])(),
+        started_at: (0, _moment2.default)(),
         ended_at: null,
         meta: [],
         tags: []
@@ -76,13 +73,10 @@ exports['default'] = function (options) {
 
       return record;
     },
-
     close: function close(record) {
       record.status = 'closed';
-      record.ended_at = (0, _moment2['default'])();
+      record.ended_at = (0, _moment2.default)();
       _events.emit('request-close', record);
     }
   };
-};
-
-module.exports = exports['default'];
+}

dist/factories/fixture.js

@@ -1,18 +1,39 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', {
+Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+exports.runNestedFunctions = runNestedFunctions;
+exports.makeRow = makeRow;
+exports.factory = factory;
 
 var _lodash = require('lodash');
 
 var _lodash2 = _interopRequireDefault(_lodash);
 
-var _utils = require('../utils');
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _typeof(obj) { return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj; }
 
-var _utils2 = _interopRequireDefault(_utils);
+/**
+ * Runs over an object and replaces any functional values
+ * with their results.
+ *
+ * @param  {Object} obj
+ * @return {Object}
+ */
+function runNestedFunctions(obj) {
+  return _lodash2.default.mapValues(obj, function (val) {
+    switch (typeof val === 'undefined' ? 'undefined' : _typeof(val)) {
+      case 'function':
+        return val();
+      case 'object':
+        return runNestedFunctions(val);
+      default:
+        return val;
+    }
+  });
+}
 
 /**
  * Processes a single row and returns the value.
@@ -26,7 +47,7 @@ function makeRow(schema, modifier) {
     return modifier(schema);
   }
 
-  return _lodash2['default'].merge(schema, modifier);
+  return _lodash2.default.merge(schema, modifier);
 }
 
 /**
@@ -35,10 +56,9 @@ function makeRow(schema, modifier) {
  * @param  {Object} schema
  * @return {Object}
  */
-
-exports['default'] = function (schema) {
-  if (typeof schema === 'object') {
-    schema = _utils2['default'].runNestedFunctions.bind(null, schema);
+function factory(schema) {
+  if (!Array.isArray(schema) && (typeof schema === 'undefined' ? 'undefined' : _typeof(schema)) === 'object') {
+    schema = runNestedFunctions.bind(null, schema);
   }
 
   if (typeof schema !== 'function') {
@@ -54,14 +74,15 @@ exports['default'] = function (schema) {
      * @param  {Object} modifier
      * @return {Array}
      */
+
     make: function make(count, modifier) {
-      var _arr = [];
+      var records = [];
       for (var i = 0; i < count; i++) {
         var record = makeRow(schema(), modifier);
-        if (record) _arr.push(record);
+        if (record) records.push(record);
       }
 
-      return _arr;
+      return records;
     },
 
     /**
@@ -73,8 +94,5 @@ exports['default'] = function (schema) {
     makeOne: function makeOne(modifier) {
       return makeRow(schema(), modifier);
     }
-
   };
-};
-
-module.exports = exports['default'];
+}