mumuki-gobstones-runner 2.11.0 → 2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1636b8a5a322c4a74f84a725e8df8fa0118e38362b3732a70e76deba7b87e620
-  data.tar.gz: 41d818b4cb24ce921ed45f0c539437ac0395ddc4152e2f5a4ebf3e2a19168b07
+  metadata.gz: 16b0e7c565a14d86f588746885e896e9bd00157e4d54bde3cf66462ed1a91e24
+  data.tar.gz: a9f2db6e60708af307cab7e26360662bc4cfeade97960bc7fd2297b9ca8ea2e1
 SHA512:
-  metadata.gz: bb2ac8c37f98b4239de66fdc9f4b73982a013769add4d71172561e7d399774038647690468193a2dee19d2c8cf886582538f4bfc13479057a3837918affec4d0
-  data.tar.gz: aba3b7d54384b3c44587219236ccfb4d3720560d63f5d7ac8193bc95604e4ec1ddd3de32544c8fcbaf0d3f396d19c62b3c9b6576b036e27f17d7d207d155b827
+  metadata.gz: a83db717ca0f2c78f1222cde2a809a8b78c878f6cabb0428ce4ea38cfbda2e1b92fff01cc11596509522792c7c41f56c971ab80c7c7c9de6139432d1d9d5cd82
+  data.tar.gz: 591f2e6414c5aac0c8ff4779b9a1eaaa9e3516447f941bbd6f12e87066e7f84d097139dead5a3c1c5aa86122aa478761a55e873dcbdb2039ab1b0e2c616c69a9

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/feedback_hook.rb

@@ -65,7 +65,7 @@ class GobstonesFeedbackHook < Mumukit::Hook
       end
     end
 
-    def explain_missing_closing_brace_after_procedure(submission, result)
+    def explain_missing_closing_brace_before_procedure(submission, result)
       if procedure_instead_of_command?(result) && missing_brace_end?(submission)
         (error_line(result)).try do |it|
           { line: it[1] }

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/locales/en.yml

@@ -12,12 +12,12 @@ en:
   code_wrong_argument_type: 'wrong arguments type'
   code_unassigned_variable: 'unassigned variable'
   code_wrong_arguments_quantity: 'wrong arguments quantity'
-  color_typo: 'It seems you wrote %{color}. Maybe you meant %{rectified_color}?'
+  color_typo: 'It seems you wrote <code>%{color}</code>. Did you mean <code>%{rectified_color}</code>?'
   expected_board: 'Expected final board'
   final_board: 'Final board'
   initial_board: 'Initial board'
   lower_builtin_procedure_typo: 'Looks lie you wrote <code>%{lower}</code> in lowercase. Remember procedures such as <code>%{upper}()</code> should start in uppercase!'
-  missing_closing_brace_after_procedure: "Looks like you're missing a <code>}</code> to close a <code>procedure</code>. Maybe it's on line <strong>%{line}</strong> or near it?"
+  missing_closing_brace_before_procedure: "Looks like you're missing a <code>}</code> before a <code>procedure</code>. Maybe it's on line <strong>%{line}</strong> or near it?"
   no_program_found: 'No program definition was found'
   program_before_closing_structure_when_no_program: "Looks like you're missing a <code>}</code> to close the last <code>%{keyword}</code>."
   program_before_closing_structure_when_program: "Looks like you're missing a <code>}</code> to close the last <code>%{keyword}</code> before <code>program</code>."

data/lib/locales/es.yml

@@ -12,12 +12,12 @@ es:
   code_wrong_argument_type: 'problema de tipos en los argumentos'
   code_unassigned_variable: 'variable no asignada'
   code_wrong_arguments_quantity: 'cantidad errónea de argumentos'
-  color_typo: 'Parece que escribiste %{color}. ¿Quisiste referirte al color %{rectified_color}?'
+  color_typo: 'Parece que escribiste <code>%{color}</code>. ¿Quisiste referirte al color <code>%{rectified_color}</code>?'
   expected_board: 'Tablero final esperado'
   final_board: 'Tablero final'
   initial_board: 'Tablero inicial'
   lower_builtin_procedure_typo: 'Parece que escribiste <code>%{lower}</code> en minúsculas. ¡Recordá que los procedimientos como <code>%{upper}()</code> deben comenzar en mayúsculas!'
-  missing_closing_brace_after_procedure: 'Parece que te falta una <code>}</code> que cierre un <code>procedure</code>. ¿Puede que sea en la línea <strong>%{line}</strong> o cerca de ella?'
+  missing_closing_brace_before_procedure: 'Parece que te falta una <code>}</code> antes de un <code>procedure</code>. ¿Puede que sea en la línea <strong>%{line}</strong> o cerca de ella?'
   no_program_found: 'No se encontró ninguna definición de programa'
   program_before_closing_structure_when_no_program: 'Parece que te falta una <code>}</code> que cierre el último <code>%{keyword}</code>.'
   program_before_closing_structure_when_program: 'Parece que te falta una <code>}</code> que cierre el <code>%{keyword}</code> antes de <code>program</code>.'

