cher-db - npm Package Compare versions

Comparing version 0.1.1 to 0.2.0

modelManager.js

@@ -5,7 +5,8 @@
 const events        = require( 'events' );
-const log           = require( './log' );
+const tools         = require( 'cher-tools' );
 const utils         = require( 'cher-tools' ).utils;
+const log           = tools.log();
+let   models        = {};
+let   EventEmitter  = events.EventEmitter;
 let   instance;
-let   models = {};
-let   EventEmitter    = events.EventEmitter;
 
@@ -32,4 +33,3 @@ const proto = {
   }
-  console.log('returning instance')
   return instance;
 };

models/dataModel/index.js

 
 'use strict';
 
+const tools         = require( 'cher-tools' );
 const P             = require( 'bluebird' );
-const log           = require( '../../log' );
 const modelManager  = require( '../../modelManager' )();
+const log           = tools.log();
+
 module.exports = ( bookshelf, knex, tableName ) => {
@@ -8,0 +10,0 @@

models/dataModel/modelMethods.js

@@ -5,4 +5,5 @@
 const P       = require( 'bluebird' );
-const log     = require( '../../log' );
+const tools   = require( 'cher-tools' );
 const queries = require( '../queries' );
+const log     = tools.log();
 
@@ -9,0 +10,0 @@ module.exports = ( knex ) => {

models/dataModel/staticMethods.js

 
 'use strict';
 
-const log = require( '../../log' );
-const P   = require( 'bluebird' );
-const async = require( 'async' );
+const tools   = require( 'cher-tools' );
+const P       = require( 'bluebird' );
+const async   = require( 'async' );
 const queries = require( '../queries' );
-const utils = require( './utils' );
+const utils   = require( './utils' );
+const log     = tools.log();
 
@@ -139,4 +140,5 @@ module.exports = ( knex ) => {
       return ( ( opts ) => {
+        const resolver = P.pending();
         const approved = utils.parseModeration( opts.moderation );
-        return queries
+        queries
           .fetchItems( knex )
@@ -154,3 +156,9 @@ .withTags( opts.tags )
           .then( _methods.attachTags )
-          .then( _methods.attachModeration );
+          .then( _methods.attachModeration )
+          .then( ( resultSet ) => resolver.resolve( resultSet ) )
+          .catch( ( err ) => {
+            log.error( err );
+            resolver.reject( `An error occured while fetching items` );
+          });
+        return resolver.promise;
       })( opts );
@@ -160,3 +168,3 @@ }
   };
-  return _methods;
+  return Object.create( _methods );
 };

models/queries/addModeration.js

@@ -5,4 +5,5 @@
 
-const log   = require( '../../log' );
+const tools = require( 'cher-tools' );
 const utils = require( '../dataModel/utils' );
+const log   = tools.log();
 
@@ -9,0 +10,0 @@ module.exports = ( knex ) => {

models/queries/addOrCreateTag.js

@@ -5,4 +5,5 @@
 
-const log           = require( '../../log' );
-const P             = require( 'bluebird' );
+const P     = require( 'bluebird' );
+const tools = require( 'cher-tools' );
+const log   = tools.log();
 
@@ -9,0 +10,0 @@ module.exports = ( knex ) => {

models/queries/countModeration.js

@@ -5,3 +5,2 @@
 const utils = require( '../dataModel/utils' );
-const log   = require( '../../log' );
 const P     = require( 'bluebird' );
@@ -8,0 +7,0 @@

models/queries/fetchItems.js

@@ -132,3 +132,3 @@
         let key = tag.key;
-        let val = tag.value;
+        let val = cleanVal( tag.value );
           return {
@@ -156,2 +156,12 @@ key: key,
 
+  function cleanVal( val ) {
+    if ( val === true ) {
+      return 'true';
+    }
+    if ( val === false ) {
+      return 'false';
+    }
+    return val;
+  }
+
   function clean( query ) {
@@ -158,0 +168,0 @@ if ( _source ) {

models/queries/moderationForItem.js

@@ -5,4 +5,5 @@
 
-const log   = require( '../../log' );
+const tools = require( 'cher-tools' );
 const P     = require( 'bluebird' );
+const log   = tools.log();
 
@@ -9,0 +10,0 @@ module.exports = ( knex ) => {

models/queries/tagsForItem.js

@@ -5,4 +5,5 @@
 
-const log   = require( '../../log' );
+const tools = require( 'cher-tools' );
 const P     = require( 'bluebird' );
+const log   = tools.log();
 
@@ -9,0 +10,0 @@ module.exports = ( knex ) => {

models/userModel.js

 
 'use strict';
 
-const P       = require( 'bluebird' );
-const log     = require( '../log' );
-const bcrypt  = require( 'bcryptjs' );
-const modelManager = require( '../modelManager' )();
+const P             = require( 'bluebird' );
+const bcrypt        = require( 'bcryptjs' );
+const tools         = require( 'cher-tools' );
+const modelManager  = require( '../modelManager' )();
+const log           = tools.log();
 
@@ -9,0 +10,0 @@ module.exports = ( bookshelf, knex, tableName ) => {

models/utils.js

 
 'use strict';
 
-const P   = require( 'bluebird' );
-const log = require( '../log' );
-const modelManager = require( '../modelManager' )();
+const P             = require( 'bluebird' );
+const tools         = require( 'cher-tools' );
+const modelManager  = require( '../modelManager' )();
+const log           = tools.log();
 
@@ -8,0 +9,0 @@ const createUser = ( opts, isAdmin ) => {

package.json

 {
   "name": "cher-db",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Data layer for Cher",
@@ -23,4 +23,3 @@ "main": "index.js",
     "bookshelf": "^0.9.1",
-    "cher-tools": "^0.2.1",
-    "karl": "^1.0.1",
+    "cher-tools": "^0.3.1",
     "knex": "^0.9.0",
@@ -27,0 +26,0 @@ "pg": "^4.4.3"

No alert changes

Improved metrics

Total package byte prevSize

38062

increased by1.63%

Dependency count

7

decreased by-12.5%

Lines of code

1180

increased by1.46%

Worsened metrics

Number of package files

23

decreased by-4.17%

Dependency changes

• + Addedbunyan@1.8.15(transitive)

• + Addedcher-tools@0.3.1(transitive)

• + Addeddtrace-provider@0.8.8(transitive)

• + Addedglob@6.0.4(transitive)

• + Addedmv@2.1.1(transitive)

• + Addednan@2.19.0(transitive)

• + Addedncp@2.0.0(transitive)

• + Addedpath-is-absolute@1.0.1(transitive)

• + Addedrimraf@2.4.5(transitive)

• + Addedsafe-json-stringify@1.2.0(transitive)

• - Removedkarl@^1.0.1

• - Removedcher-tools@0.2.3(transitive)

• - Removedhas@1.0.4(transitive)

• - Removedis@3.3.0(transitive)

• - Removedkarl@1.1.0(transitive)

• - Removednode.extend@1.1.8(transitive)

• Updatedcher-tools@^0.3.1