gobstones-blockly 0.19.2 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ea3b4b8c8c5a9a5626424759cfb545fe3aeb06bbdba73fe7f5b41f813899ad2
-  data.tar.gz: 7ea186db0def9c8f28ec00d66df72090cd61989403f8f75fa83ce863b19c2522
+  metadata.gz: 920c5934d5686a81610961b1ebeb8fd20d69d5f99a25d70ee13f68eca2f7ad99
+  data.tar.gz: a794e4321b9aa6b894bc4f1e063cae3489a61093617b4fd18ca315d0fe0f8e61
 SHA512:
-  metadata.gz: f580833b194e9adb2346b643e2b839bb58ddc6269a56b6c36a88b81e40419c12a7e70e77ebdd19d8397941bf88697c16a1ad42599fe1fae26af38669d52f3d11
-  data.tar.gz: eb8fa9c88a4a94779ba7dc13105b45ef45166269dcb605cc0d73d2711b6be8fd78933b36427ecfd6d97cfc1b2f2560c8c764536987d8a1d454239869e8ac395e
+  metadata.gz: 43b7372f467fd059bec1d83b2b6a24d54f63eb2d652882bd0570bfc51428e1cdccfce2eaa42e81b393797536b32715d657dfc6da6d7d8175fe14d33333033b23
+  data.tar.gz: 2688976a1d3c2f031e1c1639eaad57682173b25b9a70df32e08f99e06036305e66979eb1b04ec0bdcd63c400faa75ef4865b3eae04ec4af50978cd36772ad255

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

@@ -41,7 +41,7 @@ Example:
           <block type="VaciarTablero"></block>
           <block type="BOOM"></block>
         </category>
-        <category name="Procedimientos primitivos">
+        <category name="Procedimientos primitivos" gbs_custom="PRIMITIVE_PROCEDURES">
         </category>
         <category name="Mis procedimientos" custom="PROCEDURE_CALLS">
         </category>
@@ -69,7 +69,7 @@ Example:
           <block type="puedeMover"></block>
           <block type="nroBolitas"></block>
         </category>
-        <category name="Funciones primitivas">
+        <category name="Funciones primitivas" gbs_custom="PRIMITIVE_FUNCTIONS">
         </category>
         <category name="Mis funciones" custom="FUNCTION_CALLS">
         </category>
@@ -5871,13 +5871,20 @@ Blockly.ErrorInforming.CssContent = [
 ];</script>
 
   <script>
-    const BLOCKLY_PRIMITIVE_PROCEDURES = "Procedimientos primitivos";
-    const BLOCKLY_PRIMITIVE_FUNCTIONS = "Funciones primitivas";
-
     Polymer({
       is: 'gs-element-blockly',
 
       properties: {
+        primitiveProceduresCategoryName: {
+          type: String,
+          value: "Procedimientos primitivos"
+        },
+
+        primitiveFunctionsCategoryName: {
+          type: String,
+          value: "Funciones primitivas"
+        },
+
         /*
          * `primitiveProcedures` lista de definiciones de procedimientos primitivos.
          * Ej: ["Poner_FloresAl_"] Se transormara en un bloque con dos inputs inline, cuyo
@@ -6043,6 +6050,8 @@ Blockly.ErrorInforming.CssContent = [
         let tree = []
         let xml = toolboxXML || this.$$('#toolbox').innerHTML;
 
+        xml = this._processCustomCategories(xml);
+
         // TODO: Este parseo por strings es tremendo, y esa property `xml` de los nodos se usa en _toolboxBlockXML, _toolboxBlockXML, etc. Hay que hacer de vuelta todo lo de acciones primitivas.
 
         xml = xml.replace(/> *<\/category>/g, ">\n</category>");
@@ -6064,9 +6073,9 @@ Blockly.ErrorInforming.CssContent = [
           else if(line.indexOf('<category') >= 0) {
             let m = line.match('name="([^"]*)"')
             if(m.length == 2 && (
-              (m[1] == BLOCKLY_PRIMITIVE_PROCEDURES && primitiveProcedures && primitiveProcedures.length > 0) ||
-              (m[1] == BLOCKLY_PRIMITIVE_FUNCTIONS && primitiveFunctions && primitiveFunctions.length > 0) ||
-              (m[1] != BLOCKLY_PRIMITIVE_PROCEDURES && m[1] != BLOCKLY_PRIMITIVE_FUNCTIONS))) {
+              (m[1] == this.primitiveProceduresCategoryName && primitiveProcedures && primitiveProcedures.length > 0) ||
+              (m[1] == this.primitiveFunctionsCategoryName && primitiveFunctions && primitiveFunctions.length > 0) ||
+              (m[1] != this.primitiveProceduresCategoryName && m[1] != this.primitiveFunctionsCategoryName))) {
               parent.push({
                 type: 'category',
                 name: m[1],
@@ -6075,7 +6084,7 @@ Blockly.ErrorInforming.CssContent = [
               });
               stack.push(parent);
               parent = parent[parent.length - 1].child;
-              if(m[1] == BLOCKLY_PRIMITIVE_PROCEDURES)
+              if(m[1] == this.primitiveProceduresCategoryName)
               {
                 for(var i in primitiveProcedures) {
                   parent.push({
@@ -6084,7 +6093,7 @@ Blockly.ErrorInforming.CssContent = [
                   });
                 }
               }
-              if(m[1] == BLOCKLY_PRIMITIVE_FUNCTIONS)
+              if(m[1] == this.primitiveFunctionsCategoryName)
               {
                 for(var i in primitiveFunctions) {
                   parent.push({
@@ -6200,8 +6209,8 @@ Blockly.ErrorInforming.CssContent = [
             }
           };
 
-          addCustomActions("primitiveProcedures", BLOCKLY_PRIMITIVE_PROCEDURES);
-          addCustomActions("primitiveFunctions", BLOCKLY_PRIMITIVE_FUNCTIONS);
+          addCustomActions("primitiveProcedures", this.primitiveProceduresCategoryName);
+          addCustomActions("primitiveFunctions", this.primitiveFunctionsCategoryName);
         } else {
           toolbox = tree;
         }
@@ -6609,6 +6618,32 @@ Blockly.ErrorInforming.CssContent = [
         });
       },
 
+      _processCustomCategories(xml) {
+        const parsedXml = Blockly.Xml.textToDom(`<xml>${xml}</xml>`);
+
+        const forEachNode = (node, action) => {
+          action(node);
+          node.childNodes.forEach((node) => forEachNode(node, action));
+        }
+
+        forEachNode(parsedXml, (node) => {
+          if (!node.getAttribute) return;
+
+          const name = node.getAttribute("name");
+          const custom = node.getAttribute("gbs_custom");
+
+          if (custom === "PRIMITIVE_PROCEDURES") {
+            this.primitiveProceduresCategoryName = name;
+          }
+
+          if (custom === "PRIMITIVE_FUNCTIONS") {
+            this.primitiveFunctionsCategoryName = name;
+          }
+        });
+
+        return Blockly.Xml.domToText(parsedXml);
+      },
+
       _mapToolboxTree: function(toolboxTree, f){
         var resultingList = [];
         for (var i in toolboxTree){

data/lib/gobstones/blockly/version.rb

@@ -1,5 +1,5 @@
 module Gobstones
   module Blockly
-    VERSION = "0.19.2"
+    VERSION = "0.20.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobstones-blockly
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.20.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler