cleanup

Author: ehennum

.gitignore

@@ -1 +1,6 @@
+doc
 node_modules
+tmp
+.project
+.settings
+

lib/query-builder.js

@@ -669,6 +669,7 @@ function geoQuery(variant, args, query, next) {
       seekingRegion = false;
     } else if (seekingRegion && arg instanceof Array && arg.length === 2) {
       query.point = [latlon.call(null, arg)];
+      seekingRegion = false;
     } else {
       if (constraintName === undefined) {
         constraintName = arg.constraintName;
@@ -681,11 +682,13 @@ function geoQuery(variant, args, query, next) {
   }
 
   var wrapper = {};
-  if (constraintName === undefined) {
-    wrapper[variant+'-query'] = query;
-  } else {
+  if (!valcheck.isUndefined(constraintName)) {
     wrapper.name = constraintName;
     wrapper[variant] = query;
+  } else if (seekingRegion) {
+    wrapper[variant] = query;
+  } else {
+    wrapper[variant+'-query'] = query;
   }
   return wrapper;
 }

package.json

@@ -2,7 +2,7 @@
   "author": "MarkLogic",
   "name": "marklogic",
   "description": "Provides a node.js client interface to the MarkLogic database server",
-  "version": "0.0.1",
+  "version": "1.0.0-ea2",
   "license": "Apache-2.0",
   "main": "./lib/marklogic.js",
   "keywords": [

test-basic/query-builder.js

@@ -523,14 +523,14 @@ describe('query-builder', function() {
     assert.deepEqual(
         q.geoElement('parent', 'element',
             q.heatmap(2, 3, q.southWestNorthEast(1.1, 2.2, 3.3, 4.4))),
-        {'geo-elem-query':{parent:{name:'parent'},
+        {'geo-elem':{parent:{name:'parent'},
           element:{name:'element'},
           heatmap:{latdivs:2, londivs:3, s:1.1, w:2.2, n:3.3, e:4.4}}}
         );
     assert.deepEqual(
         q.geoElement('parent', 'element',
             q.heatmap(2, 3, 1.1, 2.2, 3.3, 4.4)),
-        {'geo-elem-query':{parent:{name:'parent'},
+        {'geo-elem':{parent:{name:'parent'},
           element:{name:'element'},
           heatmap:{latdivs:2, londivs:3, s:1.1, w:2.2, n:3.3, e:4.4}}}
         );