grex - npm Package Compare versions

Comparing version 0.2.2 to 0.2.3

examples/update.js

@@ -19,3 +19,3 @@ var grex = require('../src/grex.js');
 
-				trxn = g.begin({ amap:{prop:'string'} ,friends: ['string','integer',['integer', 'integer', {name:'string'}], 'boolean']});
+				trxn = g.begin({ aFloat:'f', amap:{prop:'string'} ,friends: ['string','f',['double', 'float', {name:'string'}, {age:'f'}], 'boolean']});
 				
@@ -29,3 +29,3 @@ //trxn.addVertex(100,{name:'Frank', age:'90'});
 
-				trxn.updateVertex(1, { amap:{prop:'prop'}, friends: ['Lisa', 5, ['6','155454',{'name':'Frank'},{name:'john'}], true]});
+				trxn.updateVertex(1, { aFloat:10, amap:{prop:'prop'}, friends: ['Lisa', '5.5', ['6','155454',{'name':'Frank'},{age:'55'}]]});
 
@@ -32,0 +32,0 @@ //trxn.updateVertex(100, { friends: ['Lisa', 5, ['100.05',true]]});

package.json

 {
   "name": "grex",
   "description": "Client for Rexster Graph Server",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "keywords": [
@@ -6,0 +6,0 @@ "database",

src/grex.js

@@ -16,16 +16,18 @@ ;(function(global) {
 
-    var T = { 'gt': 'T.gt',
-              'gte': 'T.gte',
-              'eq': 'T.eq',
-              'neq': 'T.neq',
-              'lte': 'T.lte',
-              'lt': 'T.lt',
-              'decr': 'T.decr',
-              'incr': 'T.incr',
-              'notin': 'T.notin',
-              'in': 'T.in'
+    var T = { 
+                'gt': 'T.gt',
+                'gte': 'T.gte',
+                'eq': 'T.eq',
+                'neq': 'T.neq',
+                'lte': 'T.lte',
+                'lt': 'T.lt',
+                'decr': 'T.decr',
+                'incr': 'T.incr',
+                'notin': 'T.notin',
+                'in': 'T.in'
             };
 
-    var Contains = { 'IN': 'Contains.IN',
-              'NOT_IN': 'Contains.NOT_IN'
+    var Contains = { 
+                'IN': 'Contains.IN',
+                'NOT_IN': 'Contains.NOT_IN'
             };
@@ -50,5 +52,3 @@
         'list': 'list',
-        'map': 'map',
-        'date': 'l',
-        'unknown': 's' //this is to allow for a bug - to be removed once resolved
+        'map': 'map'
     };
@@ -95,3 +95,3 @@
     };
-   
+
     function qryMain(method, reset){
@@ -253,2 +253,3 @@ return function(){
                                 }
+                                tempStr = tempStr.replace(')(', '),(');
                             } else {
@@ -260,2 +261,3 @@ tempObj[k] = '(map,(' + addTypes(obj[k], typeDef[k], true) + '))';
                                 tempStr += '(list,(' + addTypes(obj[k], typeDef[k], true, true) + '))';
+                                tempStr = tempStr.replace(')(', '),(');
                             } else {
@@ -270,3 +272,2 @@ tempObj[k] = '(list,(' + addTypes(obj[k], typeDef[k], true, true) + '))';
                                         tempStr += '(' + typeHash[typeDef[idx]] + ',' + obj[k] + ')';
-                                        tempStr = tempStr.replace(')(', '),(');
                                     } else {
@@ -280,5 +281,5 @@ idx = typeDef.length - 1;
                                           tempStr += '(' + typeHash[typeDef[idx]] + ',' + obj[k] + ')';
-                                          tempStr = tempStr.replace(')(', '),(');
                                         };
                                     };
+                                    tempStr = tempStr.replace(')(', '),(');
                                 } else {
@@ -305,3 +306,2 @@ if (k in typeDef) {
             }
-            tempStr = tempStr.replace(')(', '),(');
             return embedded ? tempStr : tempObj;
@@ -562,6 +562,6 @@ }
     var Gremlin = (function () {
-        function Gremlin(gRex/*options*//*, params*/) {
+        function Gremlin(gRex) {
             this.gRex = gRex;
-            this.OPTS = gRex.OPTS;//options;
-            this.params = 'g';//params ? params : 'g';
+            this.OPTS = gRex.OPTS;
+            this.params = 'g';
         }
@@ -616,3 +616,5 @@
                 tempResultArr = [],
+                tempTypeArrLen = 0,
                 len = 0, rest = 1,
+                mergedObject = {},
                 returnObj = {typeDef:{}, result: {}};
@@ -627,16 +629,25 @@
                         tempResultArr[i] = tempObj.result;
-                    } else {
-                        //determine if the array has same types
-                        //then only show the type upto that index
-                        if(i > 0){
-                            //TODO: May need to compare Object Types 
-                            //unable to do so at this time due to a bug
-                            if (obj[i].type !== obj[i - 1].type) {
-                                rest = i + 1;
-                            };
-                        }
+                    } else {                        
                         tempTypeArr.push(obj[i].type);
                         tempResultArr.push(obj[i].value);    
                     }
+                    if(i > 0){
+                        //If type is map or list need to do deep compare
+                        //to ascertain whether equal or not
+                        //determine if the array has same types
+                        //then only show the type upto that index
+                        if (obj[i].type !== obj[i - 1].type) {
+                            rest = i + 1;
+                        };
+                    }
                 };
+                if(rest > 1 && isObject(tempTypeArr[rest])){
+                    //merge remaining objects
+                    tempTypeArrLen = tempTypeArr.length;
+                    mergedObject = tempTypeArr[rest - 1];
+                    for(var j = rest;j < tempTypeArrLen; j++){
+                        mergedObject = merge(mergedObject, tempTypeArr[j])
+                    }
+                    tempResultArr[rest - 1] = mergedObject;
+                }
                 tempTypeArr.length = rest;
@@ -710,3 +721,3 @@ returnObj.typeDef = tempTypeArr;
             result.typeMap = typeMap;
-            //This will preserve any local TypeDefs
+            //This will preserve any locally defined TypeDefs
             this.typeMap = merge(this.typeMap, typeMap);
@@ -843,10 +854,2 @@ return result;
 
-            //CUD
-            // exports.addVertex = cud('create', 'vertex');
-            // exports.addEdge = cud('create', 'edge');
-            // exports.removeVertex = cud('delete', 'vertex');
-            // exports.removeEdge = cud('delete', 'edge');
-            // exports.updateVertex = cud('update', 'vertex');
-            // exports.updateEdge = cud('update', 'edge');
-
             this.clear =  qryMain('clear', true);
@@ -853,0 +856,0 @@ this.shutdown = qryMain('shutdown', true);

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

219341

increased by0.15%

Lines of code

1755

increased by0.23%

No dependency changes