data/lib/locales/pt.yml

@@ -12,12 +12,12 @@ pt:
   code_wrong_argument_type: 'problema de tipos nos argumentos'
   code_unassigned_variable: 'variável não atribuída'
   code_wrong_arguments_quantity: 'quantidade errada de argumentos'
-  color_typo: 'Parece que você escreveu %{color}. Você quis se referir à cor %{rectified_color}?'
+  color_typo: 'Parece que você escreveu <code>%{color}</code>. Você quis se referir à cor <code>%{rectified_color}</code>?'
   expected_board: 'Tabuleiro final esperado'
   final_board: 'Tabuleiro final'
   initial_board: 'Tabuleiro inicial'
   lower_builtin_procedure_typo: 'Parece que você escreveu <code>%{lower}</code> em letras minúsculas. Lembre-se de que procedimentos como <code>%{upper}()</code> devem começar em maiúsculas!'
-  missing_closing_brace_after_procedure: 'Parece que está faltando um <code>}</code> que fecha um <code>procedure</code>. Pode ser na linha <strong>%{line}</strong> ou perto dela?'
+  missing_closing_brace_before_procedure: 'Parece que está faltando um <code>}</code> antes de um <code>procedure</code>. Pode ser na linha <strong>%{line}</strong> ou perto dela?'
   no_program_found: 'Nenhuma definição de programa foi encontrada'
   program_before_closing_structure_when_no_program: 'Parece que está faltando um <code>}</code> que fecha a última <code>%{keyword}</code>.'
   program_before_closing_structure_when_program: 'Parece que está faltando um <code>}</code> que fecha o <code>%{keyword}</code> antes do <code>program</code>.'

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

@@ -216,10 +216,7 @@
         this._setBlocklyDisplayMode();
         this._setBlocklySounds();
         this._setBlocklyColors();
-
-        if (!this.readOnly) {
-          this._relocateTrashOnResize();
-        }
+        this._relocateTrashOnResize();
 
         // Removing "/" from the block id character set to avoid syntax errors
         Blockly.utils.genUid.soup_ = Blockly.utils.genUid.soup_.replace("/", "");
@@ -233,11 +230,16 @@
       },
 
       _relocateTrashOnResize() {
+        if (this.readOnly) {
+          console.debug("No trash relocate on resize required");
+          return;
+        }
+
         $('.mu-kids-context, .mu-kids-results').on('hidden.bs.modal shown.bs.modal', () => {
           this._relocateTrash();
         });
 
-        $(window).resize(() => this._relocateTrash());
+        $(window).resize(() => setTimeout(this._relocateTrash));
       },
 
 
@@ -246,6 +248,8 @@
        *
        * Blockly's workspace is destroyed when toolbox changes, so initialization
        * is performed here
+
+       * @see _initializeBlocklyWorkspace
        */
       _initializeCustomToolboxBlocklyWorkspace(toolboxXml) {
         this._getBlockly().toolbox = { defaultToolbox: toolboxXml };
@@ -258,6 +262,8 @@
        * 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.
+       *
+       * @see _initializeBlocklyWorkspace
        */
       _initializeNonCustomToolboxBlocklyWorkspace() {
         if (!this.hasCustomToolbox()) {
@@ -265,11 +271,20 @@
         }
       },
 
+      /**
+       * Performs actual workspace (re)creation,
+       * which sets initial xml, user solution, trash position
+       * and appropriate callbacks.
+       *
+       * This method is the actual culmination of the blockly initialization
+       * process
+       */
       _initializeBlocklyWorkspace() {
         console.debug('Initializing Blockly Workspace');
 
         this._setInitialXml();
         this._initializeWorkspace();
+        this._relocateTrash();
         this._subscribeToWorkspace(() => this._updateSolution());
 
         if (this.hasInteractiveProgram()) {
@@ -280,10 +295,17 @@
       },
 
       _relocateTrash() {
-        const width = $('#blocklyDiv').width() - 68;
-        const height = $('#blocklyDiv').height() - 210;
-        $('.blocklyTrash').css("transform", `translate(${width}px, ${height}px)`);
-        $('.blocklyTrash').css("display", "unset");
+        if (this.readOnly) {
+          console.debug("No trash relocate required");
+          return;
+        }
+
+        const $blocklyTrash = $('.blocklyTrash');
+        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");
       },
 
       _updateSolution() {
@@ -406,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'
         ]));
       },
 
@@ -436,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;
       },

data/lib/render/layout/layout.html

@@ -16,6 +16,7 @@
       _setAttire: function () {
         $.getJSON(this.attireUrl, function (attire) {
           GobstonesBoard && GobstonesBoard.setDefaultAttire(attire);
+          attire.rules.forEach((rule) => $.get(rule.image));
         });
       }
     });

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module GobstonesVersionHook
-  VERSION = '2.11.0'
+  VERSION = '2.14.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-gobstones-runner
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.14.1
 platform: ruby
 authors:
 - Rodrigo Alfonso
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2021-01-05 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