mumuki-gobstones-runner 2.13.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ba04506c9ef79dfcf3e5c4a080e1f147c87134f939afe70aa5f54e515640c51
-  data.tar.gz: 4fa2cae67f9e144499c8acc8eff28b3af3a4176a47df91b49085b2f3a9901d34
+  metadata.gz: d1e37b379d7f5b9d1741c5e284a8fb194bf7cf4e98d8ebe0d5560f8c18f550f3
+  data.tar.gz: f4db093fd3129f3427244acbcc5b5848044471bd917c1313d0c074e0adaf04cf
 SHA512:
-  metadata.gz: fd96ca8f78913c83581b165f73cf2f31b84b307c0dd7db599c2852aa9c794c7593b851595dd91aeadb0cbe9f515d4f93ca76c18c80db1f6444ae89aa8e40b396
-  data.tar.gz: dd57c527fe5915e0f2218dd3b152e850cb6a6c9a256877d16ccd252da48d8603b665bbfe1b5a459d66c9ed9b45a49751264f22f20f76bbcbc39aa14db8bb4cb7
+  metadata.gz: dfbe216007c99bc8cd60aac82a806dbdfed12a4b4a9384de32de8d0b3718151d289e77ab9c895d1e1da621419dc9bdf720e766d6289d8f83357af8be1177bdd3
+  data.tar.gz: 149eaa77b7069cf2f0af824afee3af05480d7d7e3a6dd36d1a31f4d90a7ea3fa377c70995b56b40dddcce119c9bc689139f3befe5ccb81a4748708d988440483

data/lib/assets_server.rb

@@ -17,10 +17,10 @@ class Mumukit::Server::App < Sinatra::Base
     get_local_asset "#{asset_type}/#{name}.svg", "lib/public/#{name}.svg", 'image/svg+xml'
   end
 
-  def self.get_media_assets(folder)
+  def self.get_media_assets(folder, content_type = nil)
     Dir.glob(File.join(__dir__,"../lib/public/#{folder}/*")).each do |path|
       relative_media_asset_path = "#{folder}/#{File.basename path}"
-      get_local_asset relative_media_asset_path, "lib/public/#{relative_media_asset_path}"
+      get_local_asset relative_media_asset_path, "lib/public/#{relative_media_asset_path}", content_type
     end
   end
 
@@ -38,9 +38,13 @@ class Mumukit::Server::App < Sinatra::Base
   get_local_asset 'editor/editor.css', 'lib/render/editor/editor.css', 'text/css'
   get_local_asset 'editor/hammer.min.js', 'lib/render/editor/hammer.min.js', 'application/javascript'
   get_local_asset 'boom.png', 'lib/public/boom.png', 'image/png'
+
+  # Depracated, prefer toolbox path
   get_local_asset 'full-kindergarten-toolbox.xml', 'lib/public/full-kindergarten-toolbox.xml', 'text/plain'
   get_local_asset 'minimal-kindergarten-toolbox.xml', 'lib/public/minimal-kindergarten-toolbox.xml', 'text/plain'
 
+  get_media_assets 'toolbox', 'text/plain'
+
   get_media_assets 'media'
   get_media_assets 'local-media'
 

data/lib/game_framework/extra.gbs.erb

@@ -62,6 +62,26 @@ procedure ShiftDown() {
   ShiftTo(Sur)
 }
 
