mumuki-gobstones-runner 2.12.0 → 2.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d85da0b0c9fecd26e9b7d19346e44235e47a3e6efe5ee76c2504d40eb47a2dcd
-  data.tar.gz: 3cff2267ef410ea1cce2d63d4524d0453bc7b976e292050edc7c1441d78b65f4
+  metadata.gz: 45823ede62f0dab0aaecc19ed12332cfeae22a593c9809fb31f248b8d922f006
+  data.tar.gz: a16ec2877eadbbf19db14b57b62f6ee96222d41d8978634da9aa93ba8561fdd1
 SHA512:
-  metadata.gz: ecda66dd1d44e538330f68ea19087eda4eb5c9e5b44bf7d04f60d49f477e75669f78781da58bc3c27bd8375e4a2f80b803190d750f8da970b4dd6ab34612f7e1
-  data.tar.gz: 6cdd4d96eaa8f55ad1f977adbf7b3cfe8ceab835240672a469c78bca907abb4f23735f1eab64e6fa5c776ac609dae00c4d4f9785e51a7ae481df795a5af869a9
+  metadata.gz: 9d5749f67661dbf6d2d2f00f4f1bd48ab4ab86a1abda93e275e08916cd23ddc41eda5aa0498b4b7a76f760ee9d011f8dd8e1a4b592a68225138ef6680d3d640c
+  data.tar.gz: 3f61470fe0aa02a8f84723a37939147441fb1ace1e7c58be13ea5fc4d4fc79e5824993198d9b22986ee3559c062c0a931ad4d864b8b8f14f5bf937a3e2699649

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

@@ -239,7 +239,7 @@
           this._relocateTrash();
         });
 
-        $(window).resize(() => this._relocateTrash());
+        $(window).resize(() => setTimeout(this._relocateTrash));
       },
 
 
@@ -301,8 +301,9 @@
         }
 
         const $blocklyTrash = $('.blocklyTrash');
-        const width = $('#blocklyDiv').width() - 68;
-        const height = $('#blocklyDiv').height() - 210;
+        const $blocklyDiv = $('#blocklyDiv');
+        const width = $blocklyDiv.width() - 68;
+        const height = $blocklyDiv.height() - 210;
         $blocklyTrash.css("transform", `translate(${width}px, ${height}px)`);
         $blocklyTrash.css("display", "unset");
       },
@@ -427,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'
         ]));
       },
 
@@ -457,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;
       },
@@ -822,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.processSolution({ solution })
           .then((results) => {
             if (promise !== this.serverPromise) return;
 
             this._onRemoteExecutionStop(results);
-          })
-          .catch(() => {
-            mumuki.kids.showResult({status: 'aborted'})
           });
         this.serverPromise = promise;
 

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module GobstonesVersionHook
-  VERSION = '2.12.0'
+  VERSION = '2.14.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-gobstones-runner
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.14.2
 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-07 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