mumuki-gobstones-runner 2.4.1 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eae1a47ac206d6de39e4858bfcc94777c6414420cd88d6c5d0124b494dffec5
-  data.tar.gz: baea256cd8be5c4fe0fe5c04c8d88013882907ae4420ec56e918fba08aa3638a
+  metadata.gz: d96082c599e490cc9fb4852f5abeb3e1d1028dae114a164439c012de51b21f0f
+  data.tar.gz: 0ec06a7c118e46a253a6b1c5629743f06557df5a2a08c659a70316b22e2c36d9
 SHA512:
-  metadata.gz: 0d5898de7105cbfe6ffa05070a12d22d7869975d4330cc4e57d44e246e021d435d675d75e5675a367010a9c6902d3ab0d338a91eb214f071acbea1bbffe49723
-  data.tar.gz: 17114df8ed403b4af65145a36108b9a7b95fb8484bc73773d63da13c10882786bd13839d165c60c1a695f14f892241f06633549e10ee3a24b9fb05aa8c39545e
+  metadata.gz: 1de5ceb45cd458d6ab9f9d15ee9e43a58b020892334986b890f52383e11d5bfa3cc4055d4e5a70f56a5a571c52308bf7a3207da2fbb22be159f3cc46d34544d5
+  data.tar.gz: 3926c4c075c955982333d363b3423cecc9cc77ff52249fd9147c58fc9943499a74dd0b63dd4cfa43f3df66a5b2b27652a840b53a9a1fe2f4cdbe432752ee78c2

data/lib/assets_server.rb

@@ -13,6 +13,10 @@ class Mumukit::Server::App < Sinatra::Base
     get_asset route, Gobstones::CodeRunner.assets_path_for(path), type
   end
 
+  def self.get_local_svg(name, asset_type)
+    get_local_asset "#{asset_type}/#{name}.svg", "lib/public/#{name}.svg", 'image/svg+xml'
+  end
+
   ['polymer', 'polymer-mini', 'polymer-micro'].each { |name|
     get_board_asset "#{name}.html", "htmls/vendor/#{name}.html", 'text/html'
   }
@@ -22,12 +26,18 @@ class Mumukit::Server::App < Sinatra::Base
 
   get_submit_asset 'editor/gobstones-code-runner.html', 'htmls/gobstones-code-runner.html', 'text/html'
 
+  get_local_asset 'layout/layout.html', 'lib/render/layout/layout.html', 'text/html'
   get_local_asset 'editor/editor.js', 'lib/render/editor/editor.js', 'application/javascript'
   get_local_asset 'editor/editor.css', 'lib/render/editor/editor.css', 'text/css'
   get_local_asset 'editor/editor.html', 'lib/render/editor/editor.html', 'text/html'
   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'
-  ['red', 'blue', 'green', 'black', 'attires_enabled', 'attires_disabled'].each { |name|
-    get_local_asset "editor/#{name}.svg", "lib/public/#{name}.svg", 'image/svg+xml'
-  }
+
+  ['red', 'blue', 'green', 'black'].each do |name|
+    get_local_svg(name, 'editor')
+  end
+
+  ['attires_enabled', 'attires_disabled'].each do |name|
+    get_local_svg(name, 'layout')
+  end
 end

data/lib/gobstones_runner.rb

@@ -5,7 +5,7 @@ I18n.load_translations_path File.join(__dir__, 'locales', '*.yml')
 
 Mumukit.runner_name = 'gobstones'
 Mumukit.configure do |config|
-  config.docker_image = 'mumuki/mumuki-gobstones-worker:6.0'
+  config.docker_image = 'mumuki/mumuki-gobstones-worker:9.0'
   config.content_type = 'html'
   config.structured = true
 end

data/lib/metadata_hook.rb

@@ -12,7 +12,8 @@ class GobstonesMetadataHook < Mumukit::Hook
       layout_assets_urls: {
         html: [
           'assets/polymer.html',
-          'assets/gs-board.html'
+          'assets/gs-board.html',
+          'assets/layout/layout.html'
         ]
       },
       editor_assets_urls: {

data/lib/render/boards.html.erb

@@ -48,6 +48,7 @@
     </div>
   <% end %>
 
+  <gs-attire-toggle-button></gs-attire-toggle-button>
 </div>
 
 <% if @result[:reason] %>

data/lib/render/editor/editor.html

@@ -189,7 +189,7 @@
             });
 
             const hasCustomToolbox = $('gs-toolbox').length;
-            if(!hasCustomToolbox) mumuki.assetsLoadedFor('editor');
+            if(!hasCustomToolbox) this.enableContextButton();
           });
         };
 
