Merge pull request #3 from senecajs/snakecamel

snake camel removal
senecajs-labs · Apr 5, 2016 · 8165295 · 8165295
2 parents 999d88c + bc0e47e
commit 8165295
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 42 deletions.
diff --git a/lib/query-builder.js b/lib/query-builder.js
@@ -2,54 +2,65 @@
 
 var _ = require('lodash')
 var OpParser = require('./operator_parser')
-var StandardQuery = require('seneca-standard-query')
 
-function parseExtendedExpression (entp, sTypes, current_name, current_value, params, values) {
-  function parseComplexSelectOperator (sTypes, current_name, current_value, params, values) {
-    var result = {
-      processed: false
+module.exports = function (seneca) {
+  var StandardQuery
+  seneca.ready(function () {
+    StandardQuery = seneca.export('standard-query/utils')
+  })
+
+  function parseExtendedExpression (sTypes, currentName, currentValue, params, values) {
+    function parseComplexSelectOperator (sTypes, currentName, currentValue, params, values) {
+      var result = {}
+
+      result.processed = _.every(currentValue, function (opVal, op) {
+        if (!OpParser[op]) {
+          result.err = 'This operator is not yet implemented: ' + op
+          return false
+        }
+        var err = OpParser[op](currentName, opVal, params, values, sTypes)
+        if (err) {
+          result.err = err
+          return false
+        }
+
+        return true
+      })
+
+      return result
     }
 
-    for (var op in current_value) {
-      var op_val = current_value[op]
-      if (!OpParser[op]) {
-        result.err = 'This operator is not yet implemented: ' + op
-        return result
-      }
-      var err = OpParser[op](current_name, op_val, params, values, sTypes)
-      if (err) {
-        result.err = err
+    var result = StandardQuery.parseExpression(sTypes, currentName, currentValue, params, values)
+
+    if (!result.processed && _.isObject(currentValue)) {
+      result = parseComplexSelectOperator(sTypes, currentName, currentValue, params, values)
+      if (result.err) {
         return result
       }
-
-      result.processed = true
     }
 
     return result
   }
 
-  var result = StandardQuery.parseExpression(entp, sTypes, current_name, current_value, params, values)
+  function buildQueryFromExpression (entp, queryParameters, sTypes, values) {
+    return StandardQuery.buildQueryFromExpressionCustom(entp, queryParameters, sTypes, values, parseExtendedExpression)
+  }
 
-  if (!result.processed) {
-    if (_.isObject(current_value)) {
-      result = parseComplexSelectOperator(sTypes, current_name, current_value, params, values)
-      if (result.err) {
-        return result
-      }
-    }
+  function selectstm (qent, q, sTypes, done) {
+    StandardQuery.selectstmCustom(qent, q, sTypes, buildQueryFromExpression, done)
   }
 
-  return result
-}
+  function fixPrepStatement (stm, sTypes) {
+    return StandardQuery.fixPrepStatement(stm, sTypes)
+  }
 
-function buildQueryFromExpression (entp, query_parameters, sTypes, values) {
-  return StandardQuery.buildQueryFromExpressionCustom(entp, query_parameters, sTypes, values, parseExtendedExpression)
-}
+  function selectstmOr (qent, q, sTypes) {
+    return StandardQuery.selectstmOr(qent, q, sTypes)
+  }
 
-function selectstm (qent, q, sTypes, done) {
-  StandardQuery.selectstmCustom(qent, q, sTypes, buildQueryFromExpression, done)
+  return {
+    selectstm: selectstm,
+    fixPrepStatement: fixPrepStatement,
+    selectstmOr: selectstmOr
+  }
 }
-
-module.exports.selectstm = selectstm
-module.exports.fixPrepStatement = StandardQuery.fixPrepStatement
-module.exports.selectstmOr = StandardQuery.selectstmOr
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "seneca-store-query",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Extended query for Seneca framework stores",
   "main": "store-query.js",
   "license": "MIT",
@@ -46,7 +46,7 @@
   "dependencies": {
     "lodash": "3.10.1",
     "node-uuid": "1.4.7",
-    "seneca-standard-query": "0.x.x"
+    "seneca-standard-query": "0.0.3"
   },
   "devDependencies": {
     "chai": "3.5.0",
@@ -58,6 +58,6 @@
     "lab": "6.x.x",
     "seneca": "1.3.0",
     "seneca-store-test": "1.0.0",
-    "seneca-postgres-store": "mihaidma/seneca-postgres-store#standardquery"
+    "seneca-postgres-store": "mihaidma/seneca-postgres-store#snakecamel"
   }
 }
diff --git a/store-query.js b/store-query.js
@@ -1,12 +1,12 @@
 'use strict'
 
 var _ = require('lodash')
-var QueryBuilder = require('./lib/query-builder')
-
 var actionRole = 'sql'
+var name = 'store-query'
 
 module.exports = function queryBuilder (options) {
   var seneca = this
+  var QueryBuilder = require('./lib/query-builder')(seneca, options)
 
   function specificTypes (storeName) {
     var sTypes = {
@@ -75,4 +75,8 @@ module.exports = function queryBuilder (options) {
       }
     }
   })
+
+  return {
+    name: name
+  }
 }
diff --git a/test/store.test.js b/test/store.test.js
@@ -19,8 +19,10 @@ var si = Seneca({
 describe('seneca-store-query tests ', function () {
   before({}, function (done) {
     si.use(require('seneca-postgres-store'), DBConfig)
-    si.use(require('..'))
-    si.ready(done)
+    si.ready(function () {
+      si.use(require('..'))
+      si.ready(done)
+    })
   })
 
   Shared.basictest({