mumuki-laboratory 7.7.6 → 7.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc2cca6d653df2fae416fe08b024233740722905d893c4db895ce3b4b5a7e32a
-  data.tar.gz: 3e4f5adf6ec0d5f61f852c323425e7fb5502882f3ea74f4c0c095f885a015146
+  metadata.gz: cf3186d3e4ad3367ccf34396dfde31138bb255456b8cf5e5593a76e908545434
+  data.tar.gz: 7e3aa354499be05940fe21355f7e4a45ae933dab0a989cd8db99b48e564c8f12
 SHA512:
-  metadata.gz: 0a0475afc78c86323f8bc78763294f05184c46a38ff00b530b1962c85880258b2b99cc17732ee94324cff4e144cc1e4680f91a1803aea5aa2bca3d95abf02f66
-  data.tar.gz: c670a11910815b05d1445fc0fee8d9c5c2f1b1146b052ffa41fe005e5cd7fb1f249203bcf02f3f26a1bd898b89b015aeaab03617cc455f971386ba69c8ce6595
+  metadata.gz: e91791ad61d5843960950276383f74330b0eec046f475400c21fdb89af80f044fa3902a7a86e82d1dc3e130f30716c62e23d79f5ea87c8416c9140e550414819
+  data.tar.gz: 528f209da31776d4c01be41b92c2218bcbb6dc98175809a05062c3b077e1dc0ca8951b034e44a9a0f3cca93bbba371fd0f14da18bb56e15fac9ddb3b2e211455

data/README.md

@@ -141,7 +141,13 @@ bundle exec rspec
 > it and add it to your path
 
 ```bash
-bundle exec rake teaspoon
+MOZ_HEADLESS=1 bundle exec rake teaspoon
+```
+
+## Running `eslint`
+
+```bash
+yarn run lint
 ```
 
 ## JavaScript API Docs
@@ -208,6 +214,10 @@ which are granted to be safe and stable.
   * `SpeechBubbleRenderer`
   * `renderSpeechBubbleResultItem`
 * `mumuki.locale`
+* `mumuki.exercise`
+   * `id`: the `id` of the currently loaded exercise, if any
+   * `layout`: the `layout` of the currently loaded exercise, if any
+* `mumuki.incognitoUser`: whether the current user is an incognito user
 * `mumuki.MultipleScenarios`
   * `scenarios`
   * `currentScenarioIndex`
@@ -369,14 +379,14 @@ contents. There are two different approaches:
 
 ```javascript
 // simplest method - you can register just one
-mumuki.submission.registerContentSyncer(() => {
+mumuki.editors.registerContentSyncer(() => {
   // ... write here your custom component content...
   $('#mu-custom-editor-value').val(/* ... */);
 });
 
 // alternate method
 // you can register many sources
-mumuki.CustomEditor.addSource({
+mumuki.editors.addCustomSource({
   getContent() {
     return { name: "solution[content]", value: /* ... */ } ;
   }

data/Rakefile

@@ -27,8 +27,14 @@ require 'rspec/core/rake_task'
 desc "Run all specs in spec directory (excluding plugin specs)"
 RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
 
+desc "Force development environment, required by javascript specs"
+task :development do
+  ENV['RACK_ENV'] = 'development'
+  ENV['RAILS_ENV'] = 'development'
+end
+
 desc "Run the javascript specs"
-task :teaspoon => "app:teaspoon"
+task teaspoon: [:development, "app:teaspoon"]
 
 task default: :spec
 

data/app/assets/javascripts/mumuki_laboratory/application/alias-modes.js

@@ -1,4 +1,4 @@
-mumuki.load(function () {
+mumuki.load(() => {
 
   function CodeMirrorAlias(alias, current) {
     CodeMirror.defineMIME(alias, CodeMirror.mimeModes[current]);

data/app/assets/javascripts/mumuki_laboratory/application/bridge.js

@@ -1,60 +1,41 @@
 /**
- * @typedef {{status: string, test_results: [{status: string, title: string}]}} ClientResult
+ * @typedef {"errored"|"failed"|"passed_with_warnings"|"passed"|"pending"|"aborted"} SubmissionStatus
  */
 
 /**
- * @typedef {{solution: object, client_result?: ClientResult}} Submission
+ * @typedef {{
+ *  status: SubmissionStatus,
+ *  test_results: [{status: SubmissionStatus, title: string}]
+ * }} SubmissionClientResult
  */
 
-var mumuki = mumuki || {};
-
-(function (mumuki) {
-  var lastSubmission = {};
-
-  function Laboratory(exerciseId){
-    this.exerciseId = exerciseId;
-  }
-
-  function asString(json){
-    return JSON.stringify(json);
-  }
-
-  function sameAsLastSolution(newSolution){
-    return asString(lastSubmission.content) === asString(newSolution);
-  }
-
-  function lastSubmissionFinishedSuccessfully(){
-    return lastSubmission.result && lastSubmission.result.status !== 'aborted';
-  }
-
-  function sendNewSolution(submission){
-    var token = new mumuki.CsrfToken();
-    var request = token.newRequest({
-      type: 'POST',
-      url: window.location.origin + window.location.pathname + '/solutions' + window.location.search,
-      data: submission
-    });
-
-    return $.ajax(request).then(preRenderResult).done(function (result) {
-      lastSubmission = { content: {solution: submission.solution}, result: result };
-    });
-  }
+/**
+ * @typedef {{
+  *  status: SubmissionStatus,
+  *  class_for_progress_list_item?: string,
+  *  guide_finished_by_solution?: boolean
+  * }} SubmissionResult
+  */
 
+/**
+ * @typedef {object} Solution
+ */
 
-  /**
-   * Pre-renders some html parts of submission UI
-   * */
-  function preRenderResult(result) {
-    result.class_for_progress_list_item = mumuki.renderers.progressListItemClassForStatus(result.status, true)
-    return result;
-  }
+/**
+ * @typedef {{
+ *  "solution[content]"?:string,
+ *  solution?: Solution,
+ *  client_result?: SubmissionClientResult
+ * }} Submission
+ */
 
-  mumuki.load(function () {
-    lastSubmission = {};
-  });
+/**
+ * @typedef {{submission?: Submission, result?: SubmissionResult}} SubmissionAndResult
+ */
 
-  Laboratory.prototype = {
+mumuki.bridge = (() => {
 
+  class Laboratory {
     // ==========
     // Public API
     // ==========
@@ -65,9 +46,9 @@ var mumuki = mumuki || {};
      *
      * @param {object} content the content object
      * */
-    runTests: function(content) {
+    runTests(content) {
       return this._submitSolution({ solution: content });
-    },
+    }
 
     // ===========
     // Private API
@@ -77,18 +58,46 @@ var mumuki = mumuki || {};
      * Sends a solution object
      *
      * @param {Submission} submission the submission object
+     * @returns {JQuery.Promise<SubmissionResult>}
      */
-    _submitSolution: function (submission) {
-      if(lastSubmissionFinishedSuccessfully() && sameAsLastSolution(submission)){
-        return $.Deferred().resolve(lastSubmission.result);
+    _submitSolution(submission) {
+      const lastSubmission = mumuki.SubmissionsStore.getSubmissionResultFor(mumuki.exercise.id, submission);
+      if (lastSubmission) {
+        return $.Deferred().resolve(lastSubmission);
       } else {
-        return sendNewSolution(submission);
+        return this._sendNewSolution(submission).done((result) => {
+          mumuki.SubmissionsStore.setSubmissionResultFor(mumuki.exercise.id, {submission, result});
+        });
       }
     }
-  };
 
-  mumuki.bridge = {
-    Laboratory: Laboratory
-  };
+    /**
+     * @param {Submission} submission the submission object
+     * @returns {JQuery.Promise<SubmissionResult>}
+     */
+    _sendNewSolution(submission){
+      var token = new mumuki.CsrfToken();
+      var request = token.newRequest({
+        type: 'POST',
+        url: window.location.origin + window.location.pathname + '/solutions' + window.location.search,
+        data: submission
+      });
+      return $.ajax(request).then((result) => this._preRenderResult(result));
+    }
+
+    /**
+     * Pre-renders some html parts of submission UI, adding them to the given result
+     *
+     * @param {SubmissionResult} result
+     * @returns {SubmissionResult}
+     */
+    _preRenderResult(result) {
+      result.class_for_progress_list_item = mumuki.renderers.progressListItemClassForStatus(result.status, true)
+      return result;
+    }
+  }
 
-}(mumuki));
+  return {
+    Laboratory
+  };
+})();

data/app/assets/javascripts/mumuki_laboratory/application/codemirror-builder.js

@@ -1,12 +1,4 @@
-var mumuki = mumuki || {};
-
-(function (mumuki) {
-
-  function CodeMirrorBuilder(textarea) {
-    this.textarea = textarea;
-    this.$textarea = $(textarea);
-  }
-
+(() => {
   function submit() {
     $('body').removeClass('fullscreen');
     $('.editor-resize .fa-stack-1x').removeClass('fa-compress').addClass('fa-expand');
@@ -29,8 +21,13 @@ var mumuki = mumuki || {};
     autoRefresh: true
   };
 
-  CodeMirrorBuilder.prototype = {
-    setupEditor: function () {
+  class CodeMirrorBuilder {
+    constructor(textarea) {
+      this.textarea = textarea;
+      this.$textarea = $(textarea);
+    }
+
+    setupEditor() {
       this.editor = this.createEditor({
         lineNumbers: true,
         extraKeys: {
@@ -47,8 +44,9 @@ var mumuki = mumuki || {};
       });
 
       return this;
-    },
-    setupSimpleEditor: function () {
+    }
+
+    setupSimpleEditor() {
       this.editor = this.createEditor({
         mode: 'text',
         extraKeys: {
@@ -61,8 +59,9 @@ var mumuki = mumuki || {};
       });
 
       return this;
-    },
-    setupReadOnlyEditor: function () {
+    }
+
+    setupReadOnlyEditor() {
       this.editor = this.createEditor({
         readOnly: true,
         cursorBlinkRate: -1, //Hides the cursor
@@ -70,8 +69,9 @@ var mumuki = mumuki || {};
       });
 
       return this;
-    },
-    setupLanguage: function (language) {
+    }
+
+    setupLanguage(language) {
       var highlightMode = language || this.$textarea.data('editor-language');
       if (highlightMode === 'dynamic') {
         mumuki.page.dynamicEditors.push(this.editor);
@@ -81,20 +81,23 @@ var mumuki = mumuki || {};
       }
 
       return this;
-    },
-    setupMinLines: function (minLines) {
+    }
+
+    setupMinLines(minLines) {
       this.editor.setOption('minLines', minLines);
 
       return this;
-    },
-    build: function () {
+    }
+
+    build() {
       return this.editor;
-    },
-    createEditor: function (customOptions) {
+    }
+
+    createEditor(customOptions) {
       return CodeMirror.fromTextArea(this.textarea, Object.assign({}, codeMirrorDefaults, customOptions));
     }
-  };
+  }
 
   mumuki.editor = mumuki.editor || {};
   mumuki.editor.CodeMirrorBuilder = CodeMirrorBuilder;
-}(mumuki));
+})();

data/app/assets/javascripts/mumuki_laboratory/application/codemirror.js

@@ -1,6 +1,9 @@
-var mumuki = mumuki || {};
+mumuki.editor = mumuki.editor || {};
+mumuki.page = mumuki.page || {};
+mumuki.page.dynamicEditors = [];
+mumuki.page.editors = [];
 
-(function (mumuki) {
+(() => {
   function createCodeMirrors() {
     return $(".editor").map(function (index, textarea) {
       var $textarea = $("#solution_content");
@@ -68,21 +71,16 @@ var mumuki = mumuki || {};
     });
   }
 
-  mumuki.editor = mumuki.editor || {};
   mumuki.editor.reset = resetEditor;
   mumuki.editor.toggleFullscreen = toggleFullscreen;
   mumuki.editor.formatContent = formatContent;
   mumuki.editor.indentWithSpaces = indentWithSpaces;
   mumuki.editor.syncContent = syncContent;
 
-  mumuki.page = mumuki.page || {};
-  mumuki.page.dynamicEditors = [];
-  mumuki.page.editors = [];
 
-
-  mumuki.load(function () {
+  mumuki.load(() => {
     mumuki.page.editors = createCodeMirrors();
-    mumuki.submission.registerContentSyncer(mumuki.editor.syncContent);
+    mumuki.editors.registerContentSyncer(mumuki.editor.syncContent);
     updateCodeMirrorLanguage();
     onSelectUpdateCodeMirror();
 
@@ -101,4 +99,4 @@ var mumuki = mumuki || {};
     });
   });
 
-}(mumuki));
+})();

data/app/assets/javascripts/mumuki_laboratory/application/confirmation.js

@@ -1,5 +1,5 @@
-mumuki.load(function () {
-  $('.btn-confirmation').on('click change', function (evt) {
+mumuki.load(() => {
+  $('.btn-confirmation').on('click change', function (_evt) {
     var token = new mumuki.CsrfToken();
 
     $.ajax(token.newRequest({

data/app/assets/javascripts/mumuki_laboratory/application/console.js

@@ -1,5 +1,4 @@
-var mumuki = mumuki || {};
-(function (mumuki) {
+(() => {
   function historicalQueries() {
     var queries = $('#historical_queries').val();
     if (queries) {
@@ -36,65 +35,64 @@ var mumuki = mumuki || {};
     $('.jquery-console-prompt-box:not(:last)').remove()
   }
 
-  function QueryConsole() {
-    this.endpoint = $('#console_endpoint').val();
-    this.token = new mumuki.CsrfToken();
-    this.statefulConsole = $('#stateful_console').val() === "true";
-    this.lines = [];
-  }
-
-  QueryConsole.prototype = {
-    newQuery: function (line) {
+  class QueryConsole {
+    constructor() {
+      this.endpoint = $('#console_endpoint').val();
+      this.token = new mumuki.CsrfToken();
+      this.statefulConsole = $('#stateful_console').val() === "true";
+      this.lines = [];
+      this.controller = null;
+    }
+    newQuery(line) {
       var cookies = this.statefulConsole ? this.lines : [];
       return new Query(line, cookies, this);
-    },
-    clearState: function () {
+    }
+    clearState() {
       this.lines = [];
       clearConsole();
-    },
-    sendQuery: function (queryContent) {
+    }
+    sendQuery(queryContent) {
       this.controller.promptText(queryContent);
       this.controller.typer.commandTrigger();
-    },
-    preloadQuery: function (queryWithResults) {
+    }
+    preloadQuery(queryWithResults) {
       this.lines.push(queryWithResults.query);
       this.enqueuePreloadedQuery(queryWithResults);
       this.sendQuery(queryWithResults.query);
-    },
-    enqueuePreloadedQuery: function (queryWithResults) {
+    }
+    enqueuePreloadedQuery(queryWithResults) {
       this.preloadedQuery = queryWithResults;
-    },
-    dequeuePreloadedQuery: function () {
+    }
+    dequeuePreloadedQuery() {
       var result = this.preloadedQuery;
       this.preloadedQuery = undefined;
       return result;
-    },
-    preloadHistoricalQueries: function () {
+    }
+    preloadHistoricalQueries() {
       var self = this;
       historicalQueries().forEach(function (queryWithResults) {
         self.preloadQuery(queryWithResults);
       });
     }
-  };
-
-  function Query(line, cookie, console) {
-    this.console = console;
-    this.line = line;
-    this.cookie = cookie;
   }
 
-  Query.prototype = {
+  class Query {
+    constructor(line, cookie, console) {
+      this.console = console;
+      this.line = line;
+      this.cookie = cookie;
+    }
     get token() {
       return this.console.token;
-    },
+    }
     get content() {
       var firstEditor = mumuki.page.editors[0];
       if (firstEditor && $("#include_solution").prop("checked"))
         return firstEditor.getValue();
       else
         return '';
-    },
-    submit: function (report, queryConsole, line) {
+    }
+    submit(report, queryConsole, line) {
       var self = this;
       var preloadedQuery = queryConsole.dequeuePreloadedQuery();
       if (preloadedQuery) {
@@ -110,8 +108,8 @@ var mumuki = mumuki || {};
       }).fail(function (response) {
         reportStatus(response.responseText, 'failed', report);
       });
-    },
-    displayGoalResult: function (response) {
+    }
+    displayGoalResult(response) {
       if (response.status == 'passed') {
         $('.submission-results').show();
         $('.submission-results').html(response.html);
@@ -121,15 +119,15 @@ var mumuki = mumuki || {};
         $('.submission-results').hide();
         $('.progress-list-item.active').attr('class', "progress-list-item text-center danger active");
       }
-    },
-    displayQueryResult: function (report, queryConsole, line, response) {
+    }
+    displayQueryResult(report, queryConsole, line, response) {
       if (response.status !== 'errored') {
         queryConsole.lines.push(line);
         reportStatus(response.result, response.status, report);
       } else {
         reportStatus(response.result, 'failed', report);
       }
-    },
+    }
     get _request() {
       var self = this;
       return self.token.newRequest({
@@ -137,17 +135,17 @@ var mumuki = mumuki || {};
         type: 'POST',
         data: self._requestData
       })
-    },
+    }
     get _requestUrl() {
       return this.console.endpoint;
-    },
+    }
     get _requestData() {
       return {content: this.content, query: this.line, cookie: this.cookie};
     }
-  };
+  }
 
 
-  mumuki.load(function () {
+  mumuki.load(() => {
     var prompt = $('#prompt').attr('value');
     var queryConsole = new QueryConsole();
 
@@ -172,4 +170,4 @@ var mumuki = mumuki || {};
     queryConsole.preloadHistoricalQueries();
   });
 
-}(mumuki));
+})();