Implements markdown parser (#191)

cemersoz · DerekTBrown · commit 2d42e966d38b · 2017-01-01T02:16:08.000-05:00
* 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 * 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 * method implementations * before merge * removed testing change * fixed typo * fixed prepareLab * removed test methods * fix prepareLab * methods changes * removed swap file * fixed merge * fixes * prepareLab WORKS * further fixes * merge * all works * deleted debug line * fixed minor excess code * minor indentation fix * reference fixes * fixes to nextTask * merged with master * minor changes * fixed merge problems * fixed md view and swithces * fixed error messages * removed debug code * removed swp * fixes * fixed typescript warning * added student object * changed function calls * deleted unnecessary files * updated api, added md feedback * fixed ts warn * fixed example_data and partially tests * update validator, merge * fixed indentation * changes * it's pretty now * fixed #187, #188 * minor fixes * fixed indentation * added equal sign * updated example courses to match schema * added md parser * removed debug code * fixed debug, import * changed dockerode settings
diff --git a/collections/labs.ts b/collections/labs.ts
@@ -3,7 +3,9 @@ import { Meteor } from 'meteor/meteor';
 import { Roles } from './users.ts';
 
 declare var _ : any;
+declare var async : any;
 
+declare var get_markdown : any;
 declare var validateLab : any;
 
 export const labs : any = new Mongo.Collection('labs');
@@ -73,14 +75,14 @@ labs.allow({
             return Date.now();
           }
         },
-        hidden:{
-          type: Boolean,
-          defaultValue: true
-        },
-        disabled:{
-          type: Boolean,
-          defaultValue: false
-        },
+	hidden:{
+	  type: Boolean,
+	  defaultValue: true
+	},
+	disabled:{
+	  type: Boolean,
+	  defaultValue: false
+	},
         file: {
           type: String
         },
@@ -95,6 +97,7 @@ labs.allow({
 /* LAB VALIDATOR */
   if(Meteor.isServer){
   var validateLab : any = require('../server/imports/lab/checkLab.js');
+
     Meteor.startup(function(){
       var LabValidator = function(userid, doc, fieldNames?, modifier?, options?){
         if(!doc.course_id){ //check if lab object has a course_id
@@ -116,6 +119,12 @@ labs.allow({
             throw new Meteor.Error("labfile failed the validator");
 	  }
 	  else{
+            var tasks = get_markdown(doc.file);
+	    async.map(tasks,function(task){
+	      task.updated = Date.now();
+	      return task;
+	    });
+	    doc.tasks = tasks;
             doc.updated = Date.now();
 	    return true;
           }
diff --git a/server/imports/api/lab.env.js b/server/imports/api/lab.env.js
@@ -1,20 +1,11 @@
-// Import Dockerode
-var dockerode = require('dockerode');
 // Import other libraries
-var _ = require('underscore');
-var Etcd = require('node-etcd');
 var nconf = require('nconf');
 
 /* constructor
  * intializes docker, etcd connection
  */
 var env = function(){
-
-  var docker_settings = {
-	  host: nconf.get('swarm_node_ip'),
-	  port: nconf.get('swarm_node_port')
-  }
-  this.docker = new dockerode(docker_settings);
+  this.docker = docker;
   this.root_dom = nconf.get('domain_root');
 }
 
diff --git a/server/imports/lab/markdown.ts b/server/imports/lab/markdown.ts
@@ -0,0 +1,16 @@
+export function get_markdown(labfile : string) : Array<any> {
+  var outer_filter = /\/\*( |\n)*?@(.*?)( |\n)((.|\n)*?)\*\//gm;
+  var match = labfile.match(outer_filter);
+  var output = match.map(function(task_data, index, arr) {
+    var inner_filter = /\/\*( |\n)*?@(.*?)( |\n)((.|\n)*?)\*\//gm;
+    var filtered_data = inner_filter.exec(task_data);
+    var task_name = filtered_data[2];
+    var task_md = filtered_data[4];
+    return {
+      _id : (index + 1).toString(),
+      name : task_name,
+      md : task_md
+    }
+  });
+  return output;
+}
diff --git a/server/imports/lab/methods.ts b/server/imports/lab/methods.ts
@@ -12,7 +12,8 @@ var LabSession = require('../api/lab.session.js');
 import{ prepLab, next, verify } from './labMethods.ts';
 
 Meteor.methods({
-  /**prepareLab: prepares a labExec object for the current user
+ 
+   /**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
diff --git a/server/imports/startup/docker.js b/server/imports/startup/docker.js
@@ -0,0 +1,12 @@
+var dockerode = require('dockerode');
+var fs = require('fs');
+
+var dockerode_options = {
+    host: nconf.get('swarm_node_ip'),
+    port: nconf.get('swarm_node_port')
+    ca: fs.readFileSync(nconf.get('swarm_cert_dir')+"/ca.perm"),
+    cert: fs.readFileSync(nconf.get('swarm_cert_dir')+"/cert.perm"),
+    key: fs.readFileSync(nconf.get('swarm_cert_dir')+"/key.perm")
+  };
+
+docker = new dockerode(dockerode_options);
diff --git a/server/imports/startup/methods.js b/server/imports/startup/methods.js
@@ -1,3 +1,5 @@
+// Import markdown regexp
+import "../lab/markdown.ts";
 
 // Import Lab Meteor Methods
 import "../lab/methods.ts";

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// Import markdown regexp`
	`2`	`+import "../lab/markdown.ts";`
`1`	`3`
`2`	`4`	`// Import Lab Meteor Methods`
`3`	`5`	`import "../lab/methods.ts";`