mumuki-gobstones-runner 1.12.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 723bbfbcc40eeb896fff1a108034ed476bece40a65c756d3142de9d557063c7e
-  data.tar.gz: 7da68cd760020ce4bd4fdaa49443101a53f72d8c1957444767da42578cfa0c5c
+  metadata.gz: ba2ba3ad0ac2a0fe242c7a5ac0be73e6abfe0cd59e605fa763620e6b086cabad
+  data.tar.gz: 88044e138b6b6a208c2047479a0f44166fa9de72c0cdcf061ff67e1afd905e64
 SHA512:
-  metadata.gz: 8451a0d0d8c65ab5af1e2986aec3126dc46e887a83fca0ddfea0f9bbfa3f7206749d981cd51bced05da712d37af8e7a1368e9bcf9a227f156cffd39e3abbda39
-  data.tar.gz: c226b89c9ef297094423efd971e29c233c8dff01fada80b4451c217857dd27f2cb047716aa36e5b25e448fbed1792be916bcae88cb2289e582f8b4e4f03298e9
+  metadata.gz: f8f1b910a07058d709e8e590193e3c124701d68f2ac3ff24034b1a7aa96546fec0649db037c57894c3f4d85f9ac93b804c8a3aec4a7ac8b2f1587021e26347e8
+  data.tar.gz: 73c81f0a3366f144132e243f16cee9fc97dd614f6a26cf08ea8e07e8e88947d9e39e42a76cd56c5dcdc61832d062d9396b49cfae51dc55dfe419a7b3d9807826

data/lib/checker.rb

@@ -113,16 +113,12 @@ module Gobstones
       return "no_stones" if code == 'cannot-remove-stone'
       return "out_of_board" if code == 'cannot-move-to'
       return "unassigned_variable" if code == 'undefined-variable'
-      return "wrong_argument_type" if has_wrong_argument_type? code
+      return "wrong_argument_type" if code.include? 'type-mismatch'
       return "wrong_arguments_quantity" if code.include? 'arity-mismatch'
 
       code
     end
 
-    def has_wrong_argument_type?(code)
-      code.match Regexp.union('type-mismatch', 'expected-value-of-type')
-    end
-
     def adapt_value(return_value)
       type = return_value[:type]
       value = return_value[:value]

data/lib/render/boards.html.erb

@@ -36,9 +36,9 @@
   <% @result[:boards].each do |it| %>
     <div class="board">
       <p class="title"><%=I18n.t it.title %></p>
-      <p>
+      <p class="<%= it.title %>">
         <% if it.board.boom %>
-          <img src=<%= "#{Mumukit.runner_url}/assets/boom.png" %> />
+          <gs-board boom></gs-board>
         <% else %>
           <gs-board <%= it.title == :expected_board && !@options[:check_head_position] ? "without-header" : "" %>>
             <%= it.board.gbb %>

data/lib/render/editor/editor.css

@@ -62,3 +62,9 @@
 .gbs_gh {
   outline: 1px solid #cc0000 !important;
 }
+
+@-moz-document url-prefix() {
+  .mu-kids-exercise gs-board table.gbs_board {
+    position: absolute;
+  }
+}

data/lib/render/editor/editor.html

@@ -412,23 +412,33 @@
             this._onResetState();
           })
         };
+        const _getScenarioSelector = function (scenario) {
+          return `.mu-state-${scenario} .mu-kids-state-image > *`;
+        };
+
+        const _createMultipleScenarios = () => {
+          const scenarios = ['initial', 'final'];
+          const scenarioSelectors = scenarios.map(it => _getScenarioSelector(it));
+          this.multipleScenarios = new mumuki.MultipleScenarios(scenarioSelectors);
+        };
 
         const setInitialState = () => {
-          const initialBoard = this._getTargetBoard();
-          if (!initialBoard.size) return postpone(setInitialState);
+          const initialBoards = this._getInitialBoards();
+          if (!initialBoards[0].size) return postpone(setInitialState);
 
-          this.initialState = {
-            size: initialBoard.size,
-            table: initialBoard.table,
-            header: initialBoard.header
-          };
+          this.initialState = initialBoards.toArray().map((board) => this._boardToState(board));
 
           resetStatusAfterAborted();
-        }
+        };
 
+        _createMultipleScenarios();
         setInitialState();
       },
 
