Changing tuxlab to lab object

Author: DerekTBrown

server/imports/api/lab.js

@@ -38,4 +38,4 @@ lab.prototype.newTask = function(ttl, mdown,sFn, vFn, opt){
 	    }
   return ts;
 }
-module.exports = new lab();
+module.exports = lab;

server/imports/lab/checkLab.js

@@ -1,13 +1,15 @@
 "use strict";
+var tuxOrig = require('./lab.js');
+
+
 /// <reference path="./checkLab.d.ts" />
 module.exports = function(str){
   if(!str) { return false; } //check for file import
   var tux = eval(str);
   //var s = tuxlab;
-  var tuxOrig = require('./tuxlab.js');
-  return ((typeof tux != "undefined") && 
+  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()));  
+          (tux.newTask.toString() === tuxOrig.newTask.toString()));
 }

server/imports/lab/tuxlab.js renamed to server/imports/lab/lab.js

@@ -1,6 +1,6 @@
-var tuxlab = function(){}
+var lab = function(){}
 
-tuxlab.prototype.init = function(){
+lab.prototype.init = function(){
   var slf = this;
   var ts = {  prnt: slf,
               next: null,
@@ -14,11 +14,11 @@ tuxlab.prototype.init = function(){
   return ts;
 }
 
-tuxlab.prototype.currentTask = null;
-tuxlab.prototype.taskList = [];
-tuxlab.prototype.setup;
-tuxlab.prototype.tasks;
-tuxlab.prototype.newTask = function(ttl, mdown,sFn, vFn, opt){
+lab.prototype.currentTask = null;
+lab.prototype.taskList = [];
+lab.prototype.setup;
+lab.prototype.tasks;
+lab.prototype.newTask = function(ttl, mdown,sFn, vFn, opt){
   var slf = this;
   var ts = {  prnt: slf,
               setupFn: sFn,
@@ -37,4 +37,4 @@ tuxlab.prototype.newTask = function(ttl, mdown,sFn, vFn, opt){
 	    }
   return ts;
 }
-module.exports = new tuxlab();
+module.exports = lab;

server/imports/lab/methods.ts

@@ -1,11 +1,13 @@
 declare var Collections : any;
-Meteor.methods([
+declare var TuxLog : any;
 
-  /**prepareLab: prepares a labExec object for the current user
-   * takes the id of the lab and a callback as parameter
-   * callback: (err,parseTasks,labExec)
+Meteor.methods({
+
+  /** prepareLab: prepares a labExec object for the current user
+   *  takes the id of the lab and a callback as parameter
+   *  callback: (err,parseTasks,labExec)
    */
-  'prepareLab': function(labId : number, callback : any){
+  'prepareLab' : function(labId : number, callback : any){
      var session = require('../api/lab.session.js');
      var userid = Meteor.userId();
 
@@ -55,4 +57,4 @@ Meteor.methods([
      * remove all vms and deleterecords after lab is completed for good. -highly optional
      */
   }
-]);
+});

tests/tuxlab.api.js

@@ -1,25 +1,26 @@
 /** Test Suite for TuxLab-App
     using Meteor Gagarian (https://github.com/anticoders/gagarin)
 **/
-var tuxlab = require('../server/imports/api/tuxlab.js');
+var lab = require('../server/imports/api/lab.js');
+var api = new lab();
 
 describe('tuxlab.api.task tests',function(){
-  var task1 = tuxlab.newTask("title","md",function(){},function(){});
+  var task1 = api.newTask("title","md",function(){},function(){});
   it('should have fields initialized',function(){
     expect(task1).to.have.property('next')
     .and.equal(null);
   });
   it('should have a proper parent',function(){
     expect(task1).to.have.property('prnt')
-      .and.equal(tuxlab);
+      .and.equal(api);
   });
-  var task2 = tuxlab.newTask("title2","md2",function(){},function(){});
+  var task2 = api.newTask("title2","md2",function(){},function(){});
   it('should have a proper nextTask function',function(){
     var tsk2 = task1.nextTask(task2);
     expect(task1).to.have.property('next')
       .and.equal(task2);
     expect(tsk2).equal(task2);
-    /*expect(tuxlab).to.have.property('taskList')
+    /*expect(api).to.have.property('taskList')
       .and.equal([task2]);*/
   });
   it('should have a proper isLast function',function(){
@@ -31,10 +32,10 @@ describe('tuxlab.api.task tests',function(){
 });
 
 describe('more tuxlab.api.task tests',function(){
-  var task1 = tuxlab.newTask("title1","md1",function(){}, function(){});
-  var task2 = tuxlab.newTask("title2","md2",function(){}, function(){});
-  var task3 = tuxlab.newTask("title3","md3",function(){}, function(){});
-  var task4 = tuxlab.newTask("title4","md4",function(){}, function(){});
+  var task1 = api.newTask("title1","md1",function(){}, function(){});
+  var task2 = api.newTask("title2","md2",function(){}, function(){});
+  var task3 = api.newTask("title3","md3",function(){}, function(){});
+  var task4 = api.newTask("title4","md4",function(){}, function(){});
   it('should be chained properly',function(){
     var tsk4 = task1.nextTask(task2).nextTask(task3).nextTask(task4);
     expect(tsk4).to.equal(task4);
@@ -65,29 +66,29 @@ describe('more tuxlab.api.task tests',function(){
     task4.next = null;
     expect(tuxlab).to.have.property('taskList')
      .and.equal([task2,task3,task4]);*/
-     
+
   });
 });
 
 describe('tuxlab.api.init tests',function(){
-  var init = tuxlab.init();
+  var init = api.init();
   it('should have a proper parent',function(){
     expect(init).to.have.property('prnt')
-      .and.equal(tuxlab);
+      .and.equal(api);
   });
   it('should have proper fields initialized',function(){
     expect(init).to.have.property('next')
       .and.equal(null);
     expect(init).to.have.property('nextTask');
   });
   it('should initialize tuxlab fields',function(){
- /* expect(tuxlab).to.have.property('currentTask')
+ /* expect(api).to.have.property('currentTask')
       .and.equal(init);
-    expect(tuxlab).to.have.property('taskList')
+    expect(api).to.have.property('taskList')
       .and.equal([init]);*/
   });
-  var init1 = tuxlab.init();
-  var task1 = tuxlab.newTask("title","md",function(){},function(){});
+  var init1 = api.init();
+  var task1 = api.newTask("title","md",function(){},function(){});
   var tsk1 = init1.nextTask(task1);
   it('should have a working nextTask function', function(){
     expect(init1).to.have.property('next')

tests/tuxlab.db.js

@@ -1,5 +1,5 @@
 /**
-  Tests Meteor DB Authentication Roles and Inserts Example data for Later Use
+  Tests Meteor DB Schema
 **/
 
 /**
@@ -106,16 +106,3 @@ describe('Database Schema', function(){
     }, [course_id, lab_id]);
   });
 });
-
-/**
-  Test Client-Side Insertion
-**/
-describe('Client-Side Insertion', function(){
-
-});
-
-
-
-/**
-  Test Schema Enforcement
-**/

tests/tuxlab.js

@@ -2,8 +2,10 @@
   TuxLab Test Suite
 **/
 
-// Test Authentication Roles and Insert Example Data
+// Insert Example Data
 require('./tuxlab.db.js');
 
 // Test LabFile API
 require("./tuxlab.api.js");
+
+// Test User Login