gobstones-blockly 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2068974de8a97b4a7873a2e18fd99811d6e13e7f9a387739f02b44aba8468f2
-  data.tar.gz: 4616a462fa78fdf3ec572a232007e438c4a749f7c5478382c4c773d7e2f31c0a
+  metadata.gz: feb2595a317dc38ed739f495938f3cc7fe2d635cec35dbcf81e2cebdd8def04d
+  data.tar.gz: 1ac9279dbfaeed5723d6d769b79c006078b9b676ed0a82aebd722ef2bc6fd614
 SHA512:
-  metadata.gz: f6eaf3699011663c610228fb139e38032bd484b352c0a842a58651f8b1574f2d7bcf2f93650f5223ba4785bca01a139cc688fd5bbfded809ab7aa95552fd4707
-  data.tar.gz: 15f33263b6be825c896b070f4748d5b88c3d3589e8a2d9ba247beb06169bfdefe3cfd0af61bf5f73e2a5256b1f2b00d47e2c98fac31cf43394e47d0a05b1a5ba
+  metadata.gz: 62da51f613fc533c1c968558099f7e987972ab9c98a5c1543b1b0a719a48c1be990d6b7303d1799565e164d098a4971531c77eb064f30d02c092957f07e2f8fd
+  data.tar.gz: 34dbc8bf8b7ab184170a2a3de93685d27fc49a3e2d42d01866999292e11f19b7bea009728af7a658210e89ae53e07cbe5fa902e5c3a1bf7486206b548111f823

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

@@ -5071,6 +5071,20 @@ Blockly.GobstonesLanguage.addPragma = function(block, str){
 // Gobstones pragma BEGIN_REGION should avoid char 'at' ( @ )
 Blockly.utils.genUid.soup_ = Blockly.utils.genUid.soup_.replace(/@/g,"a");
 
+function getCustomTeacherDropdownValue(block) {
+  try {
+    const inputs = block.inputList;
+    const lastInput = inputs[inputs.length - 1];
+    const fields = lastInput.fieldRow;
+    const lastField = fields[fields.length - 1];
+
+    if (lastField.name === 'custom_teacher_dropdown')
+      return lastField.getValue();
+  } catch(e) { // TODO: Sacar esto
+    return null;
+  }
+}
+
 /**
  * Retorna la función que representa la llamada a un procedimiento o funcion F(arg1, arg2, ...)
  * Importante: los arg son input values, no fields.
@@ -5080,8 +5094,13 @@ function callGenerator(name, args = [], newLine, order) {
 		var code = name + '(';
 		var sep = '';
 		args.forEach(function (arg) {
-			code += sep + Blockly.GobstonesLanguage.valueToCode(block, arg,
-				Blockly.GobstonesLanguage.ORDER_NONE);
+      const value = getCustomTeacherDropdownValue(block) || Blockly.GobstonesLanguage.valueToCode(
+        block,
+        arg,
+        Blockly.GobstonesLanguage.ORDER_NONE
+      );
+
+			code += sep + value;
 			sep = ', ';
 		});
 		code += newLine ? ')\n' : ')';
@@ -6118,6 +6137,17 @@ Blockly.ErrorInforming.CssContent = [
         return name.split("_");
       },
 
+      _getDropdownOptions(definition) {
+        const attributes = definition.attributes;
+
+        const dropdown = definition.attributes && definition.attributes.block_dropdown;
+        const dropdownOptions = dropdown && dropdown.match(/\("\w+" *, *'[^']*'\)/g);
+        return dropdownOptions && dropdownOptions.map((option) => {
+          const parts = option.match(/^\("(\w+)" *, *'([^']*)'\)$/);
+          return [parts[1], parts[2]];
+        });
+      },
+
       /**
        * Define un bloque a partir de una definicion tipo Poner_En_
        */
@@ -6125,6 +6155,7 @@ Blockly.ErrorInforming.CssContent = [
         const name = this._getPrimitiveName(definition);
         const customName = definition.attributes && definition.attributes.block_name;
         const icon = definition.attributes && definition.attributes.block_icon;
+        const dropdownOptions = this._getDropdownOptions(definition);
 
         const finalName = customName || name;
         const parts = (customName ? this._getParts : this._getPartsByConvention.bind(this, true))
@@ -6145,11 +6176,24 @@ Blockly.ErrorInforming.CssContent = [
               ));
             }
 
-        		for(var i in parts) {
-              if(i == (parts.length - 1)) {
-    		        this.appendDummyInput().appendField(parts[i]);
-              }
-              else {
+            for (var i in parts) {
+              if (i == (parts.length - 1)) {
+                this.appendDummyInput().appendField(parts[i]);
+
+                if (dropdownOptions) {
+                  this.removeInput('arg1');
+                  this.jsonInit({
+                    message0: parts[i - 1] + " %1",
+                    args0: [
+                      {
+                        type: 'field_dropdown',
+                        name: "custom_teacher_dropdown",
+                        options: dropdownOptions
+                      }
+                    ]
+                  });
+                }
+              } else {
                 this.appendValueInput('arg' + argsIndex).appendField(parts[i]);
                 argsIndex++;
               }
@@ -6185,6 +6229,7 @@ Blockly.ErrorInforming.CssContent = [
         const name = this._getPrimitiveName(definition);
         const customName = definition.attributes && definition.attributes.block_name;
         const icon = definition.attributes && definition.attributes.block_icon;
+        const dropdownOptions = this._getDropdownOptions(definition);
 
         const finalName = customName || name;
         const parts = (customName ? this._getParts : this._getPartsByConvention.bind(this, false))
@@ -6205,11 +6250,24 @@ Blockly.ErrorInforming.CssContent = [
               ));
             }
 
-            for(var i in parts) {
-              if(i == (parts.length - 1)) {
+            for (var i in parts) {
+              if (i == (parts.length - 1)) {
                 this.appendDummyInput().appendField(parts[i]);
-              }
-              else {
+
+                if (dropdownOptions) {
+                  this.removeInput('arg1');
+                  this.jsonInit({
+                    message0: parts[i - 1] + " %1",
+                    args0: [
+                      {
+                        type: 'field_dropdown',
+                        name: "custom_teacher_dropdown",
+                        options: dropdownOptions
+                      }
+                    ]
+                  });
+                }
+              } else {
                 this.appendValueInput('arg' + argsIndex).appendField(parts[i]);
                 argsIndex++;
               }

data/lib/gobstones/blockly/version.rb

@@ -1,5 +1,5 @@
 module Gobstones
   module Blockly
-    VERSION = "0.17.0"
+    VERSION = "0.18.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobstones-blockly
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2018-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler