mumuki-gobstones-runner 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abbf0ec6c1d486eadb06f71d4d479a520700c79376ab9d1e785a8fc658485624
-  data.tar.gz: 60dc12c4d5e60614a94987ae2c725892cb6e06065aefd673952cf0f73880ce06
+  metadata.gz: 2438326f59bc9d3a85086e5bf5c11edc44cb2907d64fda30c23a9dcd8f952f16
+  data.tar.gz: 16ea0ef08aed78f7f24b67d21088b7ab3f0b6bee8fd4d42798010ef5915000b5
 SHA512:
-  metadata.gz: f253ffce6bfffc3aa0af02995cd3739df9a1ccb2122c6c7fbdb70883b3cb7da9ef6078372a1aa141fe62561491c929450fe2e9ba30fe7d8dad5561abc57f6c55
-  data.tar.gz: d7227916c7b0e94173319e8753364ceec1818a07aa10f70e155735549872c6541cf7065235be16f0d43aece40df847c3a5ee1842e20c33fa205161fafa0b23d0
+  metadata.gz: f762dc032fd7d2f32cadf4d88fb4d2c14659e270af017bc498bb2dfcd65e91f38c1314fb23c44d05f87ef1e2c3bbc681f45c08de444769d2e60d009ecff62e0c
+  data.tar.gz: 5fa4241b9d422bba3ac77803fefe331958830d0c110fa80cec8b2dd80cf544b31447cc4b73e1188b2a46dfca3585aebc13f3719a415406b101d65bed00766751

data/lib/assets_server.rb

@@ -54,6 +54,8 @@ class Mumukit::Server::App < Sinatra::Base
 
   get '/assets/editor/editor.html' do
     cross_origin
+    content_type 'text/html'
+
     @game_framework_extra = Gobstones::CompilationMode::GameFramework.extra_code
     @game_framework_program = Gobstones::CompilationMode::GameFramework.program_code
     @game_framework_default = Gobstones::CompilationMode::GameFramework.default_code

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

@@ -9,6 +9,11 @@
   Blockly.FieldImage.prototype.setValue = function(a) {
     if (a && a.startsWith("undefined")) {
       console.debug(`Ignoring unavailable image ${a}`);
+    } else if (a) {
+      const absoluteUrl = a
+        .replace("../media/", "../local-media/")
+        .replace("../local-media/", "<%= @assets_url %>/local-media/");
+      this.__setValue__(absoluteUrl);
     } else {
       this.__setValue__(a);
     }
@@ -282,12 +287,18 @@
       },
 
       _updateSolution() {
+        console.debug("Updating solution");
         const blockly = this._getBlockly();
-
+        let changed;
         if (this.teacherMode) {
-          this._setExtraCode(blockly.workspaceXml);
+          changed = this._setExtraCode(blockly.workspaceXml);
         } else {
-          this._setStudentSolution(blockly.workspaceXml);
+          changed = this._setStudentSolution(blockly.workspaceXml);
+        }
+
+        if (!changed) {
+          console.debug("No solution update required")
+          return;
         }
 
         // TODO: this hack enables Angular two-way binding for Bibliotheca. Should be replaced with Mumuki events system
@@ -380,22 +391,44 @@
           return;
         }
 
-        const blockly = this._getBlockly();
+        console.debug("Set teacher actions");
         const actions = new Parser().getActionsFromSource(teacherCode);
-        blockly.primitiveProcedures = this._withDefaultIcons(actions, 'procedureDeclarations');
-        blockly.primitiveFunctions = this._withDefaultIcons(actions, 'functionDeclarations');
+
+        this._setPrimitiveProcedures(this._withDefaultIcons(actions, 'procedureDeclarations'));
+        this._setPrimitiveFunctions(this._withDefaultIcons(actions, 'functionDeclarations'));
       },
 
       _setGameActions() {
+        if (!this._isGame()) {
+          return;
+        }
+
+        console.debug("Set game actions");
         const blockly = this._getBlockly();
-        if (this._isGame()) {
-          blockly.primitiveProcedures = blockly.primitiveProcedures || [];
-          blockly.primitiveProcedures = blockly.primitiveProcedures.concat([
-            this._gamePrimitive('ShiftUp'),
-            this._gamePrimitive('ShiftDown'),
-            this._gamePrimitive('ShiftLeft'),
-            this._gamePrimitive('ShiftRight')
-          ]);
+
+        this._setPrimitiveProcedures((blockly.primitiveProcedures || []).concat([
+          this._gamePrimitive('ShiftUp'),
+          this._gamePrimitive('ShiftDown'),
+          this._gamePrimitive('ShiftLeft'),
+          this._gamePrimitive('ShiftRight')
+        ]));
+      },
+
+      _setPrimitiveProcedures(procedures) {
+        this._setBlocklyActions("primitiveProcedures", procedures);
+      },
+
+      _setPrimitiveFunctions(functions) {
+        this._setBlocklyActions("primitiveFunctions", functions);
+      },
+
+      _setBlocklyActions(key, actions) {
+        try {
+          this._getBlockly()[key] = actions
+        } catch (e) {
+          if (this._getBlockly()[key] !== actions) {
+            throw e;
+          }
         }
       },
 
@@ -416,8 +449,12 @@
        * to user content in laboratory, and default content in bibliotheca
        */
       _setStudentSolution(code) {
-        console.debug(`Setting student ${code}`)
-        this._getStudentEditor().value = code;
+        if (this._getStudentEditor().value !== code) {
+          console.debug(`Setting student ${code}`)
+          this._getStudentEditor().value = code;
+          return true;
+        }
+        return false;
       },
 
       _getDefaultCode() {
@@ -429,8 +466,12 @@
       },
 
       _setExtraCode(code) {
-        console.debug(`Setting extra ${code}`)
-        this._getEditorExtra().value = code;
+        if (this._getEditorExtra().value !== code) {
+          console.debug(`Setting extra ${code}`)
+          this._getEditorExtra().value = code;
+          return true;
+        }
+        return false;
       },
 
       _getEditorExtra: function() {

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module GobstonesVersionHook
-  VERSION = '2.10.0'
+  VERSION = '2.10.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-gobstones-runner
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Rodrigo Alfonso