Upating to lodash for merge

README.md

@@ -3,7 +3,7 @@
 Node.js logging made simple! Online access to logs and more... 
 
 ```bash
-npm install scribe@3.0.0-alpha.8
+npm install scribe@3.0.0-alpha.9
 ```
 
 ### Features

dist/libs/config-extend.js

@@ -0,0 +1,22 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = extend;
+
+var _lodash = require('lodash');
+
+var _lodash2 = _interopRequireDefault(_lodash);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function extend() {
+  for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+    args[_key] = arguments[_key];
+  }
+
+  return _lodash2.default.mergeWith.apply(_lodash2.default, args.concat([function (obj, src) {
+    return Array.isArray(src) ? src : undefined;
+  }]));
+}

dist/middleware/ExpressLogger.js

@@ -1,85 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _getIterator2 = require('babel-runtime/core-js/get-iterator');
-
-var _getIterator3 = _interopRequireDefault(_getIterator2);
-
-var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
-
-var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
-
-var _createClass2 = require('babel-runtime/helpers/createClass');
-
-var _createClass3 = _interopRequireDefault(_createClass2);
-
-var _onFinished = require('on-finished');
-
-var _onFinished2 = _interopRequireDefault(_onFinished);
-
-var _time = require('../libs/time');
-
-var _time2 = _interopRequireDefault(_time);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var ExpressLogger = function () {
-  function ExpressLogger(scribe) {
-    (0, _classCallCheck3.default)(this, ExpressLogger);
-
-    this.options = scribe.module('middleware/ExpressLogger').options;
-    this.scribe = scribe;
-  }
-
-  (0, _createClass3.default)(ExpressLogger, [{
-    key: 'getMiddleware',
-    value: function getMiddleware() {
-      var scribe = this.scribe;
-      var options = this.options;
-
-
-      return function (req, res, next) {
-        var start = (0, _time2.default)();
-        (0, _onFinished2.default)(res, function () {
-          var originalUrl = req.originalUrl;
-          var _iteratorNormalCompletion = true;
-          var _didIteratorError = false;
-          var _iteratorError = undefined;
-
-          try {
-            for (var _iterator = (0, _getIterator3.default)(options.ignore), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-              var k = _step.value;
-
-              if (new RegExp(k).test(originalUrl)) {
-                return;
-              }
-            }
-          } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-          } finally {
-            try {
-              if (!_iteratorNormalCompletion && _iterator.return) {
-                _iterator.return();
-              }
-            } finally {
-              if (_didIteratorError) {
-                throw _iteratorError;
-              }
-            }
-          }
-
-          scribe[options.expose]({ req: req, res: res, duration: (0, _time2.default)() - start });
-        });
-
-        next();
-      };
-    }
-  }]);
-  return ExpressLogger;
-}();
-
-exports.default = ExpressLogger;

dist/router/Viewer.js

@@ -64,9 +64,9 @@ var _url = require('url');
 
 var _MongoDB = require('../writer/MongoDB');
 
-var _extend = require('extend');
+var _configExtend = require('../libs/config-extend');
 
-var _extend2 = _interopRequireDefault(_extend);
+var _configExtend2 = _interopRequireDefault(_configExtend);
 
 var _fs = require('fs');
 
@@ -229,7 +229,7 @@ var Viewer = function () {
       // save
       _fs2.default.writeFileSync(__dirname + '/../../native/package.json', (0, _stringify2.default)(_package2.default, null, 4), { encoding: 'utf8' });
 
-      var nw = new _nwBuilder2.default((0, _extend2.default)(true, {
+      var nw = new _nwBuilder2.default((0, _configExtend2.default)({
         platforms: ['win', 'osx', 'linux'],
         buildDir: __dirname + '/../../public/native',
         version: '0.12.3',

dist/scribe.js

@@ -13,6 +13,10 @@ var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
 
 var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
 
+var _stringify = require('babel-runtime/core-js/json/stringify');
+
+var _stringify2 = _interopRequireDefault(_stringify);
+
 var _typeof2 = require('babel-runtime/helpers/typeof');
 
 var _typeof3 = _interopRequireDefault(_typeof2);
@@ -36,10 +40,6 @@ var _rc = require('rc');
 
 var _rc2 = _interopRequireDefault(_rc);
 
-var _extend = require('extend');
-
-var _extend2 = _interopRequireDefault(_extend);
-
 var _middleware = require('./middleware');
 
 var Middleware = _interopRequireWildcard(_middleware);
@@ -60,6 +60,14 @@ var _writer = require('./writer');
 
 var Writer = _interopRequireWildcard(_writer);
 
+var _scriberc = require('../.scriberc.json');
+
+var _scriberc2 = _interopRequireDefault(_scriberc);
+
+var _configExtend = require('./libs/config-extend');
+
+var _configExtend2 = _interopRequireDefault(_configExtend);
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -106,10 +114,12 @@ function resolvePipeline(scribe, pipeline) {
   return resolved;
 }
 
-var defaultOpts = _fs2.default.readFileSync(__dirname + '/../.scriberc', 'utf8');
-
 function create(opts) {
-  opts = (0, _extend2.default)(true, (0, _rc2.default)('scribe', JSON.parse(defaultOpts)), opts);
+  opts = (0, _configExtend2.default)(_scriberc2.default, (0, _rc2.default)('scribe', {}), opts);
+
+  if (opts.debug) {
+    process.stdout.write((0, _stringify2.default)(opts, null, 2) + '\n');
+  }
 
   // create default console
   var console = new Reader.BasicConsole(opts);

examples/cluster-server.js

@@ -26,7 +26,7 @@ if (cluster.isMaster) {
         "socketPorts": [socketPort, socketPort + 1, socketPort + 2, socketPort + 3]
       }
     },
-    "debug": false
+    "debug": true
   };
 
   const console = Scribe.create(options);

examples/simple-server-stream-only.js

@@ -45,7 +45,7 @@ const options = {
       ]
     }
   },
-  "debug": false
+  "debug": true
 };
 
 const console = Scribe.create(options);

examples/simple-server.js

@@ -18,7 +18,7 @@ const options = {
       ]
     }
   },
-  "debug": false
+  "debug": true
 };
 
 const console = Scribe.create(options);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "scribe-js",
   "description": "Comprehensive logging framework with online interface",
