mumuki-gobstones-runner 2.12.1 → 2.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 471512b781af57084f5a0aeef2422931db62ebba489e2988e696eb1d58f72a14
-  data.tar.gz: 01bb5e8b9275e2b31c6fe658c8234ed03a1acf7fd476ba423862fbca36580903
+  metadata.gz: 1b244e3280bfaca356fd1ef62b451f829961373477c9246531b87bf80c37efbf
+  data.tar.gz: 58e31a7aae944b043c4be7a471d8f3622d47205a3be0395c0350f6b7425597b8
 SHA512:
-  metadata.gz: 236ee1be573d9baa4b852e085d8248d4e15c18e01d82c4f2c884d8be8b0bc5f52cfe694d1cd8eadf35a393ce24bc70faf4776006d15e26b76606572bace7464b
-  data.tar.gz: 78b60bee1aa0fb52fd9dbd9e3da72ca609867665b548fa358ffbdbdd09a61a91e9d43175015f9474c14413a94ce42964e4a8334bd1144a29b640b2eadd1160fe
+  metadata.gz: '0941624faa0e39fd3e52a9379c026292581085979580fc44f87bc22cc6e6568d00e2588c6a02b19b8c1d123f4325c3d18685c1e495f82258b41e7c1436fcae97'
+  data.tar.gz: 9ce27aef7d8681b10b1baa6b8d86fd4a2c08bca8ecf8e71e35e9ffa30dcec9963d37cf8f5fc79fba4c852299886fff4c47e3571caa5f2a8e1ccc9ba492d70abc

data/lib/assets_server.rb

@@ -17,10 +17,10 @@ class Mumukit::Server::App < Sinatra::Base
     get_local_asset "#{asset_type}/#{name}.svg", "lib/public/#{name}.svg", 'image/svg+xml'
   end
 
-  def self.get_media_assets(folder)
+  def self.get_media_assets(folder, content_type = nil)
     Dir.glob(File.join(__dir__,"../lib/public/#{folder}/*")).each do |path|
       relative_media_asset_path = "#{folder}/#{File.basename path}"
-      get_local_asset relative_media_asset_path, "lib/public/#{relative_media_asset_path}"
+      get_local_asset relative_media_asset_path, "lib/public/#{relative_media_asset_path}", content_type
     end
   end
 
@@ -38,9 +38,13 @@ class Mumukit::Server::App < Sinatra::Base
   get_local_asset 'editor/editor.css', 'lib/render/editor/editor.css', 'text/css'
   get_local_asset 'editor/hammer.min.js', 'lib/render/editor/hammer.min.js', 'application/javascript'
   get_local_asset 'boom.png', 'lib/public/boom.png', 'image/png'
+
+  # Depracated, prefer toolbox path
   get_local_asset 'full-kindergarten-toolbox.xml', 'lib/public/full-kindergarten-toolbox.xml', 'text/plain'
   get_local_asset 'minimal-kindergarten-toolbox.xml', 'lib/public/minimal-kindergarten-toolbox.xml', 'text/plain'
 
+  get_media_assets 'toolbox', 'text/plain'
+
   get_media_assets 'media'
   get_media_assets 'local-media'
 

data/lib/game_framework/extra.gbs.erb

@@ -62,6 +62,26 @@ procedure ShiftDown() {
   ShiftTo(Sur)
 }
 
