mumuki-gobstones-runner 2.11.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1636b8a5a322c4a74f84a725e8df8fa0118e38362b3732a70e76deba7b87e620
-  data.tar.gz: 41d818b4cb24ce921ed45f0c539437ac0395ddc4152e2f5a4ebf3e2a19168b07
+  metadata.gz: d85da0b0c9fecd26e9b7d19346e44235e47a3e6efe5ee76c2504d40eb47a2dcd
+  data.tar.gz: 3cff2267ef410ea1cce2d63d4524d0453bc7b976e292050edc7c1441d78b65f4
 SHA512:
-  metadata.gz: bb2ac8c37f98b4239de66fdc9f4b73982a013769add4d71172561e7d399774038647690468193a2dee19d2c8cf886582538f4bfc13479057a3837918affec4d0
-  data.tar.gz: aba3b7d54384b3c44587219236ccfb4d3720560d63f5d7ac8193bc95604e4ec1ddd3de32544c8fcbaf0d3f396d19c62b3c9b6576b036e27f17d7d207d155b827
+  metadata.gz: ecda66dd1d44e538330f68ea19087eda4eb5c9e5b44bf7d04f60d49f477e75669f78781da58bc3c27bd8375e4a2f80b803190d750f8da970b4dd6ab34612f7e1
+  data.tar.gz: 6cdd4d96eaa8f55ad1f977adbf7b3cfe8ceab835240672a469c78bca907abb4f23735f1eab64e6fa5c776ac609dae00c4d4f9785e51a7ae481df795a5af869a9

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/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/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,6 +230,11 @@
       },
 
       _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();
         });
@@ -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,16 @@
       },
 
       _relocateTrash() {
+        if (this.readOnly) {
+          console.debug("No trash relocate required");
+          return;
+        }
+
+        const $blocklyTrash = $('.blocklyTrash');
         const width = $('#blocklyDiv').width() - 68;
         const height = $('#blocklyDiv').height() - 210;
-        $('.blocklyTrash').css("transform", `translate(${width}px, ${height}px)`);
-        $('.blocklyTrash').css("display", "unset");
+        $blocklyTrash.css("transform", `translate(${width}px, ${height}px)`);
+        $blocklyTrash.css("display", "unset");
       },
 
       _updateSolution() {

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.12.0'
 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.12.0
 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: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gobstones-board