gobstones-blockly 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: feb2595a317dc38ed739f495938f3cc7fe2d635cec35dbcf81e2cebdd8def04d
-  data.tar.gz: 1ac9279dbfaeed5723d6d769b79c006078b9b676ed0a82aebd722ef2bc6fd614
+  metadata.gz: f16c1d9e0f8d7d1c45571bf145bee056a35f937074d518da0ec2e7acbb4d3763
+  data.tar.gz: ae42b6ed27a22e0b2c4f4aa38eb1e3da75dc5fd46b483e6031e64761c76416c7
 SHA512:
-  metadata.gz: 62da51f613fc533c1c968558099f7e987972ab9c98a5c1543b1b0a719a48c1be990d6b7303d1799565e164d098a4971531c77eb064f30d02c092957f07e2f8fd
-  data.tar.gz: 34dbc8bf8b7ab184170a2a3de93685d27fc49a3e2d42d01866999292e11f19b7bea009728af7a658210e89ae53e07cbe5fa902e5c3a1bf7486206b548111f823
+  metadata.gz: 8b813b850a0e7d8d98f08f1b8f4af3b721977f66193992d47ebf5b91c87eb46af34995646ae7470328527df0e02bbf604d1371b8434f38d0d28ca1dcc7f9b387
+  data.tar.gz: 12e3a730263d9360d216fe9c8fbbc932feb42ede7892f5d9ebae0378238a7e78a9c1eff9446c85781d7c5c9293998e5f0f73787ec12aaf2f7c16f74c00c3e241

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

@@ -62,7 +62,7 @@ Example:
           <block type="math_number"></block>
           <block type="ColorSelector"></block>
           <block type="DireccionSelector"></block>
-					<block type="BoolSelector"></block>
+          <block type="BoolSelector"></block>
         </category>
         <category name="Expresiones primitivas">
           <block type="hayBolitas"></block>
@@ -78,9 +78,9 @@ Example:
           <block type="OperadorDeComparacion"></block>
           <block type="OperadorLogico"></block>
           <block type="not"></block>
-					<block type="siguiente"></block>
-					<block type="previo"></block>
-					<block type="opuesto"></block>
+          <block type="siguiente"></block>
+          <block type="previo"></block>
+          <block type="opuesto"></block>
         </category>
       </category>
       <category name="Definiciones">
@@ -5072,15 +5072,18 @@ Blockly.GobstonesLanguage.addPragma = function(block, str){
 Blockly.utils.genUid.soup_ = Blockly.utils.genUid.soup_.replace(/@/g,"a");
 
 function getCustomTeacherDropdownValue(block) {
+  // TODO: Hackeada de compromiso
+
   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
+    const getCustomTeacherDropdown = (field) => field.name === 'custom_teacher_dropdown';
+
+    const input = block.inputList.find((input) =>
+      input.fieldRow.some(getCustomTeacherDropdown)
+    );
+    const field = input.fieldRow.find(getCustomTeacherDropdown);
+
+    return field.getValue();
+  } catch(e) {
     return null;
   }
 }
@@ -6141,9 +6144,9 @@ Blockly.ErrorInforming.CssContent = [
         const attributes = definition.attributes;
 
         const dropdown = definition.attributes && definition.attributes.block_dropdown;
-        const dropdownOptions = dropdown && dropdown.match(/\("\w+" *, *'[^']*'\)/g);
+        const dropdownOptions = dropdown && dropdown.match(/\("[^"]+" *, *'[^']*'\)/g);
         return dropdownOptions && dropdownOptions.map((option) => {
-          const parts = option.match(/^\("(\w+)" *, *'([^']*)'\)$/);
+          const parts = option.match(/^\("([^"]+)" *, *'([^']*)'\)$/);
           return [parts[1], parts[2]];
         });
       },
@@ -6161,11 +6164,12 @@ Blockly.ErrorInforming.CssContent = [
         const parts = (customName ? this._getParts : this._getPartsByConvention.bind(this, true))
           .bind(this)(finalName);
 
+        const self = this;
+
         // Bloque
         Blockly.Blocks[name] = {
-        	init: function () {
-            let argsIndex = 1;
-        		this.setColour(Blockly.CUSTOM_COLORS.primitiveProcedure);
+          init: function () {
+            this.setColour(Blockly.CUSTOM_COLORS.primitiveProcedure);
 
             if (icon) {
               this.appendDummyInput().appendField(new Blockly.FieldImage(
@@ -6176,37 +6180,19 @@ Blockly.ErrorInforming.CssContent = [
               ));
             }
 
-            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++;
-              }
-            }
-        		this.setPreviousStatement(true);
-        		this.setNextStatement(true);
-        		this.setInputsInline(true);
-        	}
+            self._definePrimitiveHolesOrDropdown(this, parts, dropdownOptions);
+
+            this.setPreviousStatement(true);
+            this.setNextStatement(true);
+            this.setInputsInline(true);
+          }
         };
+
         let argsList = [];
         for(var i=1;i<parts.length;i++) {
           argsList.push('arg' + i);
         }
+
         // Generator
         Blockly.GobstonesLanguage[name] = procBlockCodeGenerator(name, argsList);
       },
@@ -6235,10 +6221,11 @@ Blockly.ErrorInforming.CssContent = [
         const parts = (customName ? this._getParts : this._getPartsByConvention.bind(this, false))
           .bind(this)(finalName);
 
+        const self = this;
+
         // Bloque
         Blockly.Blocks[name] = {
           init: function () {
-            let argsIndex = 1;
             this.setColour(Blockly.CUSTOM_COLORS.primitiveFunction);
 
             if (icon) {
@@ -6250,38 +6237,20 @@ Blockly.ErrorInforming.CssContent = [
               ));
             }
 
-            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++;
-              }
-            }
+            self._definePrimitiveHolesOrDropdown(this, parts, dropdownOptions);
+
             this.setPreviousStatement(false);
             this.setNextStatement(false);
             this.setInputsInline(true);
             this.setOutput('var');
           }
         };
+
         let argsList = [];
         for(var i=1;i<parts.length;i++) {
           argsList.push('arg' + i);
         }
+
         // Generator
         Blockly.GobstonesLanguage[name] = functionBlockCodeGenerator(name, argsList);
       },
@@ -6296,6 +6265,36 @@ Blockly.ErrorInforming.CssContent = [
         }
       },
 
+      _definePrimitiveHolesOrDropdown: function (block, parts, dropdownOptions) {
+        if (dropdownOptions) {
+          if (parts.length !== 2) throw new Error("Only one parameter is supported when using block_dropdown");
+
+          // En Space (U+2002)
+          dropdownOptions.forEach((opt) => opt[0] = opt[0].replace(/ /g, " "));
+
+          block.jsonInit({
+            message0: parts.join('%1'),
+            args0: [
+              {
+                type: 'field_dropdown',
+                name: "custom_teacher_dropdown",
+                options: dropdownOptions
+              }
+            ]
+          });
+        } else {
+          let argsIndex = 1;
+          for (var i in parts) {
+            if (i == parts.length - 1) {
+              block.appendDummyInput().appendField(parts[i]);
+            } else {
+              block.appendValueInput('arg' + argsIndex).appendField(parts[i]);
+              argsIndex++;
+            }
+          }
+        }
+      },
+
       _onBlocklyWorkspaceUpdate: function () {
         let xml = Blockly.Xml.workspaceToDom(this.workspace);
         this._blocklyWorkspaceXML = Blockly.Xml.domToText(xml);
@@ -6524,12 +6523,12 @@ Blockly.ErrorInforming.CssContent = [
       attached: function() {
         this._definePrimitiveProcedures();
         this._definePrimitiveFunctions();
-        	// create workspace
+          // create workspace
         var blocklyDiv = this.$$('#blocklyDiv');
         this.blocklyDiv = blocklyDiv;
         this._fixSize();
         this._fixScroll();
-				this.workspace = Blockly.inject(blocklyDiv, {
+        this.workspace = Blockly.inject(blocklyDiv, {
           toolbox: this._createToolbox(),
           media: this.get("media"),
           toolboxPosition: "start",
@@ -6542,7 +6541,7 @@ Blockly.ErrorInforming.CssContent = [
             controls: true,
             wheel: true
           }
-				});
+        });
         var _this = this;
         this.workspace.addChangeListener(function (a, b, c) {
           Blockly.Events.disableOrphans(a, b, c);

data/lib/gobstones/blockly/version.rb

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

metadata

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