mumuki-gobstones-runner 2.8.5 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a1f462df1de2aa09e7025bc39fb066ebae0cf95203e2863276e549c57b35550
-  data.tar.gz: b1e8fbb1a19f96b130b5a5a25b3d8e582932b5c1d4063ece0ddcfe5358394980
+  metadata.gz: 8649ceb9e6f82c9af3f51dcd2e043789db0c332dfc5e9527255cc62556a36df7
+  data.tar.gz: 1bd206f906582c08ae1f4d868d101c624acf13e75f44d5a2ff40d72586a20cc5
 SHA512:
-  metadata.gz: dbb901882298f1c889730748bfb60ba8016535198e2953d6f5b72f986f617c65230cdf06b7a7a6326459d9a11b2d46945df9dc1c9faf10c5b46f05fcab65fa8e
-  data.tar.gz: 3ce96b0e01751e64a831a56565352eb378b612aee687d074e116911d305004f97e7c9feacb5522b2582b264a1ad90c1a67fdb4ded965504c2a56aa1a427bfe5e
+  metadata.gz: 6e614deb4c8f6872f4e46ef40635994b43895f398f40b2c8d6a13aa5e3b88da29ba1b7ff12e7227f7993ca49b651858d57dfba7345414ab8b1bd3e6172845123
+  data.tar.gz: 54e15f720eca89a266dc4c6a7363c7ace0f58f02d5d7f3ead5e20cc92753779f6ed784ad39505f6fb375e5efd75747abd73d2dfb449eb08464140ab9f46a0cae

data/lib/checker.rb

@@ -113,6 +113,7 @@ 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 "boom_called" if code == 'boom-called'
       return "wrong_argument_type" if has_wrong_argument_type? code
       return "wrong_arguments_quantity" if code.include? 'arity-mismatch'
 

data/lib/render/editor/editor.css

@@ -124,3 +124,7 @@
 .mu-kids-exercise.mu-kindergarten .mu-scenario.active table.gbs_board {
   display: block !important;
 }
+
+.mu-kids-exercise.mu-kindergarten .gbs_gh {
+  outline: 0 !important;
+}

data/lib/render/editor/editor.html.erb

@@ -5,6 +5,24 @@
 <script src="./hammer.min.js"></script>
 
 <script>
+  Blockly.FieldImage.prototype.__setValue__ = Blockly.FieldImage.prototype.setValue;
+  Blockly.FieldImage.prototype.setValue = function(a) {
+    if (a && a.startsWith("undefined")) {
+      console.debug(`Ignoring unavailable image ${a}`);
+    } else {
+      this.__setValue__(a);
+    }
+  }
+
+  Blockly.FieldImage.prototype.__setTooltip__ = Blockly.FieldImage.prototype.setTooltip;
+  Blockly.FieldImage.prototype.setTooltip = function(a) {
+    try {
+      this.__setTooltip__(a);
+    } catch (_e) {
+      console.debug('Could not set tooltip');
+    }
+  }
+
   function postpone(action) {
     return setTimeout(action, 50);
   }
@@ -115,10 +133,28 @@
         this._scrollToMainBlock();
       },
 
-      setToolbox(toolboxXml) {
-        this._getBlockly().toolbox = { defaultToolbox: toolboxXml };
-        // Blockly's workspace is destroyed when toolbox changes, so we initialize it here.
-        this._initializeBlocklyWorkspace();
+      /**
+       * Configures a custom toolbox using a toolbox url
+       * This method does nothing if editor is read-only, but
+       * assumes a gs-toolbox element is present - otherwise it would
+       * have no sense to have a toolboxUrl.
+       */
+      configureCustomToolboxFromUrl(toolboxUrl) {
+        if (this.readOnly) return;
+
+        console.debug('Configuring custom toolbox');
+
+        $.get(toolboxUrl, (toolboxXml) => {
+          this._initializeCustomToolboxBlocklyWorkspace(toolboxXml);
+        });
+      },
+
+      /**
+       * Wether a custom toolbox is required. Read only editors and gs-toolbox-less context
+       * don't require it
+       */
+      hasCustomToolbox() {
+        return !this.readOnly && $('gs-toolbox').length;
       },
 
       compile(code) {
@@ -129,10 +165,6 @@
         return this._getBlockly().initialXml.indexOf("block type=\"InteractiveProgram\"") !== -1;
       },
 
-      hasCustomToolbox() {
-        return $('gs-toolbox').length;
-      },
-
       toggleInteractiveMode() {
         this.$exerciseContainer.toggleClass('play-mode');
         this._triggerResize();
@@ -191,12 +223,7 @@
       _configureBlocklyBehavior() {
         this._setTeacherActions();
         this._setGameActions();
-
-        // Blockly's workspace is destroyed when toolbox changes, so it doesn't make sense to initialize it here.
-        if (!this.hasCustomToolbox()) {
-          this._initializeBlocklyWorkspace();
-        }
-
+        this._initializeNonCustomToolboxBlocklyWorkspace();
         this._registerLayoutChangedEvent();
       },
 
@@ -208,7 +235,34 @@
         $(window).resize(() => this._relocateTrash());
       },
 
+
+      /**
+       * Initializes a workspace using a custom toolbox.
+       *
+       * Blockly's workspace is destroyed when toolbox changes, so initialization
+       * is performed here
+       */
+      _initializeCustomToolboxBlocklyWorkspace(toolboxXml) {
+        this._getBlockly().toolbox = { defaultToolbox: toolboxXml };
+        this._initializeBlocklyWorkspace();
+      },
+
+      /**
+       * Initializes a workspace using a non-custom toolbox.
+       *
+       * Blockly's workspace is destroyed when toolbox changes,
+       * so this method will initialize it only if a there is a custom toolbox
+       * that will be called later.
+       */
+      _initializeNonCustomToolboxBlocklyWorkspace() {
+        if (!this.hasCustomToolbox()) {
+          this._initializeBlocklyWorkspace();
+        }
+      },
+
       _initializeBlocklyWorkspace() {
+        console.debug('Initializing Blockly Workspace');
+
         this._setInitialXml();
         this._initializeWorkspace();
         this._subscribeToWorkspace(() => this._updateSolution());
@@ -945,10 +999,12 @@
       },
 
       _setEditorToolbox: function () {
-        const editor = $("mu-gobstones-custom-editor")[0];
-        $.get(this.toolboxUrl, function (toolboxXml) {
-          editor.setToolbox(toolboxXml);
-        });
+        const $editor = $("mu-gobstones-custom-editor")[0];
+
+        // there is no editor to configure
+        if (!$editor) return;
+
+        $editor.configureCustomToolboxFromUrl(this.toolboxUrl);
       }
     });
   </script>

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module GobstonesVersionHook
-  VERSION = '2.8.5'
+  VERSION = '2.9.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-gobstones-runner
 version: !ruby/object:Gem::Version
-  version: 2.8.5
+  version: 2.9.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-16 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gobstones-board