+      _boardToState : function ({size, table, header, boom}) {
+        return {size, table, header, boom}
+      },
+
       _onRunRequest: function (event) {
         const {detail: controller} = event;
 
@@ -443,6 +453,7 @@
         this._cleanState();
         this._cleanErrors(finalBoard);
 
+        this.targetState = this._boardToState(finalBoard);
         const promise = new mumuki.bridge.Laboratory()
           .runTests(solution)
           .then((results) => {
@@ -456,7 +467,7 @@
         this.serverPromise = promise;
 
         controller.start({
-          initialState: this.initialState,
+          initialState: this.targetState,
           code: {
             main: code,
             library: "",
@@ -500,9 +511,46 @@
 
       _onExecutionStop: function (data) {
         this._cleanState();
+        this._setResultsBoards(data.test_results);
         mumuki.kids.showResult(data);
       },
 
+      _setResultsBoards: function (testResults) {
+        if (!testResults) return;
+        const testResultsBoards = this._testResultsBoards(testResults);
+        this._updateBoards(testResultsBoards);
+        const testResultsStatuses = this._testResultsStatuses(testResults);
+        this.multipleScenarios.updateIndicators(testResultsStatuses);
+      },
+
+      _testResultsBoards: function (testResults) {
+        return testResults.map(it => $(it.result).find('.actual_board > *, .final_board > *')[0]);
+      },
+
+      _testResultsStatuses: function (testResults) {
+        return testResults.map(it => it.status);
+      },
+
+      _updateBoards: function (resultsBoards) {
+        const initialBoards = this.multipleScenarios.scenarios[0];
+        resultsBoards.forEach((resultScenario, index) => {
+          if (this.multipleScenarios.currentScenarioIndex === index) return;
+          const currentBoard = initialBoards[index];
+          this._updateBoardFromResult(currentBoard.firstChild, resultScenario);
+        });
+      },
+
+      _updateBoardFromResult: function (originalBoard, resultBoard) {
+        resultBoard = resultBoard.cloneNode(); // To force initialization
+        if (resultBoard.textContent) {
+          const boardAttrs = gbbReader.fromString(resultBoard.textContent);
+          originalBoard.update(boardAttrs.table, boardAttrs.header);
+        }
+        else {
+          originalBoard.boom = resultBoard.boom;
+        }
+      },
+
       _updateBoard: function (state, finalBoard) {
         const {error, table, head} = state;
 
@@ -561,8 +609,12 @@
         return $("mu-gobstones-custom-editor")[0];
       },
 
+      _getInitialBoards: function () {
+        return $(".mu-kids-gbs-board-initial gs-board");
+      },
+
       _getTargetBoard: function () {
-        return $(".mu-kids-gbs-board-initial gs-board")[0];
+        return this._getInitialBoards().parent('.active').children()[0];
       },
 
       _getSubmitCss: function (isWaiting) {
@@ -573,17 +625,20 @@
         return isWaiting ? "visible" : "hidden";
       },
 
-      _resetBoard: function () {
-        const initialState = this.initialState;
-        const initialBoard = this._getTargetBoard();
-        initialBoard.update(initialState.table, initialState.header);
-        initialBoard.boom = false;
+      _resetBoards: function () {
+        const boards = this._getInitialBoards();
+        this.initialState.forEach(({table, header, boom}, index) => {
+          const board = boards[index];
+          board.update(table, header);
+          board.boom = boom;
+        });
       },
 
       _onResetState: function () {
         this._getBlockly().workspace.removeBlockErrors();
-        this._resetBoard();
+        this._resetBoards();
         this._toggleInitialState();
+        this.multipleScenarios.resetIndicators();
         mumuki.kids.restart();
       },
 
@@ -649,9 +704,13 @@
 <dom-module id="gs-attire-toggle-button">
   <style>
     .button {
-      padding: 5px;
+      position: absolute;
       cursor: pointer;
-      float: right;
+      top: -2px;
+      right: 0;
+      -ms-transform-origin: right center;
+      -webkit-transform-origin: right center;
+      transform-origin: right center;
     }
   </style>
 
@@ -680,6 +739,7 @@
 
       ready: function () {
         document.addEventListener('board-attire-changed', this._updateVisibility.bind(this));
+        this._relocateButton();
       },
 
       _updateVisibility: function () {
@@ -694,7 +754,23 @@
           if (board.attire) board.set("attire.enabled", this.isEnabled);
           gbsBoardRemoveBorder(board);
         });
-      }
+      },
+
+      _relocateButton: function () {
+        const $container = $('.mu-kids-gbs-board-initial');
+        if(!$container.length) return;
+        const $header = $('.mu-initial-state-header');
+        const $attireToggle = $container.find('.button.gs-attire-toggle-button');
+        if(!$attireToggle.length) return setTimeout(() => this._relocateButton());
+        const margin = 4; // Leave a margin between text and image
+        const maxSize = 65.75; // Original width
+        mumuki.resize(() => {
+          $attireToggle.css('transform', 'scale(1)');
+          let buttonSize = (($container.width() - $header.width()) / 2) - margin;
+          let scaleX = Math.min(buttonSize, maxSize) / $attireToggle.width();
+          $attireToggle.css('transform', `scale(${scaleX})`);
+        });
+      },
     });
   </script>
 </dom-module>

data/lib/render/editor/editor.js

@@ -1,5 +1,5 @@
 $(document).ready(function () {
   $(".mu-kids-submit-button").html("<kids-submit-button></kids-submit-button>");
   $(".mu-kids-reset-button").html("<kids-reset-button></kids-reset-button>");
-  $(".mu-kids-states").prepend("<gs-attire-toggle-button></gs-attire-toggle-button>");
+  $(".mu-initial-state-header").append("<gs-attire-toggle-button></gs-attire-toggle-button>");
 });

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module GobstonesVersionHook
-  VERSION = '1.12.1'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-gobstones-runner
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Gobstones Runner for Mumuki