+function one() {
+  return (1);
+}
+
+function two() {
+  return (2);
+}
+
+function three() {
+  return (3);
+}
+
+function four() {
+  return (4);
+}
+
+function five() {
+  return (5);
+}
+
 procedure ShiftTo(dir) {
   if (puedeMover(dir)) {
     Sacar(Rojo)

data/lib/public/minimal-kindergarten-toolbox.xml

@@ -1,2 +1 @@
 <category name="Procedimientos primitivos"></category>
-<category name="Funciones primitivas"></category>

data/lib/public/toolbox/kindergarten-2-to-3.xml

@@ -0,0 +1,6 @@
+<category name="Bloques de Gobstones">
+  <block type="RepeticionSimple"></block>
+  <block type="two"></block>
+  <block type="three"></block>
+</category>
+<category name="Procedimientos primitivos"></category>

data/lib/public/toolbox/kindergarten-2-to-4.xml

@@ -0,0 +1,7 @@
+<category name="Bloques de Gobstones">
+  <block type="RepeticionSimple"></block>
+  <block type="two"></block>
+  <block type="three"></block>
+  <block type="four"></block>
+</category>
+<category name="Procedimientos primitivos"></category>

data/lib/public/toolbox/kindergarten-2-to-5.xml

@@ -0,0 +1,8 @@
+<category name="Bloques de Gobstones">
+  <block type="RepeticionSimple"></block>
+  <block type="two"></block>
+  <block type="three"></block>
+  <block type="four"></block>
+  <block type="five"></block>
+</category>
+<category name="Procedimientos primitivos"></category>

data/lib/public/toolbox/kindergarten-full.xml

@@ -0,0 +1,5 @@
+<category name="Bloques de Gobstones">
+  <block type="RepeticionSimple"></block>
+</category>
+<category name="Funciones primitivas"></category>
+<category name="Procedimientos primitivos"></category>

data/lib/public/toolbox/kindergarten-minimal.xml

@@ -0,0 +1 @@
+<category name="Procedimientos primitivos"></category>

data/lib/render/editor/editor.css

@@ -133,3 +133,7 @@
     border: 1px solid #6D6E70 !important;
     border-radius: 4px;
 }
+
+.mu-kids-exercise.mu-kindergarten .blocklyBubbleCanvas {
+  display: none;
+}

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

@@ -428,11 +428,14 @@
         console.debug("Set game actions");
         const blockly = this._getBlockly();
 
-        this._setPrimitiveProcedures((blockly.primitiveProcedures || []).concat([
-          this._gamePrimitive('ShiftUp'),
-          this._gamePrimitive('ShiftDown'),
-          this._gamePrimitive('ShiftLeft'),
-          this._gamePrimitive('ShiftRight')
+        this._setPrimitiveProcedures(
+          this._gamePrimitivesFor(blockly.primitiveProcedures, [
+            'ShiftUp', 'ShiftDown', 'ShiftLeft', 'ShiftRight'
+        ]));
+
+        this._setPrimitiveFunctions(
+          this._gamePrimitivesFor(blockly.primitiveFunctions, [
+            'one', 'two', 'three', 'four', 'five'
         ]));
       },
 
@@ -458,6 +461,10 @@
         return { alias: 'procedureDeclaration', name, attributes: {block_icon: `<%= @assets_url %>/media/${name}.png`} };
       },
 
+      _gamePrimitivesFor(base, names) {
+        return (base || []).concat(names.map(it => this._gamePrimitive(it)));
+      },
+
       _getBlockly() {
         return this.$.blocklyElement;
       },
@@ -802,7 +809,7 @@
         this.$editor = $("mu-gobstones-custom-editor")[0];
       },
 
-      _boardToState : function ({size, table, header, boom}) {
+      _boardToState: function ({size, table, header, boom}) {
         return {size, table, header, boom}
       },
 
@@ -823,15 +830,11 @@
         const targetStateIndex = this.multipleScenarios.currentScenarioIndex;
         this.targetState = this.initialState[targetStateIndex];
 
-        const promise = new mumuki.bridge.Laboratory()
-          .runTests(solution)
+        const promise = mumuki.submission.sendSolution({solution})
           .then((results) => {
             if (promise !== this.serverPromise) return;
 
             this._onRemoteExecutionStop(results);
-          })
-          .catch(() => {
-            mumuki.kids.showResult({status: 'aborted'})
           });
         this.serverPromise = promise;
 
@@ -866,12 +869,22 @@
         if (reason === "end") {
           this._onExecutionEnd(editor);
         }
-        else if (reason === "cancel" && editor.interactiveMode) {
-          this._onInteractiveStop(editor);
+        else if (reason === "cancel") {
+          this._onExecutionCancel(editor);
         }
         else this.serverPromise = undefined;
       },
 
+      _onExecutionCancel: function(editor) {
+        if(editor.interactiveMode) {
+          this._onInteractiveStop(editor);
+        }
+        else {
+          this._onResetState();
+          this.serverPromise = undefined;
+        }
+      },
+
       _onExecutionEnd: function (editor) {
         if(editor.interactiveMode) {
           editor.toggleInteractiveMode();

data/lib/render/editor/editor.js

@@ -21,4 +21,32 @@ $(document).ready(function () {
     $blockSvg.width($blocks.width());
     $blockSvg.height($blocks.height());
   });
+
+  mumuki.I18n.register({
+    'es': {
+      'kindergarten_passed': '¡Tu programa está muy bien!',
+      'kindergarten_passed_with_warnings': 'Tu programa está bien ¡pero se puede mejorar!',
+      'kindergarten_failed': 'Hay un error en tu programa. ¡Intentá de nuevo!',
+      'kindergarten_errored': 'Hay un error en tu programa. ¡Intentá de nuevo!',
+    },
+    'es-CL': {
+      'kindergarten_passed': '¡Tu programa está muy bien!',
+      'kindergarten_passed_with_warnings': 'Tu programa está bien ¡pero se puede mejorar!',
+      'kindergarten_failed': 'Hay un error en tu programa. ¡Intenta de nuevo!',
+      'kindergarten_errored': 'Hay un error en tu programa. ¡Intenta de nuevo!'
+    },
+    'en': {
+      'kindergarten_passed': 'Your program is very good!',
+      'kindergarten_passed_with_warnings': 'Your program is good. But it can be improved!',
+      'kindergarten_failed': 'There is an error in your program. Try again!',
+      'kindergarten_errored': 'There is an error in your program. Try again!'
+    },
+    'pt': {
+      'kindergarten_passed': 'Seu programa é muito bom!',
+      'kindergarten_passed_with_warnings': 'Seu programa é bom, mas pode ser melhorado!',
+      'kindergarten_failed': 'Há um erro no seu programa. Tenta de novo!',
+      'kindergarten_errored': 'Há um erro no seu programa. Tenta de novo!'
+    },
+  });
+
 });

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module GobstonesVersionHook
-  VERSION = '2.12.1'
+  VERSION = '2.14.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-gobstones-runner
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.14.3
 platform: ruby
 authors:
 - Rodrigo Alfonso
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gobstones-board
@@ -240,12 +240,22 @@ files:
 - lib/public/media/disconnect.mp3
 - lib/public/media/disconnect.ogg
 - lib/public/media/disconnect.wav
+- lib/public/media/five.png
+- lib/public/media/four.png
+- lib/public/media/one.png
 - lib/public/media/quote0.png
 - lib/public/media/quote1.png
 - lib/public/media/sprites.png
 - lib/public/media/sprites.svg
+- lib/public/media/three.png
+- lib/public/media/two.png
 - lib/public/minimal-kindergarten-toolbox.xml
 - lib/public/red.svg
+- lib/public/toolbox/kindergarten-2-to-3.xml
+- lib/public/toolbox/kindergarten-2-to-4.xml
+- lib/public/toolbox/kindergarten-2-to-5.xml
+- lib/public/toolbox/kindergarten-full.xml
+- lib/public/toolbox/kindergarten-minimal.xml
 - lib/render/boards.html.erb
 - lib/render/editor/editor.css
 - lib/render/editor/editor.html.erb
@@ -276,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Gobstones Runner for Mumuki