From c22663e37b201641eb7ff1f77a0e89013dc88989 Mon Sep 17 00:00:00 2001 From: "dr.dimitru" Date: Fri, 20 Oct 2017 19:49:17 +0300 Subject: [PATCH] v2.0.2 - Compatibility with `meteor@1.5.2.2` - Dependencies update - Remove carriage return from base formatting (`\r\n` --> `\n`) - Better tests --- .versions | 47 ++++++++++++++++++-------------------------- loggermongo-tests.js | 34 +++++++++++--------------------- package.js | 6 +++--- 3 files changed, 34 insertions(+), 53 deletions(-) diff --git a/.versions b/.versions index 71bf209..7b217c4 100644 --- a/.versions +++ b/.versions @@ -1,52 +1,43 @@ -allow-deny@1.0.6 -babel-compiler@6.19.4 +allow-deny@1.0.9 +babel-compiler@6.20.0 babel-runtime@1.0.1 base64@1.0.10 binary-heap@1.0.10 -blaze@2.3.2 -blaze-tools@1.0.10 -boilerplate-generator@1.1.1 +boilerplate-generator@1.2.0 callback-hook@1.0.10 check@1.2.5 -ddp@1.3.0 -ddp-client@2.0.0 +ddp@1.3.1 +ddp-client@2.1.3 ddp-common@1.2.9 -ddp-server@2.0.0 -deps@1.0.12 +ddp-server@2.0.2 diff-sequence@1.0.7 -ecmascript@0.8.1 +ecmascript@0.8.3 ecmascript-runtime@0.4.1 ecmascript-runtime-client@0.4.3 ecmascript-runtime-server@0.4.1 -ejson@1.0.13 +ejson@1.0.14 geojson-utils@1.0.10 -html-tools@1.0.11 -htmljs@1.0.11 id-map@1.0.9 -jquery@1.11.10 -local-test:ostrio:loggermongo@2.0.1 +local-test:ostrio:loggermongo@2.0.2 logging@1.1.17 -meteor@1.7.0 -minimongo@1.2.1 -modules@0.9.2 +meteor@1.7.2 +minimongo@1.3.2 +modules@0.10.0 modules-runtime@0.8.0 -mongo@1.1.19 +mongo@1.2.2 +mongo-dev-server@1.0.1 mongo-id@1.0.6 -npm-mongo@2.2.24 -observe-sequence@1.0.16 +npm-mongo@2.2.30 ordered-dict@1.0.9 -ostrio:logger@2.0.3 -ostrio:loggermongo@2.0.1 -promise@0.8.9 +ostrio:logger@2.0.4 +ostrio:loggermongo@2.0.2 +promise@0.9.0 random@1.0.10 reactive-var@1.0.11 retry@1.0.9 routepolicy@1.0.12 -spacebars@1.0.15 -spacebars-compiler@1.1.2 tinytest@1.0.12 tracker@1.1.3 -ui@1.0.13 underscore@1.0.10 -webapp@1.3.17 +webapp@1.3.19 webapp-hashing@1.0.9 diff --git a/loggermongo-tests.js b/loggermongo-tests.js index 6facf6d..02322b3 100644 --- a/loggermongo-tests.js +++ b/loggermongo-tests.js @@ -10,7 +10,7 @@ if (Meteor.isServer) { mongoLogger.collection.remove({}); } -Tinytest.addAsync('LoggerMessage Instance', (test, done) => { +Tinytest.add('LoggerMessage Instance', (test) => { test.instanceOf(log.info('This is message "info"', {data: 'Sample data "info"'}, 'userId "info"'), LoggerMessage); test.instanceOf(log.debug('This is message "debug"', {data: 'Sample data "debug"'}, 'userId "debug"'), LoggerMessage); test.instanceOf(log.error('This is message "error"', {data: 'Sample data "error"'}, 'userId "error"'), LoggerMessage); @@ -18,34 +18,28 @@ Tinytest.addAsync('LoggerMessage Instance', (test, done) => { test.instanceOf(log.warn('This is message "warn"', {data: 'Sample data "warn"'}, 'userId "warn"'), LoggerMessage); test.instanceOf(log.trace('This is message "trace"', {data: 'Sample data "trace"'}, 'userId "trace"'), LoggerMessage); test.instanceOf(log._('This is message "_"', {data: 'Sample data "_"'}, 'userId "_"'), LoggerMessage); - - done(); }); -Tinytest.addAsync('LoggerMessage#toString', (test, done) => { - test.equal(log.info('This is message "info"', {data: 'Sample data "info"'}, 'userId "info"').toString(), '[This is message "info"] \r\nLevel: INFO; \r\nDetails: {"data":"Sample data \\"info\\""}; \r\nUserId: userId "info";'); - test.equal(log.debug('This is message "debug"', {data: 'Sample data "debug"'}, 'userId "debug"').toString(), '[This is message "debug"] \r\nLevel: DEBUG; \r\nDetails: {"data":"Sample data \\"debug\\""}; \r\nUserId: userId "debug";'); - test.equal(log.error('This is message "error"', {data: 'Sample data "error"'}, 'userId "error"').toString(), '[This is message "error"] \r\nLevel: ERROR; \r\nDetails: {"data":"Sample data \\"error\\""}; \r\nUserId: userId "error";'); - test.equal(log.fatal('This is message "fatal"', {data: 'Sample data "fatal"'}, 'userId "fatal"').toString(), '[This is message "fatal"] \r\nLevel: FATAL; \r\nDetails: {"data":"Sample data \\"fatal\\""}; \r\nUserId: userId "fatal";'); - test.equal(log.warn('This is message "warn"', {data: 'Sample data "warn"'}, 'userId "warn"').toString(), '[This is message "warn"] \r\nLevel: WARN; \r\nDetails: {"data":"Sample data \\"warn\\""}; \r\nUserId: userId "warn";'); - test.equal(log._('This is message "_"', {data: 'Sample data "_"'}, 'userId "_"').toString(), '[This is message "_"] \r\nLevel: LOG; \r\nDetails: {"data":"Sample data \\"_\\""}; \r\nUserId: userId "_";'); - - done(); +Tinytest.add('LoggerMessage#toString', (test) => { + test.equal(log.info('This is message "info"', {data: 'Sample data "info"'}, 'userId "info"').toString(), '[This is message "info"] \nLevel: INFO; \nDetails: {"data":"Sample data \\"info\\""}; \nUserId: userId "info";'); + test.equal(log.debug('This is message "debug"', {data: 'Sample data "debug"'}, 'userId "debug"').toString(), '[This is message "debug"] \nLevel: DEBUG; \nDetails: {"data":"Sample data \\"debug\\""}; \nUserId: userId "debug";'); + test.equal(log.error('This is message "error"', {data: 'Sample data "error"'}, 'userId "error"').toString(), '[This is message "error"] \nLevel: ERROR; \nDetails: {"data":"Sample data \\"error\\""}; \nUserId: userId "error";'); + test.equal(log.fatal('This is message "fatal"', {data: 'Sample data "fatal"'}, 'userId "fatal"').toString(), '[This is message "fatal"] \nLevel: FATAL; \nDetails: {"data":"Sample data \\"fatal\\""}; \nUserId: userId "fatal";'); + test.equal(log.warn('This is message "warn"', {data: 'Sample data "warn"'}, 'userId "warn"').toString(), '[This is message "warn"] \nLevel: WARN; \nDetails: {"data":"Sample data \\"warn\\""}; \nUserId: userId "warn";'); + test.equal(log._('This is message "_"', {data: 'Sample data "_"'}, 'userId "_"').toString(), '[This is message "_"] \nLevel: LOG; \nDetails: {"data":"Sample data \\"_\\""}; \nUserId: userId "_";'); }); -Tinytest.addAsync('Throw', (test, done) => { +Tinytest.add('Throw', (test) => { try { throw log.fatal('This is message "fatal"', {data: 'Sample data "fatal"'}, 'userId "fatal"'); } catch (e) { test.instanceOf(e, LoggerMessage); test.equal(e.level, 'FATAL'); - test.equal(e.toString(), '[This is message "fatal"] \r\nLevel: FATAL; \r\nDetails: {"data":"Sample data \\"fatal\\""}; \r\nUserId: userId "fatal";'); + test.equal(e.toString(), '[This is message "fatal"] \nLevel: FATAL; \nDetails: {"data":"Sample data \\"fatal\\""}; \nUserId: userId "fatal";'); } - - done(); }); -Tinytest.addAsync('Log a Number', (test, done) => { +Tinytest.add('Log a Number', (test) => { test.instanceOf(log.info(10, {data: 10}, 10), LoggerMessage); test.instanceOf(log.debug(20, {data: 20}, 20), LoggerMessage); test.instanceOf(log.error(30, {data: 30}, 30), LoggerMessage); @@ -53,19 +47,15 @@ Tinytest.addAsync('Log a Number', (test, done) => { test.instanceOf(log.warn(50, {data: 50}, 50), LoggerMessage); test.instanceOf(log.trace(60, {data: 60}, 60), LoggerMessage); test.instanceOf(log._(70, {data: 70}, 70), LoggerMessage); - - done(); }); -Tinytest.addAsync('Trace', (test, done) => { +Tinytest.add('Trace', (test) => { if (Meteor.isServer) { test.isTrue(_.has(log.trace(602, {data: 602}, 602).details, 'stackTrace')); test.isTrue(_.has(log.trace(602, {data: 602}, 602).data, 'stackTrace')); } else { test.isTrue(true); } - - done(); }); Tinytest.addAsync('Check written data, without {data} [SERVER]', (test, done) => { diff --git a/package.js b/package.js index e970e8b..d6411a4 100755 --- a/package.js +++ b/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ostrio:loggermongo', - version: '2.0.1', + version: '2.0.2', summary: 'Logging: Store application\'s logs messages in MongoDB (Server & Client support)', git: 'https://github.com/VeliovGroup/Meteor-logger-mongo', documentation: 'README.md' @@ -9,12 +9,12 @@ Package.describe({ Package.onUse(function(api) { api.versionsFrom('1.4'); api.use('mongo', 'server'); - api.use(['mongo', 'ecmascript', 'check', 'underscore', 'ostrio:logger@2.0.3'], ['client', 'server']); + api.use(['mongo', 'ecmascript', 'check', 'underscore', 'ostrio:logger@2.0.4'], ['client', 'server']); api.mainModule('loggermongo.js', ['client', 'server']); }); Package.onTest(function(api) { api.use('tinytest'); - api.use(['ecmascript', 'underscore', 'ostrio:logger@2.0.3', 'ostrio:loggermongo@2.0.1']); + api.use(['ecmascript', 'underscore', 'ostrio:logger@2.0.4', 'ostrio:loggermongo@2.0.2']); api.addFiles('loggermongo-tests.js'); });