gobstones-blockly 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a635ac1b19348ea87ca23976497fa8aad110558d6d17bda146c80b7a8064b3c4
-  data.tar.gz: 8caab52b4dcd9e632ecad56d56f0c4a72c08bea83cbd46fbad7d371936940580
+  metadata.gz: b47ed0e304185189a1d5b7cc25dad46e9a707f19649d960f55f0452a62dbdcea
+  data.tar.gz: 9232a10f5c19d707017564980654612b72aab401a18ef65da60db1b319fb4418
 SHA512:
-  metadata.gz: a808286901cf84d9147a906750909fb558fbcdaa108754368cc3d3b202af9f0a1120ff30244448a10f62d4f7e6a82e040fb9f2f73b975b9472b5314cdaf8f5c6
-  data.tar.gz: 11fbab2de6de522690905cc434b43ac2f33084873d60435e1f8692d2d059c2c0897c50c0ae5d6eb094b746539644522ad2d187826028d6604712f2b811f94757
+  metadata.gz: 902cd68bd2423da9b2d4ed38d5d4363199a5b972985cd8ae75ad516600340b96c5b262c79cdbf727152dde76658b505963df3d3416b28d373ff01dd63bc5dd3a
+  data.tar.gz: f0c245a9c0a010389705cd1f1cf26ae4fe3c608fdd717658c8d16f23f00951d613c5f9d4f6796fc68239c16ae405a8b32c9ded89dcbee3e22e79cd101b13b1f0

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

@@ -81,6 +81,7 @@ Example:
           <block type="OperadorLogico"></block>
           <block type="not"></block>
           <block type="OperadoresDeEnumeracion"></block>
+          <block type="AlternativaEnExpresiones"></block>
         </category>
       </category>
       <category name="Definiciones">
@@ -4235,7 +4236,7 @@ Blockly.createBlockSvg = function(workspace, name, f) {
   newBlock.render();
 };
 