-  "version": "3.0.0-alpha.8",
+  "version": "3.0.0-alpha.9",
   "homepage": "https://github.com/bluejamesbond/Scribe.js",
   "keywords": [],
   "scripts": {
@@ -54,11 +54,11 @@
     "callsite": "1.0.0",
     "chalk": "1.1.1",
     "express": "4.0.0",
-    "extend": "3.0.0",
     "format-error": "1.0.0",
     "jade": "1.11.0",
     "json-fn": "0.60.0",
     "keymirror": "0.1.1",
+    "lodash": "4.10.0",
     "minimongo": "3.8.0",
     "moment": "2.11.2",
     "mongoose": "4.4.3",

src/libs/config-extend.js

@@ -0,0 +1,5 @@
+import _ from 'lodash';
+
+export default function extend(...args) {
+  return _.mergeWith(...args, (obj, src) => Array.isArray(src) ? src : undefined)
+}

src/router/viewer.js

@@ -8,7 +8,7 @@ import NwBuilder from 'nw-builder';
 import nativePackage from '../../native/package.json';
 import {format} from 'url';
 import {EntrySchema} from '../writer/MongoDB';
-import extend from 'extend';
+import extend from '../libs/config-extend';
 import fs from 'fs';
 
 function getObject(d, def) {
@@ -167,12 +167,12 @@ export default class Viewer {
     fs.writeFileSync(`${__dirname}/../../native/package.json`,
                      JSON.stringify(nativePackage, null, 4), {encoding: 'utf8'});
 
-    const nw = new NwBuilder(extend(true, {
-      platforms: ['win', 'osx', 'linux'],
-      buildDir: `${__dirname}/../../public/native`,
-      version: '0.12.3',
-      zip: true
-    }, nativeOptions, {files: `${__dirname}/../../native/**/**`}));
+    const nw = new NwBuilder(extend({
+                                      platforms: ['win', 'osx', 'linux'],
+                                      buildDir: `${__dirname}/../../public/native`,
+                                      version: '0.12.3',
+                                      zip: true
+                                    }, nativeOptions, {files: `${__dirname}/../../native/**/**`}));
 
     if (nativeOptions.debug) {
       nw.on('log', d => console.log(d));

src/scribe.js

@@ -1,7 +1,6 @@
 import fs from 'fs';
 import path from 'path';
 import rc from 'rc'
-import extend from 'extend';
 
 import * as Middleware from './middleware';
 import * as Reader from './reader';
@@ -9,6 +8,9 @@ import * as Router from './router';
 import * as Transform from './transform';
 import * as Writer from './writer';
 
+import defaultOpts from '../.scriberc.json';
+import extend from './libs/config-extend';
+
 export {Middleware};
 export {Reader};
 export {Router};
@@ -31,10 +33,12 @@ export function resolvePipeline(scribe, pipeline) {
   return resolved;
 }
 
-const defaultOpts = fs.readFileSync(`${__dirname}/../.scriberc`, 'utf8');
-
 export function create(opts) {
-  opts = extend(true, rc('scribe', JSON.parse(defaultOpts)), opts);
+  opts = extend(defaultOpts, rc('scribe', {}), opts);
+
+  if (opts.debug) {
+    process.stdout.write(JSON.stringify(opts, null, 2) + '\n');
+  }
 
   // create default console
   const console = new Reader.BasicConsole(opts);