gobstones-blockly 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2df8843605a77958cbbbc8363ab494219698cb9b1a98210fd2f2bf1a0d257811
-  data.tar.gz: 7dc56f808fc135e8dc0917fea99c4be2a6f8ea80620b4d36a9ddb3753da5b632
+  metadata.gz: d419151d788c79159a33541aaabad83c5ba6dac3983ec745b81bab7077c9210d
+  data.tar.gz: 707a529e4d4d693c090c804b8ea70261346b6014e58b37505184452f1b6dec96
 SHA512:
-  metadata.gz: bf3e0ae742217b6572f3ac7908977b80dccef29b4ec8222d4e8d3897351b766de195074fc8a2b5ff6a426753ab05d5fd9dacf7f4a6ba3de66c1ec85ed963ddd8
-  data.tar.gz: e313b428e16d901ff92cd09a436598e99caed19cfe1ae5116f06adc88823ad3a8a5b1aa64b804a333546cc89c66067be5a5b337c5ae8237727ff19ed3c9d8bac
+  metadata.gz: 9fcb41fb972763cab3349ddac30cd45a2b921dfba725343a77eeba576dfb8b74bb8a2a1f3e999de2ff4cab2d064f79984f0622ea60031a6ec8b27b1eaf7493e9
+  data.tar.gz: aefbddac2244fb23b4ba3598aed08b2a1925b7af4c2cedc850ef89b6b02518c47f9d555064ab35bf4f57c8a6c3e49866afbef95c5958a5e488758bcc36b16e6c

data/app/assets/htmls/gs-element-blockly.html

@@ -52,6 +52,7 @@ Example:
         <category name="Repeticiones">
           <block type="RepeticionSimple"></block>
           <block type="RepeticionCondicional"></block>
+          <block type="ForEach"></block>
         </category>
         <category name="Asignación">
           <block type="Asignacion"></block>
@@ -4066,6 +4067,15 @@ Blockly.createBlockSvg = function(workspace, name, f) {
 	newBlock.render();
 };
 
+const createVariable = (workspace, name) => {
+ Blockly.createBlockSvg(workspace, 'variables_get', b => {
+    b.setFieldValue(name, 'VAR');
+    b.moveBy(10,5);
+  });
+}
+
+// ---
+
 Blockly.Blocks.Program = {
 	init: function () {
 		this.jsonInit({
@@ -4938,6 +4948,52 @@ Blockly.Blocks.List = {
   }
 };
 
+Blockly.Blocks.ForEach = {
+  init: function () {
+    this.jsonInit({
+      type: "Statement",
+      previousStatement: "Statement",
+      nextStatement: "Statement",
+        message0: 'Repetir para cada %1 %2 %3',
+        args0: [
+          {
+            "type": "field_input",
+            "name": "varName",
+            "text": "elemento"
+          },
+          {
+            type: 'input_dummy'
+          },
+          {
+            "type": "field_label",
+            "text": "en"
+          },
+        ]
+    });
+
+    this.setColour(Blockly.CUSTOM_COLORS.ForEach || Blockly.CUSTOM_COLORS.controlStructure);
+    this.appendValueInput('list');
+    this.appendStatementInput('block').setCheck(["Statement"]);
+    this.setInputsInline(true);
+
+    var self = this;
+
+    const handIcon = "hand.png";
+    var createGetterButton = new Blockly.FieldImage(
+      getLocalMediaUrl(this, handIcon),
+      getLocalMediaSize(handIcon),
+      getLocalMediaSize(handIcon),
+      "Obtener variable",
+      function() {
+        var name = self.getFieldValue('varName');
+        createVariable(self.workspace, name);
+      }
+    );
+
+    this.inputList[0].appendField(createGetterButton);
+  }
+};
+
 function createSingleParameterExpressionBlock(blockText,returnType, colorType = "operator"){
 	return {
 		init: function () {
@@ -5117,10 +5173,7 @@ Blockly.Blocks.Asignacion = {
 	},
 
 	createVariableBlock: function(name) {
-		return Blockly.createBlockSvg(this.workspace, 'variables_get', b => {
-			b.setFieldValue(name, 'VAR');
-			b.moveBy(10,5);
-		});
+		return createVariable(this.workspace, name);
 	}
 };
 
@@ -5578,6 +5631,14 @@ Blockly.GobstonesLanguage.List = function(block) {
   return [code, Blockly.GobstonesLanguage.ORDER_ATOMIC];
 };
 
+Blockly.GobstonesLanguage.ForEach = function (block) {
+  let body = Blockly.GobstonesLanguage.statementToCode(block, 'block');
+  var varName = block.getFieldValue('varName');
+  var list = Blockly.GobstonesLanguage.valueToCode(block, 'list', Blockly.GobstonesLanguage.ORDER_NONE) || '';
+
+  return `foreach ${varName} in ${list} {\n${body}}\n`;
+};
+
 Blockly.GobstonesLanguage.OperadorDeComparacion = function (block) {
 	var code =
 		(Blockly.GobstonesLanguage.valueToCode(block, 'arg1', Blockly.GobstonesLanguage.ORDER_RELATIONAL) || '()') +

data/lib/gobstones/blockly/version.rb

@@ -1,5 +1,5 @@
 module Gobstones
   module Blockly
-    VERSION = "0.23.0"
+    VERSION = "0.24.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gobstones-blockly
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Rodrigo Alfonso