+function one() {
+  return (1);
+}
+
+function two() {
+  return (2);
+}
+
+function three() {
+  return (3);
+}
+
+function four() {
+  return (4);
+}
+
+function five() {
+  return (5);
+}
+
 procedure ShiftTo(dir) {
   if (puedeMover(dir)) {
     Sacar(Rojo)

data/lib/public/minimal-kindergarten-toolbox.xml

@@ -1,2 +1 @@
 <category name="Procedimientos primitivos"></category>
-<category name="Funciones primitivas"></category>

data/lib/public/toolbox/kindergarten-2-to-3.xml

@@ -0,0 +1,6 @@
+<category name="Bloques de Gobstones">
+  <block type="RepeticionSimple"></block>
+  <block type="two"></block>
+  <block type="three"></block>
+</category>
+<category name="Procedimientos primitivos"></category>

data/lib/public/toolbox/kindergarten-2-to-4.xml

@@ -0,0 +1,7 @@
+<category name="Bloques de Gobstones">
+  <block type="RepeticionSimple"></block>
+  <block type="two"></block>
+  <block type="three"></block>
+  <block type="four"></block>
+</category>
+<category name="Procedimientos primitivos"></category>

data/lib/public/toolbox/kindergarten-2-to-5.xml

@@ -0,0 +1,8 @@
+<category name="Bloques de Gobstones">
+  <block type="RepeticionSimple"></block>
+  <block type="two"></block>
+  <block type="three"></block>
+  <block type="four"></block>
+  <block type="five"></block>
+</category>
+<category name="Procedimientos primitivos"></category>

data/lib/public/toolbox/kindergarten-full.xml

@@ -0,0 +1,5 @@
+<category name="Bloques de Gobstones">
+  <block type="RepeticionSimple"></block>
+</category>
+<category name="Funciones primitivas"></category>
+<category name="Procedimientos primitivos"></category>

data/lib/public/toolbox/kindergarten-minimal.xml

@@ -0,0 +1 @@
+<category name="Procedimientos primitivos"></category>

data/lib/render/editor/editor.html.erb

@@ -428,11 +428,14 @@
         console.debug("Set game actions");
         const blockly = this._getBlockly();
 
-        this._setPrimitiveProcedures((blockly.primitiveProcedures || []).concat([
-          this._gamePrimitive('ShiftUp'),
-          this._gamePrimitive('ShiftDown'),
-          this._gamePrimitive('ShiftLeft'),
-          this._gamePrimitive('ShiftRight')
+        this._setPrimitiveProcedures(
+          this._gamePrimitivesFor(blockly.primitiveProcedures, [
+            'ShiftUp', 'ShiftDown', 'ShiftLeft', 'ShiftRight'
+        ]));
+
+        this._setPrimitiveFunctions(
+          this._gamePrimitivesFor(blockly.primitiveFunctions, [
+            'one', 'two', 'three', 'four', 'five'
         ]));
       },
 
@@ -458,6 +461,10 @@
         return { alias: 'procedureDeclaration', name, attributes: {block_icon: `<%= @assets_url %>/media/${name}.png`} };
       },
 
+      _gamePrimitivesFor(base, names) {
+        return (base || []).concat(names.map(it => this._gamePrimitive(it)));
+      },
+
       _getBlockly() {
         return this.$.blocklyElement;
       },

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module GobstonesVersionHook
-  VERSION = '2.13.0'
+  VERSION = '2.14.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-gobstones-runner
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gobstones-board
@@ -240,12 +240,22 @@ files:
 - lib/public/media/disconnect.mp3
 - lib/public/media/disconnect.ogg
 - lib/public/media/disconnect.wav
+- lib/public/media/five.png
+- lib/public/media/four.png
+- lib/public/media/one.png
 - lib/public/media/quote0.png
 - lib/public/media/quote1.png
 - lib/public/media/sprites.png
 - lib/public/media/sprites.svg
+- lib/public/media/three.png
+- lib/public/media/two.png
 - lib/public/minimal-kindergarten-toolbox.xml
 - lib/public/red.svg
+- lib/public/toolbox/kindergarten-2-to-3.xml
+- lib/public/toolbox/kindergarten-2-to-4.xml
+- lib/public/toolbox/kindergarten-2-to-5.xml
+- lib/public/toolbox/kindergarten-full.xml
+- lib/public/toolbox/kindergarten-minimal.xml
 - lib/render/boards.html.erb
 - lib/render/editor/editor.css
 - lib/render/editor/editor.html.erb
@@ -276,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Gobstones Runner for Mumuki