Merge pull request #8 from Cheukting/dev

Update some tests and fix #7

Author: Cheukting

lib/woql.js

@@ -93,7 +93,7 @@ WOQL.insert = function(Node, Type, Graph){
 }
 
 WOQL.doctype = function(Type, Graph){
-	return new WOQLQuery().add_class(Type, Graph).parent("Document");	
+	return new WOQLQuery().add_class(Type, Graph).parent("Document");
 }
 
 
@@ -212,7 +212,7 @@ WOQLQuery.prototype.order_by = function(gvarlist, asc_or_desc, query){
 		const vars = UTILS.addNamespacesToVariables(ordering);
 		asc_or_desc = asc_or_desc || "asc";
 		ordering = {};
-		ordering[asc_or_desc] = vars; 
+		ordering[asc_or_desc] = vars;
 	}
 	this.advanceCursor("order_by", ordering);
 	if(query){
@@ -807,7 +807,7 @@ WOQLQuery.prototype.property = function(p,val){
 			var nwoql = WOQL.add_property(p, val).domain(this.adding_class);
 			nwoql.query.and.push(this.json());
 			nwoql.adding_class = this.adding_class;
-			return nwoql; 
+			return nwoql;
 		}
 		else {
 			p = this.cleanPredicate(p);
@@ -816,7 +816,7 @@ WOQLQuery.prototype.property = function(p,val){
 	}
 	return this;
 }
-	
+
 WOQLQuery.prototype.star = function(GraphIRI, Subj, Pred, Obj){
 	Subj = (Subj ? this.cleanSubject(Subj) : "v:Subject");
 	Pred = (Pred ? this.cleanPredicate(Pred) : "v:Predicate");
@@ -826,12 +826,12 @@ WOQLQuery.prototype.star = function(GraphIRI, Subj, Pred, Obj){
 		return this.quad(Subj, Pred, Obj, GraphIRI);
 	}
 	else {
-		console.log(Subj, Pred, Obj);
+		//console.log(Subj, Pred, Obj);
 		return this.triple(Subj, Pred, Obj);
 	}
 }
 
-/** 
+/**
  * These are composite functions, the above are primitives
  */
 WOQLQuery.prototype.getEverything = function(GraphIRI){
@@ -985,7 +985,7 @@ WOQLQuery.prototype.loadVocabulary = function(client){
 					if(typeof v == "string"){
 						var spl = v.split(":");
 						if(spl.length == 2 && spl[1] && spl[0] != "_"){
-							this.vocab[spl[1]] = v;
+							this.vocab[spl[0]] = spl[1];
 						}
 					}
 				}

test/woql.spec.js

@@ -13,9 +13,37 @@ describe('woql queries', function () {
 		expect(woqlObject.vocab.type).to.equal('rdf:type');
 	})
 
+  it('check the insert method',function(){
+
+		const woqlObject=WOQL.insert("v:Bike_URL", "Bicycle");
+    const woqlObjectDB=WOQL.insert("v:Bike_URL", "Bicycle", "myDB");
+    const jsonObj={ "add_triple": [ 'v:Bike_URL', 'rdf:type', 'scm:Bicycle' ] };
+    const jsonObjDB={ "add_quad": [ 'v:Bike_URL', 'rdf:type', 'scm:Bicycle', 'db:myDB' ] };
+		expect(woqlObject.json()).to.eql(jsonObj);
+    expect(woqlObjectDB.json()).to.eql(jsonObjDB);
+	})
+
+  it('check the doctype method',function(){
+
+		const woqlObject=WOQL.doctype("Station");
+
+		const jsonObj={ "and": [
+                    { "add_quad": ["scm:Station",
+                    "rdf:type",
+                    "owl:Class",
+                    "db:schema"] },
+                    { "add_quad": ["scm:Station",
+                    "rdfs:subClassOf",
+                    "tcs:Document",
+                    "db:schema"] }
+                   ] }
+
+		expect(woqlObject.json()).to.eql(jsonObj);
+
+	})
 
 	it('check the limit method',function(){
-    const woqlObject=WOQL.limit(10);  
+    const woqlObject=WOQL.limit(10);
 
     expect(woqlObject.json().limit[0]).to.equal(10);
 
@@ -86,7 +114,7 @@ describe('woql queries', function () {
                   ]
                 };
 
-    //expect(woqlObject.json()).to.eql(jsonObj);
+    expect(woqlObject.json()).to.eql(jsonObj);
     expect(woqlObjectChain.json()).to.eql(jsonObj);
 
   })
@@ -111,7 +139,7 @@ describe('woql queries', function () {
 
     const woqlObjectChain=WOQL.from("http://dburl").limit(10);
 
-    const jsonObj={ from: [ 'http://dburl', { limit: [ 10, {} ] } ] }
+    const jsonObj={ "from": [ 'http://dburl', { "limit": [ 10, {} ] } ] }
 
     //expect(woqlObject.json()).to.eql(jsonObj);
     expect(woqlObjectChain.json()).to.eql(jsonObj);
@@ -122,7 +150,7 @@ describe('woql queries', function () {
 
     const woqlObject=WOQL.limit(10).star();
 
-    const jsonObj={ limit: [ 10, { "triple": [
+    const jsonObj={ "limit": [ 10, { "triple": [
                   "v:Subject",
                   "v:Predicate",
                   "v:Object"
@@ -283,6 +311,17 @@ describe('woql queries', function () {
 
   })
 
+  it('check the cast method',function(){
+
+    const woqlObject=WOQL.cast("v:Duration", "xsd:integer", "v:Duration_Cast");
+
+    const jsonObj={ "typecast": [ "v:Duration", "xsd:integer", "v:Duration_Cast" ] }
+
+    expect(woqlObject.json()).to.eql(jsonObj);
+
+  })
+
+
   it('check the list method',function(){
 
     const woqlObject=WOQL.list(["V1","V2"]);
@@ -682,13 +721,13 @@ describe('triple builder chaining methods', function () {
          { add_triple: ["v:Node_ID", "rdfs:subClassOf", "tcs:Entity"] },
          { add_triple: ["v:Node_ID", "rdfs:subClassOf", "scm:hello"] }
     ]};
-     expect(woqlObject.json()).to.eql(jsonObj);     
+     expect(woqlObject.json()).to.eql(jsonObj);
 })
   it('check the chained doctype method',function(){
   const woqlObject = WOQL.doctype("MyDoc")
         .property("prop", "dateTime")
         .property("prop2", "integer")
-        
+
   const jsonObj={ and: [
           { add_quad: ["scm:prop2", "rdf:type", "owl:DatatypeProperty", "db:schema"] },
           { add_quad: ["scm:prop2", "rdfs:range", "xsd:integer", "db:schema"] },
@@ -702,10 +741,9 @@ describe('triple builder chaining methods', function () {
                { add_quad: ["scm:MyDoc", "rdf:type", "owl:Class", "db:schema"] },
                { add_quad: ["scm:MyDoc", "rdfs:subClassOf", "tcs:Document", "db:schema"] }
           ]}
-        ]},         
+        ]},
   ]};
-   expect(woqlObject.json()).to.eql(jsonObj);     
+   expect(woqlObject.json()).to.eql(jsonObj);
 })
 
 })
-

test/woqlQuery.spec.js

@@ -442,14 +442,13 @@ describe('pre-roll queries', function () {
 
 describe('woql query object', function () {
 
-  it('check the setVocabulary method',function(){
+  it('check the setVocabulary and getVocabulary method',function(){
     global.sandbox.stub(axios, "get").returns(Promise.resolve({status:200, data: {}}));
 
     const woqlObject=WOQL.limit(2).start(0);
     woqlObject.setVocabulary("vocab");
-    //console.log(woqlObject.getAllDocuments().json());
-    //done();
-    //expect(woqlObject.setVocabulary("vocab")).to.eql(jsonObj);
+
+    expect(woqlObject.getVocabulary()).to.eql("vocab");
 
   })