-const createVariable = (parent, name) => {
+const createVariable = (parent, name, callback = () => {}) => {
   const workspace = parent.workspace;
   Blockly.createBlockSvg(workspace, 'variables_get', b => {
     ATOMICALLY(() => {
@@ -4243,6 +4244,7 @@ const createVariable = (parent, name) => {
       const posParent = parent.getRelativeToSurfaceXY();
       const pos = b.getRelativeToSurfaceXY();
       b.moveBy(posParent.x - pos.x + parent.width + 16, posParent.y - pos.y + b.height + 6);
+      callback(b);
     });
   });
 }
@@ -4369,7 +4371,7 @@ Blockly.Blocks.InteractiveProgram = {
       getLocalMediaUrl(this, icon),
       getLocalMediaSize(icon),
       getLocalMediaSize(icon),
-      "Eliminar",
+      "",
       function() {
         this.$init = false;
         this.removeInput("initlabel");
@@ -4378,6 +4380,7 @@ Blockly.Blocks.InteractiveProgram = {
         triggerRefresh(this);
       }.bind(this)
     );
+    setTimeout(() => { removeButton.setTooltip("Eliminar"); });
 
     this.appendDummyInput("initlabel").appendField('Al inicializar:').appendField(removeButton);
     this.appendStatementInput('init').setCheck(["Statement"]);
@@ -4396,7 +4399,7 @@ Blockly.Blocks.InteractiveProgram = {
       getLocalMediaUrl(this, icon),
       getLocalMediaSize(icon),
       getLocalMediaSize(icon),
-      "Eliminar",
+      "",
       function() {
         this.$timeout = undefined;
         this.removeInput("timeoutlabel");
@@ -4404,6 +4407,7 @@ Blockly.Blocks.InteractiveProgram = {
         triggerRefresh(this);
       }.bind(this)
     );
+    setTimeout(() => { removeButton.setTooltip("Eliminar"); });
 
     this.appendDummyInput("timeoutlabel").appendField(`Al estar inactivo ${timeout} milisegundos:`).appendField(removeButton);
     this.appendStatementInput('timeout').setCheck(["Statement"]);
@@ -4478,27 +4482,32 @@ createInteractiveBinding = (name, keys) => {
       const input = this.inputList[0];
       const plusIcon = "plus.png";
       const cleanIcon = "clean.png";
-      input.appendField(new Blockly.FieldImage(
+      const addModifier = new Blockly.FieldImage(
         getLocalMediaUrl(this, plusIcon),
         getLocalMediaSize(plusIcon),
         getLocalMediaSize(plusIcon),
-        "Agregar modificador",
+        "",
         function() {
           const modifiersCount = getModifierFields(self).length / 2;
           if (modifiersCount >= modifiers.length) return;
 
           self._addModifier();
         }
-      ));
-      input.appendField(new Blockly.FieldImage(
+      );
+      setTimeout(() => { addModifier.setTooltip("Agregar modificador"); });
+      input.appendField(addModifier);
+
+      const cleanModifiers = new Blockly.FieldImage(
         getLocalMediaUrl(this, cleanIcon),
         getLocalMediaSize(cleanIcon),
         getLocalMediaSize(cleanIcon),
-        "Limpiar modificadores",
+        "",
         function() {
           self._cleanModifiers();
         }
-      ));
+      );
+      setTimeout(() => { addModifier.setTooltip("Limpiar modificadores"); });
+      input.appendField(cleanModifiers);
     },
 
     customContextMenu: function(options) {
@@ -5113,11 +5122,13 @@ Blockly.Blocks.List = {
       getLocalMediaUrl(this, icon),
       getLocalMediaSize(icon),
       getLocalMediaSize(icon),
-      "Agregar elemento",
+      "",
       function() {
         this._addElement();
       }.bind(this)
     );
+    setTimeout(() => { addButton.setTooltip("Agregar elemento"); });
+
     const input = this.appendDummyInput();
     input.appendField(addButton);
     input.name = "addButton";
@@ -5138,11 +5149,137 @@ Blockly.Blocks.List = {
       getLocalMediaUrl(this, icon),
       getLocalMediaSize(icon),
       getLocalMediaSize(icon),
-      "Quitar elemento",
+      "",
       function() {
         this._removeElement(input);
       }.bind(this)
     );
+    setTimeout(() => { removeButton.setTooltip("Quitar elemento"); });
+    input.appendField(removeButton);
+  }
+};
+
+Blockly.Blocks.AlternativaEnExpresiones = {
+  init: function () {
+    this.jsonInit({
+      message0: "",
+      args0: [],
+      output: "*",
+      colour: Blockly.CUSTOM_COLORS.AlternativaEnExpresiones || Blockly.CUSTOM_COLORS.operator,
+      inputsInline: true
+    });
+    this.length = 0;
+
+    this._addOtherwise();
+    this._addElement();
+  },
+
+  mutationToDom: function() {
+    var container = document.createElement('mutation');
+    container.setAttribute('extrabranches', this.length - 1);
+    return container;
+  },
+
+  domToMutation: function(xmlElement) {
+    var extraBranches = parseInt(xmlElement.getAttribute('extrabranches')) || 0;
+    for (let i = 0; i < extraBranches; i++) this._addElement();
+  },
+
+  _addElement: function() {
+    this.length++;
+    this._removeOtherwise();
+    this._removeAddButton();
+
+    if (this.length > 1) this._addNewline("newline" + this.length);
+    this.appendDummyInput().appendField('elegir').name = "label1" + this.length;
+    const input1 = this.appendValueInput('element' + this.length);
+    this.appendDummyInput().appendField('cuando').name = "label2" + this.length;
+    const input2 = this.appendValueInput('condition' + this.length);
+
+    if (this.length > 1) this._addRemoveButtonFor(this.length, input2);
+    this._addAddButton();
+    this._addOtherwise();
+    triggerRefresh(this);
+  },
+
+  _removeElement: function(n) {
+    const isLastBranch = this.length === 2;
+
+    const elements = ["newline", "label1", "element", "label2", "condition"];
+    elements.forEach((element) => this.removeInput(element + n));
+    this.length--;
+
+    let id;
+    elements.forEach((element) => {
+      id = 1;
+      for (let input of this.inputList) {
+        if (input.name.startsWith(element)) {
+          input.name = element + id;
+          id++;
+        }
+      }
+    });
+
+    if (isLastBranch) this.removeInput("newline1");
+
+    triggerRefresh(this);
+  },
+
+  _addAddButton: function() {
+    const icon = "plus.png";
+    var addButton = new Blockly.FieldImage(
+      getLocalMediaUrl(this, icon),
+      getLocalMediaSize(icon),
+      getLocalMediaSize(icon),
+      "",
+      function() {
+        this._addElement();
+      }.bind(this)
+    );
+    setTimeout(() => { addButton.setTooltip("Agregar opción"); });
+
+    const input = this.appendDummyInput();
+    input.appendField(addButton);
+    input.name = "addButton";
+  },
+
+  _removeAddButton: function() {
+    this.removeInput("addButton")
+    this.removeInput("closingBracket");
+  },
+
+  _addOtherwise: function() {
+    this._addNewline("otherwiseNewline");
+
+    const textInput = this.appendDummyInput();
+    textInput.appendField("o si no");
+    textInput.name = "otherwiseText";
+
+    this.appendValueInput("otherwise");
+  },
+
+  _removeOtherwise: function() {
+    this.removeInput("otherwiseText");
+    this.removeInput("otherwise");
+    this.removeInput("otherwiseNewline");
+  },
+
+  _addNewline: function(name) {
+    this.appendStatementInput(name).setCheck(["NEWLINE"]);
+  },
+
+  _addRemoveButtonFor: function(n, input) {
+    const icon = "minus.png";
+    var removeButton = new Blockly.FieldImage(
+      getLocalMediaUrl(this, icon),
+      getLocalMediaSize(icon),
+      getLocalMediaSize(icon),
+      "",
+      function() {
+        this._removeElement(n);
+      }.bind(this)
+    );
+    setTimeout(() => { removeButton.setTooltip("Quitar opción"); });
     input.appendField(removeButton);
   }
 };
@@ -5170,24 +5307,46 @@ Blockly.Blocks.ForEach = {
         ]
     });
 
+    var self = this;
+
+    const nameField = this.getField("varName");
+    nameField.setValidator(function(name) {
+      // Strip leading and trailing whitespace. Beyond this, all names are legal.
+      name = name.replace(/^[\s\xa0]+|[\s\xa0]+$/g, '');
+
+      var oldName = this.text_;
+      if (oldName != name) {
+        // Rename any callers.
+        var blocks = this.sourceBlock_.workspace.getAllBlocks(false);
+        for (var i = 0; i < blocks.length; i++) {
+          if (blocks[i].$parent === self.id) {
+            blocks[i].setFieldValue(name, "VAR")
+          }
+        }
+      }
+
+      return name;
+    });
+
     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, name);
