api changes (#126)

* issue 32 fixed

* removed swp

* fixed nconf issues

* issue 82, 84 fixes

* fixed #82

* isse #77

* fixed tests

* fixed files

* fixed tests master

* fixed comment

* moved validator

* removed duplicate file

* fixed tests, removed duplicate underscore, publish

* changes

* fixed methods.ts import

* fixed issues w methods

* fixes

* minor fixes

* A

* api changes

* fixed api

* comments

* minor changes

* minor fixes

Author: cemersoz

collections/labs.ts

@@ -103,11 +103,18 @@ labs.allow({
       var LabValidator = function(userid, doc, fieldNames?, modifier?, options?){
         if (typeof fieldNames === "undefined"){
           if(!(doc.course_id && doc.file && //check for lab fields
-             (Roles.isInstructorFor(doc.course_id,userid)) && //check for instructor authorization
-              validateLab(doc.file))
-            ){ //check for labfile errors
-          	    return false;
-          	  }
+             Roles.isInstructorFor(doc.course_id,userid))){//check for instructor authorization
+	    return false;
+	  }
+	  else{
+	    var titleList = validateLab(doc.file);
+	    if(!titleList){ 
+              return false; }
+	    else{
+              return titleList;
+	    }
+	  } 
+
         }
       	else if(fieldNames.includes('tasks') && !fieldNames.includes('file')){
                 return false;

server/imports/api/lab.js

@@ -17,6 +17,7 @@ lab.prototype.init = function(){
 
 lab.prototype.currentTask = null;
 lab.prototype.taskList = [];
+lab.prototype.titleList = [];
 lab.prototype.setup;
 lab.prototype.tasks;
 lab.prototype.newTask = function(ttl, mdown,sFn, vFn, opt){
@@ -25,13 +26,13 @@ lab.prototype.newTask = function(ttl, mdown,sFn, vFn, opt){
               setupFn: sFn,
               verifyFn: vFn,
 	      opts: opt,
-	      markdown: mdown,
 	      title: ttl,
 	      next: null,
 	      completed: false,
 	      nextTask: function(tsk){
 	        this.next = tsk;
 	        this.prnt.taskList.push(tsk);
+		this.prnt.titleList.push(tsk.title);
 	        return tsk;
 	      },
 	      isLast: function(){ return this.next === null; }

server/imports/api/lab.session.d.ts

@@ -2,7 +2,7 @@ namespace lab_exec {
   interface labExec{
     var env : any;
     var tuxlab : any;
-    function init(user : string, labId : number, callback : any)
+    function init(user : string, labId : string, callback : any)
     function parseTasks() : any
     function start(callback : any) : any
     function next(callback : any) : any

server/imports/api/lab.session.js

@@ -45,31 +45,42 @@ session.prototype.init = function(user,labId,callback){
         });
 
         slf.lab.taskNo = 0;
-	slf.env.getPass(callback);
+	SessionCache.add(userid,labid,slf,function(err){
+	  if(err){
+	    callback(err,null);
+	  }
+	  else{
+	    slf.start(function(error){
+	      if(err){
+	        callback(err,null);
+	      }
+	      else{
+	        slf.env.getPass(callback);
+	      }
+	    });
+	  }
+	});
       }
       else{
         // Get LabFile from Cache
         slf.lab.taskNo = 0;
         slf.lab = value;
-        slf.env.getPass(callback);
+        SessionCache.add(userid,labid,slf,function(err){
+	  if(err){
+	    callback(err,null);
+	  }
+	  else{
+	    slf.env.getPass(callback);
+	  }
+	});
       }
     });
   }
 }
 
-session.prototype.parseTasks = function(){
-  var slf = this;
-  return this.lab.taskList.map(function(task,i){
-    if(i <= slf.lab.taskNo){
-      return {title: task.title, markdown: task.markdown};
-    }
-    return {title: task.title, markdown: null};
-  });
-}
-
 /* start: runs setup and moves task header to first task
- * runs callback(err,res) on err if there is an error,
- * (null,parseTasks) no error
+ * runs callback(err) on err if there is an error,
+ * (null) no error
  */
 session.prototype.start = function(callback){
   var slf = this;
@@ -79,10 +90,10 @@ session.prototype.start = function(callback){
     var tasks = this.lab.tasks(this.env);
   if(!this.lab.currentTask.next){
     TuxLog.log('labfile_error','labfile tasks not properly chained at start');
-    callback("Internal error",null);
+    callback("Internal error");
   }
   this.lab.currentTask = this.lab.currentTask.next;
-  this.currentTask.sFn().then(function(){ callback(null,slf.parseTasks(0)); });
+  this.currentTask.sFn().then(function(){ callback(null); });
 }
 
 /* next: verifies that task is completed

server/imports/lab/cache.js

@@ -36,10 +36,10 @@ var NodeCache = require('node-cache');
     SessionCache._NodeCache.get(userid+'#'+labid, function(err, value){
       if(err){
         TuxLog.log('warn', "SessionCache NodeCache Error.");
-        callback(null);
+        callback(err,null);
       }
       else if(value !== undefined){
-        callback(value);
+        callback(null,value);
       }
       else{
         var data = etcd.get('/tuxlab/sessions/'+userid+'/'+labid, function(err, value){

server/imports/lab/checkLab.js

@@ -6,10 +6,15 @@ var tuxOrig = require('./lab.js');
 module.exports = function(str){
   if(!str) { return false; } //check for file import
   var tux = eval(str);
-  //var s = tuxlab;
-  return ((typeof tux != "undefined") &&
-          (typeof tux.setup === 'function') &&  //check for instructor field types
-          (typeof tux.tasks === 'function') &&
-          (tux.init.toString() === tuxOrig.init.toString()) &&  //check for unchanged
-          (tux.newTask.toString() === tuxOrig.newTask.toString()));
+  if(((typeof tux != "undefined") && 
+      (typeof tux.setup === 'function') &&  //check for instructor field types
+      (typeof tux.tasks === 'function') &&
+      (typeof tux.tasks() != 'undefined') &&
+      (tux.init.toString() === tuxOrig.init.toString()) &&  //check for unchanged
+      (tux.newTask.toString() === tuxOrig.newTask.toString()))){
+    return null;
+  }
+  else{
+    return tux.titleList;
+  }
 }

server/imports/lab/methods.ts

@@ -1,33 +1,35 @@
 declare var Collections : any;
+var LabSession = require('../api/lab.session.js');
 declare var TuxLog : any;
-
-var Session = require('../api/lab.session.js');
+declare var SessionCache : any; 
 Meteor.methods({
 
   /**prepareLab: prepares a labExec object for the current user
    * takes the id of the lab and a callback as parameter
    * callback: (err,pass)
    * implement loading wheel, md fetch, course record create in callback
    */
-  'prepareLab': function(labId : number, callback : any){
-     var session = Session();
+  'prepareLab': function(user : string, labId : string,callback : any){
+     var session = LabSession();
      var uId = Meteor.userId();
      session.init(uId,labId,callback);
   },
-  'startLab': function(callback : any){
-    /** somehow get session,
-     * cache/ram/db/parameter
-     * session.start(cb)
-     * call startLab callback(err,res) in session.start cb
-     */
-  },
-  'nextTask': function(callback : any){
+  'nextTask': function(labId : string, callback : any){
     /**session.next(cb)
      * cb(err,res) implement loading wheel here
      * call nextTask callback(err,res) in cb
      * change task markdown -frontend
      * change course records if passed
      */
+    var uId = Meteor.userId();
+    SessionCache.get(uId,labId,function(err,res){
+      if(err || !res){
+        console.log("Internal Service Error");
+      }
+      else{
+      
+      }
+    });
   },
   'endLab': function(callback : any){
     /**session.end(cb)