@@ -229,6 +229,15 @@
         }
       },
 
+      enableContextButton() {
+        if(typeof mumuki !== "undefined" && mumuki.kids && mumuki.assetsLoadedFor) {
+          return mumuki.assetsLoadedFor('editor');
+        } else {
+          return postpone(this.enableContextButton.bind(this));
+        }
+
+      },
+
       getBlockly: function () {
         return this.$.blocklyElement;
       },
@@ -757,30 +766,6 @@
   </script>
 </dom-module>
 
-<dom-module id="gs-attire">
-  <script>
-    Polymer({
-      is: 'gs-attire',
-      properties: {
-        attireUrl: Object,
-        observer: '_attireChanged'
-      },
-
-      attached: function () {
-        this._setAttire();
-      },
-      _attireChanged: function () {
-        this._setAttire();
-      },
-      _setAttire: function () {
-        $.getJSON(this.attireUrl, function (attire) {
-          GobstonesBoard && GobstonesBoard.setDefaultAttire(attire);
-        });
-      }
-    });
-  </script>
-</dom-module>
-
 <dom-module id="gs-toolbox">
   <script>
     Polymer({
@@ -804,7 +789,7 @@
           blockly.toolbox = { defaultToolbox: toolboxXml };
           editor.setTeacherActions(blockly);
         }).always(function () {
-          mumuki.assetsLoadedFor('editor');
+          editor.enableContextButton();
         });
       }
     });
@@ -1020,7 +1005,7 @@
         if(this.configLoaded) this._createSwipeListener();
       },
       _createSwipeListener: function () {
-        if(typeof Hammer === "undefined") return postpone(this._createSwipeListener);
+        if(typeof Hammer === "undefined") return postpone(this._createSwipeListener.bind(this));
         const $swipeListenerArea = $('.mu-initial-state gs-board')[0];
         const hammer = new Hammer($swipeListenerArea);
         hammer.get('swipe').set({direction: Hammer.DIRECTION_ALL});
@@ -1057,7 +1042,7 @@
 
       _createKeyboardConfig: function () {
         if(typeof GobstonesKeyboard === 'undefined') GobstonesKeyboard = {};
-        if(typeof Hammer === "undefined") return postpone(this._createKeyboardConfig);
+        if(typeof Hammer === "undefined") return postpone(this._createKeyboardConfig.bind(this));
         GobstonesKeyboard.keyboardMap = {
           [Hammer.DIRECTION_LEFT]: 37,
           [Hammer.DIRECTION_UP]: 38,
@@ -1081,81 +1066,3 @@
   </script>
 </dom-module>
 
-<dom-module id="gs-attire-toggle-button">
-  <style>
-    .button {
-      position: absolute;
-      cursor: pointer;
-      top: -2px;
-      right: 0;
-      -ms-transform-origin: right center;
-      -webkit-transform-origin: right center;
-      transform-origin: right center;
-    }
-  </style>
-
-  <template>
-    <template is="dom-if" if="{{shouldDisplay}}">
-      <div class="button" on-click="_onButtonClick">
-        <template is="dom-if" if="{{isEnabled}}">
-          <img src="./attires_enabled.svg">
-        </template>
-        <template is="dom-if" if="{{!isEnabled}}">
-          <img src="./attires_disabled.svg">
-        </template>
-      </div>
-    </template>
-  </template>
-
-  <script>
-    Polymer({
-      is: 'gs-attire-toggle-button',
-      properties: {
-        isEnabled: {
-          type: Boolean,
-          value: true
-        }
-      },
-
-      ready: function () {
-        document.addEventListener('board-attire-changed', this._updateVisibility.bind(this));
-        this._relocateButton();
-      },
-
-      _updateVisibility: function () {
-        this.boards = $(".mu-kids-states").find("gs-board");
-        this.shouldDisplay = this.boards.toArray().some(board => board.attire);
-      },
-
-      _onButtonClick: function () {
-        this.isEnabled = !this.isEnabled;
-
-        this.boards.each((__, board) => {
-          if (board.attire) board.set("attire.enabled", this.isEnabled);
-          gbsBoardRemoveBorder(board);
-        });
-      },
-
-      _getEditor: function () {
-        return $("mu-gobstones-custom-editor")[0];
-      },
-
-      _relocateButton: function () {
-        const $container = $('.mu-kids-gbs-board-initial');
-        if(!$container.length || this._getEditor().interactiveMode) return;
-        const $header = $('.mu-initial-state-header');
-        const headerWidth = $header.width() || $container.width();
-        const $attireToggle = $container.find('.button.gs-attire-toggle-button');
-        if(!$attireToggle.length) return setTimeout(() => this._relocateButton());
-        const margin = 4; // Leave a margin between text and image
-        const maxSize = 65.75; // Original width
-        mumuki.resize(() => {
-          $attireToggle.css('transform', 'scale(1)');
-          let buttonSize = (($container.width() - headerWidth) / 2) - margin;
-          let scaleX = Math.min(buttonSize, maxSize) / $attireToggle.width();
-          $attireToggle.css('transform', `scale(${scaleX})`);
-        });
-      },
-    });
-  </script>
-</dom-module>

data/lib/render/layout/layout.html

@@ -0,0 +1,109 @@
+<dom-module id="gs-attire">
+  <script>
+    Polymer({
+      is: 'gs-attire',
+      properties: {
+        attireUrl: Object,
+        observer: '_attireChanged'
+      },
+
+      attached: function () {
+        this._setAttire();
+      },
+      _attireChanged: function () {
+        this._setAttire();
+      },
+      _setAttire: function () {
+        $.getJSON(this.attireUrl, function (attire) {
+          GobstonesBoard && GobstonesBoard.setDefaultAttire(attire);
+        });
+      }
+    });
+  </script>
+</dom-module>
+
+<dom-module id="gs-attire-toggle-button">
+  <style>
+    :host-context(.mu-kids-states) .button {
+      position: absolute;
+      cursor: pointer;
+      top: -2px;
+      right: 0;
+      -ms-transform-origin: right center;
+      -webkit-transform-origin: right center;
+      transform-origin: right center;
+    }
+
+    :host-context(.boards-container) .button {
+      cursor: pointer;
+      margin-top: -8px;
+    }
+  </style>
+
+  <template>
+    <template is="dom-if" if="{{shouldDisplay}}">
+      <div class="button" on-click="_onButtonClick">
+        <template is="dom-if" if="{{isEnabled}}">
+          <img src="./attires_enabled.svg">
+        </template>
+        <template is="dom-if" if="{{!isEnabled}}">
+          <img src="./attires_disabled.svg">
+        </template>
+      </div>
+    </template>
+  </template>
+
+  <script>
+    Polymer({
+      is: 'gs-attire-toggle-button',
+      properties: {
+        isEnabled: {
+          type: Boolean,
+          value: true
+        }
+      },
+
+      ready: function () {
+        this._updateVisibility();
+        document.addEventListener('board-attire-changed', this._updateVisibility.bind(this));
+        this._relocateButton();
+      },
+
+      _updateVisibility: function () {
+        this.boards = $(this).parents(".mu-kids-states, .boards-container").find("gs-board");
+        this.shouldDisplay = this.boards.toArray().some(board => board.attire);
+      },
+
+      _onButtonClick: function () {
+        this.isEnabled = !this.isEnabled;
+
+        this.boards.each((__, board) => {
+          if (board.attire) board.set("attire.enabled", this.isEnabled);
+          board.updateStyles();
+        });
+      },
+
+      _getEditor: function () {
+        return $("mu-gobstones-custom-editor")[0];
+      },
+
+      _relocateButton: function () {
+        const $container = $('.mu-kids-gbs-board-initial');
+        if(!$container.length || this._getEditor().interactiveMode) return;
+        const $header = $('.mu-initial-state-header');
+        const headerWidth = $header.width() || $container.width();
+        const $attireToggle = $container.find('.button.gs-attire-toggle-button');
+        if(!$attireToggle.length) return setTimeout(() => this._relocateButton());
+        const margin = 4; // Leave a margin between text and image
+        const maxSize = 65.75; // Original width
+        mumuki.resize(() => {
+          $attireToggle.css('transform', 'scale(1)');
+          let buttonSize = (($container.width() - headerWidth) / 2) - margin;
+          let scaleX = Math.min(buttonSize, maxSize) / $attireToggle.width();
+          $attireToggle.css('transform', `scale(${scaleX})`);
+        });
+      },
+    });
+  </script>
+</dom-module>
+

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module GobstonesVersionHook
-  VERSION = '2.4.1'
+  VERSION = '2.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-gobstones-runner
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.7.1
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: gobstones-blockly
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +193,7 @@ files:
 - lib/render/editor/hammer.min.js
 - lib/render/html_board.rb
 - lib/render/html_renderer.rb
+- lib/render/layout/layout.html
 - lib/render/with_renderer.rb
 - lib/test_hook.rb
 - lib/version_hook.rb
@@ -209,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Gobstones Runner for Mumuki