+        createVariable(self, name, (block) => {
+          block.$parent = self.id;
+        });
       }
     );
+    setTimeout(() => { createGetterButton.setTooltip("Obtener variable"); });
 
     this.inputList[0].appendField(createGetterButton);
   }
@@ -5353,12 +5512,13 @@ Blockly.Blocks.Asignacion = {
       getLocalMediaUrl(this, handIcon),
       getLocalMediaSize(handIcon),
       getLocalMediaSize(handIcon),
-      "Obtener variable",
+      "",
       function() {
         var name = self.getFieldValue('varName');
         self.createVariableBlock(name);
       }
     );
+    setTimeout(() => { createGetterButton.setTooltip("Obtener variable"); });
 
     this.appendDummyInput().appendField(createGetterButton);
   },
@@ -5860,6 +6020,25 @@ Blockly.GobstonesLanguage.List = function(block) {
   return [code, Blockly.GobstonesLanguage.ORDER_ATOMIC];
 };
 
+Blockly.GobstonesLanguage.AlternativaEnExpresiones = function(block) {
+  const elements = block
+    .inputList
+    .filter((it) => it.name.startsWith("element"))
+    .map((it) => {
+    	const id = it.name.match(/element(\d+)/)[1];
+      const value = Blockly.GobstonesLanguage.valueToCode(block, it.name, Blockly.GobstonesLanguage.ORDER_NONE);
+      const conditionValue = Blockly.GobstonesLanguage.valueToCode(block, `condition${id}`, Blockly.GobstonesLanguage.ORDER_NONE);
+
+      return `${value} when (${conditionValue})`;
+    })
+    .join("\n  ");
+
+  const otherwise = Blockly.GobstonesLanguage.valueToCode(block, "otherwise", Blockly.GobstonesLanguage.ORDER_NONE);
+  const code = `\n  choose ${elements}\n  ${otherwise} otherwise\n`;
+
+  return [code, Blockly.GobstonesLanguage.ORDER_ATOMIC];
+};
+
 Blockly.GobstonesLanguage.ForEach = function (block) {
   let body = Blockly.GobstonesLanguage.statementToCode(block, 'block');
   var varName = formatCallName(block.getFieldValue('varName'), false, Blockly.VARIABLE_CATEGORY_NAME);
@@ -6721,6 +6900,11 @@ Blockly.ErrorInforming.CssContent = [
         // Bloque
         Blockly.Blocks[name] = {
           init: function () {
+            this.jsonInit({
+              type: "Statement",
+              previousStatement: "Statement",
+              nextStatement: "Statement",
+            });
             this.setColour(Blockly.CUSTOM_COLORS.primitiveProcedure);
 
             if (icon) {
@@ -6734,8 +6918,6 @@ Blockly.ErrorInforming.CssContent = [
 
             self._definePrimitiveHolesOrDropdown(this, parts, dropdownOptions);
 
-            this.setPreviousStatement(true);
-            this.setNextStatement(true);
             this.setInputsInline(true);
             this.setTooltip(definition.attributes && definition.attributes.tooltip || "");
           }
@@ -6796,6 +6978,7 @@ Blockly.ErrorInforming.CssContent = [
             this.setNextStatement(false);
             this.setInputsInline(true);
             this.setOutput('var');
+            this.setTooltip(definition.attributes && definition.attributes.tooltip || "");
           }
         };
 

data/app/assets/htmls/vendor/polymer-micro.html

@@ -408,6 +408,9 @@ Polymer.telemetry.instanceCount = 0;
 }());(function () {
 var modules = {};
 var lcModules = {};
+function setModule(id, module) {
+modules[id] = lcModules[id.toLowerCase()] = module;
+}
 var findModule = function (id) {
 return modules[id] || lcModules[id.toLowerCase()];
 };
@@ -422,9 +425,12 @@ this.register();
 register: function (id) {
 id = id || this.id || this.getAttribute('name') || this.getAttribute('is');
 if (id) {
+if (Polymer.Settings.strictTemplatePolicy && findModule(id) !== undefined) {
+setModule(id, null);
+throw new Error('strictTemplatePolicy: dom-module ' + id + ' re-registered');
+}
 this.id = id;
-modules[id] = this;
-lcModules[id.toLowerCase()] = this;
+setModule(id, this);
 }
 },
 import: function (id, selector) {
@@ -791,7 +797,7 @@ default:
 return value != null ? value : undefined;
 }
 }
-});Polymer.version = "1.11.3";Polymer.Base._addFeature({
+});Polymer.version = "1.12.0";Polymer.Base._addFeature({
 _registerFeatures: function () {
 this._prepIs();
 this._prepBehaviors();

data/app/assets/htmls/vendor/polymer-mini.html

@@ -75,7 +75,11 @@ _prepTemplate: function () {
 var module;
 if (this._template === undefined) {
 module = Polymer.DomModule.import(this.is);
-this._template = module && module.querySelector('template');
+var template = module && module.querySelector('template');
+if (Polymer.Settings.strictTemplatePolicy && !template) {
+throw new Error('strictTemplatePolicy: expecting dom-module or null _template for ' + this.is);
+}
+this._template = template;
 }
 if (module) {
 var assetPath = module.getAttribute('assetpath') || '';
@@ -1041,10 +1045,20 @@ this.removeChild(this.childNodes[0]);
 },
 setAttribute: function (name, value) {
 this.node.setAttribute(name, value);
-this._maybeDistributeParent();
+this._maybeDistributeForAttributeChange(this.node, name);
 },
 removeAttribute: function (name) {
 this.node.removeAttribute(name);
+this._maybeDistributeForAttributeChange(this.node, name);
+},
+_maybeDistributeForAttributeChange: function (element, name) {
+if (name === 'select' && element.localName === 'content') {
+var ownerRoot = this.getOwnerRoot();
+if (ownerRoot && this._nodeNeedsDistribution(ownerRoot.host)) {
+this._lazyDistribute(ownerRoot.host);
+return;
+}
+}
 this._maybeDistributeParent();
 },
 _maybeDistributeParent: function () {
@@ -1599,7 +1613,7 @@ return h;
 _unobserveContentElements: function (elements) {
 for (var i = 0, n, h; i < elements.length && (n = elements[i]); i++) {
 if (this._isContent(n)) {
-h = n.__observeNodesMap.get(this);
+h = n.__observeNodesMap && n.__observeNodesMap.get(this);
 if (h) {
 Polymer.dom(n).unobserveNodes(h);
 n.__observeNodesMap.delete(this);

data/app/assets/htmls/vendor/polymer.html

@@ -162,6 +162,11 @@ i++;
 }
 }
 },
+_select$Attr: function () {
+var div = document.createElement('div');
+div.innerHTML = '<div select$>';
+return div.childNodes[0].attributes.getNamedItem('select$');
+}(),
 _replaceSlotWithContent: function (slot) {
 var content = slot.ownerDocument.createElement('content');
 while (slot.firstChild) {
@@ -169,13 +174,18 @@ content.appendChild(slot.firstChild);
 }
 var attrs = slot.attributes;
 for (var i = 0; i < attrs.length; i++) {
-var attr = attrs[i];
-content.setAttribute(attr.name, attr.value);
+content.attributes.setNamedItem(attrs[i].cloneNode());
 }
 var name = slot.getAttribute('name');
 if (name) {
 content.setAttribute('select', '[slot=\'' + name + '\']');
 }
+var name$Value = slot.getAttribute('name$');
+if (name$Value) {
+var select$Attr = this._select$Attr.cloneNode();
+select$Attr.value = '[slot=\'' + name$Value + '\']';
+content.attributes.setNamedItem(select$Attr);
+}
 slot.parentNode.replaceChild(content, slot);
 return content;
 },
@@ -379,7 +389,7 @@ this._marshalAnnotatedListeners();
 }
 },
 _configureAnnotationReferences: function () {
-var notes = this._notes;
+var notes = this._notes || [];
 var nodes = this._nodes;
 for (var i = 0; i < notes.length; i++) {
 var note = notes[i];
@@ -695,7 +705,11 @@ deepTargetFind: function (x, y) {
 var node = document.elementFromPoint(x, y);
 var next = node;
 while (next && next.shadowRoot) {
+var oldNext = next;
 next = next.shadowRoot.elementFromPoint(x, y);
+if (oldNext === next) {
+break;
+}
 if (next) {
 node = next;
 }
@@ -4346,6 +4360,9 @@ properties: { __hideTemplateChildren__: { observer: '_showHideChildren' } },
 _instanceProps: Polymer.nob,
 _parentPropPrefix: '_parent_',
 templatize: function (template) {
+if (Polymer.Settings.strictTemplatePolicy && !this._getRootDataHost()) {
+throw new Error('strictTemplatePolicy: template owner not trusted');
+}
 this._templatized = template;
 if (!template._content) {
 template._content = template.content;
@@ -4945,6 +4962,9 @@ this._debounceTemplate(this._render);
 this._flushTemplates();
 },
 _render: function () {
+if (!this.ctor) {
+return;
+}
 if (this._needFullRefresh) {
 this._applyFullRefresh();
 this._needFullRefresh = false;
@@ -5426,10 +5446,12 @@ if (this._instance) {
 var c$ = this._instance._children;
 if (c$ && c$.length) {
 var parent = Polymer.dom(Polymer.dom(c$[0]).parentNode);
+if (parent) {
 for (var i = 0, n; i < c$.length && (n = c$[i]); i++) {
 parent.removeChild(n);
 }
 }
+}
 this._instance = null;
 }
 },
@@ -5455,6 +5477,9 @@ properties: { notifyDomChange: { type: Boolean } },
 extends: 'template',
 _template: null,
 created: function () {
+if (Polymer.Settings.strictTemplatePolicy) {
+throw new Error('strictTemplatePolicy: dom-bind not allowed');
+}
 var self = this;
 Polymer.RenderStatus.whenReady(function () {
 if (document.readyState == 'loading') {

data/lib/gobstones/blockly/version.rb

@@ -1,5 +1,5 @@
 module Gobstones
   module Blockly
-    VERSION = "0.31.0"
+    VERSION = "0.32.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobstones-blockly
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-19 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler