gobstones-blockly 0.28.1 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0294fc5ea182f53be3620d1195c8427e580d99dea953e20aaafff3b3c349e3a
-  data.tar.gz: 8a8c53cf6d275e77910e6fb5b32dcb767c57074990045d70ea9cea55df657785
+  metadata.gz: e5463872ab87a752ec1f0061775e4e9dddb1943a1497ca1696ec82338e9eb3b7
+  data.tar.gz: ef29461291eff352fcfc20632d047c8d894c9478fab08e90e1587d8c40474f48
 SHA512:
-  metadata.gz: 3cce63fde46daff2d4f5e0cb21acbf2707dd3dc769a0d2ba1a114018eaa5bb17778f1af6cb977bf5c880642f0fe9ab610c83fe0648880ed6e137a6651a31386c
-  data.tar.gz: 63ca2eb9192c94420f433bab4fa4ecfbb55ece67b027910fdeb18f6143a7e4b96b8d4d252f5b0c07f4e8054f98aad98959eaf000e34fbb65410b2ddff2f374f3
+  metadata.gz: 901c46fb4bf1d2011b99646d7c11498edc7012a3f55675cac812a74a413c9aeddd06be90f7f31980c67c75ce444c58b0a501eb7fa5fac943c1bc9d5e730f44ce
+  data.tar.gz: c56fc598356c69a59b9474b87156969fa4dae66c873221e7a038dc2d632c941562272726a1543ab7f616e639ad839412d9f0b8160a8eed6e4f59ba0f4c962aa0

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

@@ -3314,7 +3314,7 @@ Blockly.Blocks['procedures_ifreturn'] = {
 var MINUS = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAQAAAD2e2DtAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAHdElNRQfhDAUCCi+xWH4JAAABcUlEQVR42u3c7ZGCMBSG0etuYcTKls7AyrSEVWd4+bjnUECMeSbhD6kCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBzu4XHm2rUvPekD2yutR57/4itTLXU0/Pvs9SUW5TcDrDUyE3r9Na6ZwZKBWD5PxVKIBPAVGtknGsZibeBTADPyCjXE1idn8A0/gJjXFPgn0sEwIEljgAHwPc2Xx87QHMCaE4AzQmgOQE0J4DmBNCcAJoTQHMCaE4AzQmgOQE0J4DmBNCcAJoTQHMCaE4AzQmgOQE0J4DmBNDcb2SUsfc0T2re/utAO0BzPg49sot8HOoI+M5IDJIJ4OF+gI+F7gpyRcwxxa6Iyb0E3mvYB96y1kgtv2vijubS18QBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAWXq7xrTQhKAi3AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEyLTA1VDAyOjEwOjQ3LTA1OjAwdZLI/gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNy0xMi0wNVQwMjoxMDo0Ny0wNTowMATPcEIAAAAASUVORK5CYII=";
 var HAND = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfiBAUBKBeKSgeBAAABTElEQVQoz22QzyvDcRjHX5/vvrMyStI2uZgftdVCSpJCyW1y00oUF+Xg4OIkx5VyUyJOsgv/gnJw4YCSSFMyB5pGbLJ99/k8LltreB2f9+v50eOigoc5FvGTJF8pugCwaKaNaE98uf9zMBXwjtNpbvmuaH2B0+HXuuyMEbOlQ4U1M5ZVcYbowg02YfZW5cnE9JIROdI7jsiOacoMPLZdEYPR1ouQkxCRG+feESlIXkQOzLR+NhvCpc3UbPcHAoRsADcAQ0Twq0ZosQgEVY0SqvGpkAUCxkIUYRP4bZRRNi9pvaD+TwXyFseHuYzy/Kt8CWfQ5Ems6C/5y7uZyDEH0Nt8vq0dUx0XzaapPyIIoIi23+47+SrlTvrTjLhKy2wmO95OqiacS+QBH9gAFDlOZnYbrimWOixSZCwUlK+vZd7bXiPldyi0yqX1OtkfCBS/9XAtDKAAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTgtMDQtMDVUMDQ6NDQ6NDItMDM6MDD+uUN1AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE4LTA0LTA1VDA0OjQwOjIzLTAzOjAw5hdZgAAAAABJRU5ErkJggg==";
 
-window.initProcedsBlockly = function(customStatementType) {
+window.initProcedsBlockly = function(customStatementType, initialize = () => {}) {
   Blockly.Msg.PROCEDURES_DEFNORETURN_COMMENT = 'Describe el procedimiento...';
   Blockly.Msg.PROCEDURES_DEFNORETURN_PROCEDURE = "Hacer algo";
   Blockly.Msg.PROCEDURES_DEFNORETURN_TITLE = "Definir";
@@ -3536,7 +3536,17 @@ window.initProcedsBlockly = function(customStatementType) {
     };
   }
 
-  var makeProcedureInit = function(withReturn, withStatements = true, withParameters = false, defaultName, title, comment, tooltip, helpUrl) {
+  var makeProcedureInit = function(
+    withReturn,
+    withStatements = true,
+    withParameters = false,
+    defaultName,
+    title,
+    comment,
+    tooltip,
+    helpUrl,
+    returnMsg = Blockly.Msg.PROCEDURES_DEFRETURN_RETURN
+  ) {
     return function() {
       var defaultLegalName = Blockly.Procedures.findLegalName(defaultName, this);
       var nameField = new Blockly.FieldTextInput(defaultLegalName, Blockly.Procedures.rename);
@@ -3564,7 +3574,7 @@ window.initProcedsBlockly = function(customStatementType) {
       if (withReturn)
         this.appendValueInput('RETURN')
             .setAlign(Blockly.ALIGN_RIGHT)
-            .appendField(Blockly.Msg.PROCEDURES_DEFRETURN_RETURN);
+            .appendField(returnMsg);
 
       // if (withParametersMutator)
       //   this.setMutator(new Blockly.Mutator(['procedures_mutatorarg']));
@@ -3866,7 +3876,17 @@ window.initProcedsBlockly = function(customStatementType) {
     defType_: 'procedures_defreturnsimple'
   };
 
-  // -------------------------------------------------------------------
+  // ---------------------------------------------------------------
+  // [!] Calling `initialize` to support another types of procedures
+  // ---------------------------------------------------------------
+  initialize(
+    makeProcedureInit,
+    makeUpdateParams,
+    makeProcedureDomToMutation,
+    makeProcedureCustomMenu
+  );
+
+    // -------------------------------------------------------------------
   // [!] Adding two flyoutCategories: PROCEDURE_CALLS and FUNCTION_CALLS
   // -------------------------------------------------------------------
 
@@ -4035,9 +4055,122 @@ window.initProcedsBlockly = function(customStatementType) {
 
 }
 </script>
-  <script>initProcedsBlockly("Statement");</script>
   <script>/* global Blockly */
 
+// Initialize proceds-blockly creating new custom functions
+initProcedsBlockly("Statement", (makeProcedureInit, makeUpdateParams, makeProcedureDomToMutation, makeProcedureCustomMenu) => {
+  Blockly.Blocks['DefinicionDeFuncionDeclarativa'] = {
+    init: makeProcedureInit(
+      true, true, true,
+      "algo",
+      "Definir que",
+      Blockly.Msg.PROCEDURES_DEFRETURN_COMMENT,
+      Blockly.Msg.PROCEDURES_DEFRETURN_TOOLTIP,
+      Blockly.Msg.PROCEDURES_DEFRETURN_HELPURL,
+      "es igual a"
+    ),
+    setStatements_: Blockly.Blocks['procedures_defreturn'].setStatements_,
+    updateParams_: makeUpdateParams(),
+    mutationToDom: Blockly.Blocks['procedures_defreturn'].mutationToDom,
+    domToMutation: makeProcedureDomToMutation(),
+    decompose: Blockly.Blocks['procedures_defreturn'].decompose,
+    compose: Blockly.Blocks['procedures_defreturn'].compose,
+    getProcedureDef: Blockly.Blocks['procedures_defreturn'].getProcedureDef,
+    getVars: Blockly.Blocks['procedures_defreturn'].getVars,
+    renameVar: Blockly.Blocks['procedures_defreturn'].renameVar,
+    customContextMenu: makeProcedureCustomMenu(true),
+    callType_: 'procedures_callreturndeclarative'
+  };
+
+  Blockly.Blocks['procedures_callreturndeclarative'] = {
+    init: Blockly.Blocks['procedures_callreturn'].init,
+    getProcedureCall: Blockly.Blocks['procedures_callreturn'].getProcedureCall,
+    renameProcedure: Blockly.Blocks['procedures_callreturn'].renameProcedure,
+    setProcedureParameters_: Blockly.Blocks['procedures_callreturn'].setProcedureParameters_,
+    updateShape_: Blockly.Blocks['procedures_callreturn'].updateShape_,
+    mutationToDom: Blockly.Blocks['procedures_callreturn'].mutationToDom,
+    domToMutation: Blockly.Blocks['procedures_callreturn'].domToMutation,
+    renameVar: Blockly.Blocks['procedures_callreturn'].renameVar,
+    onchange: Blockly.Blocks['procedures_callreturn'].onchange,
+    customContextMenu: Blockly.Blocks['procedures_callreturn'].customContextMenu,
+    defType_: 'DefinicionDeFuncionDeclarativa'
+  };
+
+  Blockly.Blocks['DefinicionDeFuncionSimpleConParametrosDeclarativa'] = {
+    init: makeProcedureInit(
+      true, false, true,
+      "algo",
+      "Definir que",
+      Blockly.Msg.PROCEDURES_DEFRETURN_COMMENT,
+      Blockly.Msg.PROCEDURES_DEFRETURN_TOOLTIP,
+      Blockly.Msg.PROCEDURES_DEFRETURN_HELPURL,
+      "es igual a"
+    ),
+    setStatements_: Blockly.Blocks['procedures_defreturn'].setStatements_,
+    updateParams_: makeUpdateParams(),
+    mutationToDom: Blockly.Blocks['procedures_defreturn'].mutationToDom,
+    domToMutation: makeProcedureDomToMutation(),
+    decompose: Blockly.Blocks['procedures_defreturn'].decompose,
+    compose: Blockly.Blocks['procedures_defreturn'].compose,
+    getProcedureDef: Blockly.Blocks['procedures_defreturn'].getProcedureDef,
+    getVars: Blockly.Blocks['procedures_defreturn'].getVars,
+    renameVar: Blockly.Blocks['procedures_defreturn'].renameVar,
+    customContextMenu: makeProcedureCustomMenu(true),
+    callType_: 'procedures_callreturndeclarativesimplewithparams'
+  };
+
+  Blockly.Blocks['procedures_callreturndeclarativesimplewithparams'] = {
+    init: Blockly.Blocks['procedures_callreturn'].init,
+    getProcedureCall: Blockly.Blocks['procedures_callreturn'].getProcedureCall,
+    renameProcedure: Blockly.Blocks['procedures_callreturn'].renameProcedure,
+    setProcedureParameters_: Blockly.Blocks['procedures_callreturn'].setProcedureParameters_,
+    updateShape_: Blockly.Blocks['procedures_callreturn'].updateShape_,
+    mutationToDom: Blockly.Blocks['procedures_callreturn'].mutationToDom,
+    domToMutation: Blockly.Blocks['procedures_callreturn'].domToMutation,
+    renameVar: Blockly.Blocks['procedures_callreturn'].renameVar,
+    onchange: Blockly.Blocks['procedures_callreturn'].onchange,
+    customContextMenu: Blockly.Blocks['procedures_callreturn'].customContextMenu,
+    defType_: 'DefinicionDeFuncionSimpleConParametrosDeclarativa'
+  };
+
+  Blockly.Blocks['DefinicionDeFuncionSimpleDeclarativa'] = {
+    init: makeProcedureInit(
+      true, false, false,
+      "algo",
+      "Definir que",
+      Blockly.Msg.PROCEDURES_DEFRETURN_COMMENT,
+      Blockly.Msg.PROCEDURES_DEFRETURN_TOOLTIP,
+      Blockly.Msg.PROCEDURES_DEFRETURN_HELPURL,
+      "es igual a"
+    ),
+    setStatements_: Blockly.Blocks['procedures_defreturn'].setStatements_,
+    updateParams_: makeUpdateParams(),
+    mutationToDom: Blockly.Blocks['procedures_defreturn'].mutationToDom,
+    domToMutation: makeProcedureDomToMutation(),
+    decompose: Blockly.Blocks['procedures_defreturn'].decompose,
+    compose: Blockly.Blocks['procedures_defreturn'].compose,
+    getProcedureDef: Blockly.Blocks['procedures_defreturn'].getProcedureDef,
+    getVars: Blockly.Blocks['procedures_defreturn'].getVars,
+    renameVar: Blockly.Blocks['procedures_defreturn'].renameVar,
+    customContextMenu: makeProcedureCustomMenu(false),
+    callType_: 'procedures_callreturndeclarativesimple'
+  };
+
+  Blockly.Blocks['procedures_callreturndeclarativesimple'] = {
+    init: Blockly.Blocks['procedures_callreturn'].init,
+    getProcedureCall: Blockly.Blocks['procedures_callreturn'].getProcedureCall,
+    renameProcedure: Blockly.Blocks['procedures_callreturn'].renameProcedure,
+    setProcedureParameters_: Blockly.Blocks['procedures_callreturn'].setProcedureParameters_,
+    updateShape_: Blockly.Blocks['procedures_callreturn'].updateShape_,
+    mutationToDom: Blockly.Blocks['procedures_callreturn'].mutationToDom,
+    domToMutation: Blockly.Blocks['procedures_callreturn'].domToMutation,
+    renameVar: Blockly.Blocks['procedures_callreturn'].renameVar,
+    onchange: Blockly.Blocks['procedures_callreturn'].onchange,
+    customContextMenu: Blockly.Blocks['procedures_callreturn'].customContextMenu,
+    defType_: 'DefinicionDeFuncionSimpleDeclarativa'
+  };
+});
+
 Blockly.CUSTOM_COLORS = {"globalHsvSaturation":0.45,"globalHsvValue":0.65,"primitiveCommand":"#1d3c99","assignation":"#051d66","controlStructure":"#0f2b80","literalExpression":"#1d992c","primitiveExpression":"#1d992c","operator":"#0f801c","program":"#8d1bb3","interactiveProgram":"#6e158c","interactiveBinding":"#a11fcc","procedure":"#935ba6","function":"#745380","primitiveProcedure":"#2e4fb3","primitiveFunction":"#2eb33e","procedure_call":"#355bcc","function_call":"#35cc47","variable":"#056610","parameter":"#056610","complete":"#ff0000","H":{"commands":225,"expressions":127,"definitions":285},"S":{"assignation":95,"variable":95,"parameter":95,"primitiveCommand":81,"literalExpression":81,"primitiveExpression":81,"controlStructure":88,"operator":88,"procedure_call":74,"function_call":74,"primitiveProcedure":74,"primitiveFunction":74,"program":85,"interactiveProgram":85,"interactiveBinding":85,"procedure":45,"function":35,"complete":99},"V":{"assignation":40,"variable":40,"parameter":40,"primitiveCommand":60,"literalExpression":60,"primitiveExpression":60,"controlStructure":50,"operator":50,"procedure_call":80,"function_call":80,"primitiveProcedure":70,"primitiveFunction":70,"program":70,"interactiveProgram":55,"interactiveBinding":80,"procedure":65,"function":50,"complete":99}};
 Blockly.AVAILABLE_ICONS = ["bool-false.svg","bool-true.svg","clean.png","color-azul.svg","color-negro.svg","color-rojo.svg","color-verde.svg","direccion-este.svg","direccion-norte.svg","direccion-oeste.svg","direccion-sur.svg","hand.png","minus.png","plus.png"];
 const EMPTY_GIF = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
@@ -5898,6 +6031,9 @@ Blockly.GobstonesLanguage.procedures_defreturn = function (block) {
 Blockly.GobstonesLanguage.procedures_defnoreturnnoparams = Blockly.GobstonesLanguage.procedures_defnoreturn;
 Blockly.GobstonesLanguage.procedures_defreturnsimplewithparams = Blockly.GobstonesLanguage.procedures_defreturn;
 Blockly.GobstonesLanguage.procedures_defreturnsimple = Blockly.GobstonesLanguage.procedures_defreturn;
+Blockly.GobstonesLanguage.DefinicionDeFuncionDeclarativa = Blockly.GobstonesLanguage.procedures_defreturn;
+Blockly.GobstonesLanguage.DefinicionDeFuncionSimpleConParametrosDeclarativa = Blockly.GobstonesLanguage.procedures_defreturn;
+Blockly.GobstonesLanguage.DefinicionDeFuncionSimpleDeclarativa = Blockly.GobstonesLanguage.procedures_defreturn;
 
 var procedureCall = function(block, capitalizeFirst, newLine) {
 	var procName = formatCallName(block.getFieldValue('NAME'),capitalizeFirst);
@@ -5920,6 +6056,9 @@ Blockly.GobstonesLanguage.procedures_callreturn = function (block) {
 Blockly.GobstonesLanguage.procedures_callnoreturnnoparams = Blockly.GobstonesLanguage.procedures_callnoreturn;
 Blockly.GobstonesLanguage.procedures_callreturnsimplewithparams = Blockly.GobstonesLanguage.procedures_callreturn;
 Blockly.GobstonesLanguage.procedures_callreturnsimple = Blockly.GobstonesLanguage.procedures_callreturn;
+Blockly.GobstonesLanguage.procedures_callreturndeclarative = Blockly.GobstonesLanguage.procedures_callreturn;
+Blockly.GobstonesLanguage.procedures_callreturndeclarativesimplewithparams = Blockly.GobstonesLanguage.procedures_callreturn;
+Blockly.GobstonesLanguage.procedures_callreturndeclarativesimple = Blockly.GobstonesLanguage.procedures_callreturn;
 
 Blockly.GobstonesLanguage.variables_get = function (block) {
 	var code = formatCallName(block.getFieldValue('VAR'),false,Blockly.VARIABLE_CATEGORY_NAME);

data/lib/gobstones/blockly/version.rb

@@ -1,5 +1,5 @@
 module Gobstones
   module Blockly
-    VERSION = "0.28.1"
+    VERSION = "0.29.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobstones-blockly
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.29.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler