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

Author: Francesca-Bit

Readme.md

@@ -459,6 +459,9 @@ client.deleteDocument("http://localhost:6363/myFirstTerminusDB/document/chess",o
 
 ```
 
+## Tutorials
+Visit [terminus-tutorials](https://github.com/terminusdb/terminus-tutorials) for tutorial scripts
+
 ## Testing
 * Clone this repository
 
@@ -472,6 +475,12 @@ $ npm install
 $ npm run test
 ```
 
+## Report Issues
+
+If you have encounter any issues, please report it with your os and environment setup, version that you are using and a simple reproducible case.
+
+If you encounter other questions, you can ask in our community [forum](https://community.terminusdb.com/) or [Slack channel](http://bit.ly/terminusdb-slack).
+
 ## Contribute
 It will be nice, if you open an issue first so that we can know what is going on, then, fork this repo and push in your ideas. Do not forget to add a bit of test(s) of what value you adding.
 

lib/woql.js

@@ -711,8 +711,19 @@ WOQLQuery.prototype.file = function(json, opts){
 }
 
 WOQLQuery.prototype.order_by = function(asc_or_desc, query){
-	asc_or_desc = (asc_or_desc.json ? asc_or_desc.json() : asc_or_desc);
-	this.cursor["order_by"] = [asc_or_desc]
+	let ovars = [];
+	if(Array.isArray(asc_or_desc)){
+		for(var i = 0; i<asc_or_desc.length; i++){
+			ovars.push(asc_or_desc[i].json ? asc_or_desc[i].json() : asc_or_desc[i])
+		}
+	}
+	else if(typeof asc_or_desc == "string"){
+		ovars.push({"asc": [asc_or_desc]});
+	}
+	else {
+		ovars.push(asc_or_desc.json ? asc_or_desc.json() : asc_or_desc)
+	}
+	this.cursor["order_by"] = [ovars]
 	if(query){
 		this.cursor["order_by"] .push(query.json ? query.json() : query);
 	}

test/woql.spec.js

@@ -365,18 +365,18 @@ describe('woql queries', function () {
   })
 
   it('check the order_by method',function(){
-    const woqlObject=WOQL.order_by(WOQL.asc("v:B"));
-    const jsonObj={ order_by: [ {asc: ['v:B']}, {} ] };
+    const woqlObject=WOQL.order_by("v:B");
+    const jsonObj={ order_by: [ [{asc: ['v:B']}], {} ] };
     expect(woqlObject.json()).to.eql(jsonObj);
 
     const desc = WOQL.desc(["v:C", "v:A"]);
     const woqlObject2=WOQL.order_by(desc);
-    const jsonObj2={ order_by: [ {desc: ['v:C', "v:A"]}, {} ] };
+    const jsonObj2={ order_by: [ [{desc: ['v:C', "v:A"]}], {} ] };
     expect(woqlObject2.json()).to.eql(jsonObj2);
 
     const ascd = WOQL.asc(["v:C", "v:A"]);
     const woqlObject3=WOQL.order_by(ascd);
-    const jsonObj3={ order_by: [ {asc: ['v:C', "v:A"]}, {} ] };
+    const jsonObj3={ order_by: [ [{asc: ['v:C', "v:A"]}], {} ] };
     expect(woqlObject3.json()).to.eql(jsonObj3);