Merge branch 'dev' of https://github.com/terminusdb/terminus-client into dev

Author: kevinchekovfeeney

lib/terminusRule.js

@@ -31,7 +31,7 @@ TerminusRule.prototype.type = function(...list){
 }
 
 /**
- * Specifies the scope of a rule - row / cell / object / property / * .. what part of the result does the rule apply to 
+ * Specifies the scope of a rule - row / cell / object / property / * .. what part of the result does the rule apply to
  */
 TerminusRule.prototype.scope = function(scope){
 	if(typeof scope == "undefined"){
@@ -49,7 +49,6 @@ TerminusRule.prototype.value = function(...val){
 		return this.pattern.value;
 	}
 	this.pattern.value = val;
-	console.log(this.pattern.value);
 	return this;
 }
 
@@ -72,7 +71,7 @@ TerminusRule.prototype.json = function(mjson){
 
 /**
  * Contained Pattern Object to encapsulate pattern matching
- * @param {Object} pattern 
+ * @param {Object} pattern
  */
 function TerminusPattern(pattern){};
 
@@ -99,7 +98,7 @@ TerminusPattern.prototype.testBasics = function(scope, value){
 	if(this.scope && scope && this.scope != scope) return false;
 	if(this.type){
 		var dt = value["@type"];
-		if(!dt || !this.testValue(dt, this.type)) return false; 
+		if(!dt || !this.testValue(dt, this.type)) return false;
 	}
 	if(typeof this.literal != "undefined"){
 		if(!(this.literal == !(typeof value["@type"] == "undefined"))) return false;
@@ -141,7 +140,7 @@ TerminusPattern.prototype.unpack = function(arr, nonstring){
 				str += arr[i];
 			}
 			if(i < (arr.length - 1)) str += ", ";
-		} 
+		}
 	}
 	else {
 		str = '"' + arr.join('","') + '"';
@@ -192,4 +191,4 @@ TerminusPattern.prototype.stringMatch = function (vala, valb) {
 };
 
 
- module.exports = {TerminusRule, TerminusPattern};
+ module.exports = {TerminusRule, TerminusPattern};

test/woql.spec.js

@@ -347,6 +347,21 @@ describe('woql queries', function () {
 
   })
 
+  it('check the split method',function(){
+
+    const woqlObject=WOQL.split("A, B, C", ", ", "v:list_obj");
+
+    const jsonObj={
+                    'split': [
+                      { '@value': 'A, B, C', '@type': 'xsd:string' },
+                      {"@type": "xsd:string", "@value": ", "},
+                      "v:list_obj"
+                    ]
+                  };
+
+    expect(woqlObject.json()).to.eql(jsonObj);
+
+  })
 
   it('check the list method',function(){
 
@@ -358,6 +373,15 @@ describe('woql queries', function () {
 
   })
 
+  it('check the member method',function(){
+
+    const woqlObject=WOQL.member("v:member", "v:list_obj");
+    const jsonObj={ 'member': [ 'v:member', 'v:list_obj' ] };
+
+    expect(woqlObject.json()).to.eql(jsonObj);
+
+  })
+
   it('check the group_by method',function(){
     const woqlObject=WOQL.group_by(["v:A", "v:B"],["v:C"],"v:New");
     const jsonObj={ group_by: [ {list: ['v:A', "v:B"]}, {list: ["v:C"]}, {},  "v:New"] };