mumuki-gobstones-runner 2.4.2 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94fc619f2b6796542a4db2237410814d10768d61385c97b4b02a287e89b07a5e
-  data.tar.gz: f21d46f395b03d2d7fd5832fb0a7fab09652b9a1be4b091eff12437d5b3531e4
+  metadata.gz: 7b4f5d5fb336bc9ac00ecd24b0ced150583e8d0ce3d62d59be42418731b208c8
+  data.tar.gz: 44de0eb3307ccbff273e2c687d451b7ab4cc1bbef78deef1bdb2fe34870fd6c0
 SHA512:
-  metadata.gz: 2142f02ca022f3cdb3ab5dec188590d2183aa6d228c9317d36a7c14ed2216e21cbbb8000dfe87566693b9d8481e7635be908c208d32e262d0854c6563999863f
-  data.tar.gz: f5edc2d22b0e2fcf4bd02a77c3a909ede29c6c9449aa7339ff0c17e6d84d49faf9f6c924e0b9f977e5e058e56b6ffc69a7a8fd4e9925f1302f37f421a20a1daf
+  metadata.gz: 0c2669f3fda5e9e864c5c445e5fc1de4464fb079420f1c08a256bfb1b09612b70d350ac4d7bcbb929c71a5a2dea8c6f27339cdf7f451821e7857ff5676885ec4
+  data.tar.gz: ca800ccace6b8df687ea08ab8cf1fb21a1d7b1e61979ce03c6d702016f3b8f8b86020bd047a60eb6c0ea0ef95c300bef56579fa6da54207494b890f17d3b3d8a

data/lib/assets_server.rb

@@ -13,6 +13,16 @@ 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
+
+  def self.get_media_assets(folder)
+    Dir.glob("lib/public/#{folder}/*").each do |path|
+      get_local_asset "#{folder}/#{File.basename path}", path
+    end
+  end
+
   ['polymer', 'polymer-mini', 'polymer-micro'].each { |name|
     get_board_asset "#{name}.html", "htmls/vendor/#{name}.html", 'text/html'
   }
@@ -22,12 +32,31 @@ 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'
-  }
+  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 'media'
+  get_media_assets 'local-media'
+
+  ['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
+
+  get '/assets/editor/editor.html' do
+    cross_origin
+    @game_framework_extra = Gobstones::CompilationMode::GameFramework.extra_code
+    @game_framework_program = Gobstones::CompilationMode::GameFramework.program_code
+    @game_framework_default = Gobstones::CompilationMode::GameFramework.default_code
+    @assets_url = "//#{request.host_with_port}/assets"
+    erb File.read('lib/render/editor/editor.html.erb')
+  end
 end

data/lib/checker.rb

@@ -49,7 +49,7 @@ module Gobstones
       fail_with status: :check_error_failed_another_reason,
                 result: {
                   reason: result[:finalBoardError],
-                  expected_code: expected
+                  expected_code: I18n.t("code_#{expected}")
                 } if reason_code != expected
     end
 
@@ -102,7 +102,7 @@ module Gobstones
     end
 
     def fail_with(error)
-      fail error.to_json
+      fail error[:status], details: error[:result]
     end
 
     def board_json(board)

data/lib/game_framework/default.gbs.erb

@@ -0,0 +1,3 @@
+procedure Main() {
+
+}

data/lib/game_framework/default.xml.erb

@@ -0,0 +1,3 @@
+<block type="procedures_defnoreturnnoparams" x="30" y="30">
+  <field name="NAME">Main</field>
+</block>

data/lib/game_framework/extra.gbs.erb

@@ -0,0 +1,84 @@
+procedure Before() {
+  x := 0
+  y := 0
+
+  while(puedeMover(Sur)) {
+    x := x + 1
+    Mover(Sur)
+  }
+  while(puedeMover(Oeste)) {
+    y := y + 1
+    Mover(Oeste)
+  }
+
+  NextStage()
+
+  while(x > 0) {
+    x := x - 1
+    Mover(Norte)
+  }
+  while(y > 0) {
+    y := y - 1
+    Mover(Este)
+  }
+}
+
+procedure After() {
+  GoToOrigin()
+  NextStage()
+}
+
+procedure NextStage() {
+  while(puedeMover(Norte)) {
+    NextRowStage()
+    Mover(Norte)
+  }
+  NextRowStage()
+  GoToOrigin()
+}
+
+procedure NextRowStage() {
+  while(puedeMover(Este)) {
+    Poner(Verde)
+    Mover(Este)
+  }
+  Poner(Verde)
+  IrAlBorde(Oeste)
+}
+
+procedure ShiftLeft() {
+  ShiftTo(Oeste)
+}
+
+procedure ShiftRight() {
+  ShiftTo(Este)
+}
+
+procedure ShiftUp() {
+  ShiftTo(Norte)
+}
+
+procedure ShiftDown() {
+  ShiftTo(Sur)
+}
+
+procedure ShiftTo(dir) {
+  if (puedeMover(dir)) {
+    Sacar(Rojo)
+    Mover(dir)
+    Poner(Rojo)
+    CheckCollision()
+  }
+}
+
+procedure CheckCollision() {
+  if (hayBolitas(Azul) && nroBolitas(Azul) mod 2 == 0) {
+    After();
+    BOOM("Colision")
+  }
+}
+
+procedure GoToOrigin() {
+  IrAlBorde(Sur)
+  IrAlBorde(Oeste)
+}

data/lib/game_framework/program.gbs.erb

@@ -0,0 +1,5 @@
+program {
+  Before()
+  Main()
+  After()
+}

data/lib/game_framework/program.xml.erb

@@ -0,0 +1,17 @@
+<block type="Program" deletable="false" x="189" y="177">
+  <statement name="program">
+    <block type="procedures_callnoreturnnoparams">
+      <mutation name="Before"></mutation>
+      <next>
+        <block type="procedures_callnoreturnnoparams">
+          <mutation name="Main"></mutation>
+          <next>
+            <block type="procedures_callnoreturnnoparams">
+              <mutation name="After"></mutation>
+            </block>
+          </next>
+        </block>
+      </next>
+    </block>
+  </statement>
+</block>

data/lib/gobstones.rb

@@ -8,5 +8,6 @@ end
 
 require_relative './gobstones/batch'
 require_relative './gobstones/batch_parser'
+require_relative './gobstones/compilation_mode'
 require_relative './gobstones/error_builder'
 require_relative './gobstones/example_code_builder'

data/lib/gobstones/batch.rb

@@ -1,11 +1,13 @@
 class Gobstones::Batch
   attr_accessor :options, :examples, :content, :extra
+  delegate :compile_content, :compile_extra, to: :@compilation_mode
 
   def initialize(content, examples, extra, options)
     @content = content
     @examples = examples
     @extra = extra
     @options = options
+    @compilation_mode = @options[:game_framework] ? Gobstones::CompilationMode::GameFramework : Gobstones::CompilationMode::Classic
   end
 
   def run_tests!(output)
@@ -16,8 +18,8 @@ class Gobstones::Batch
 
   def to_json
     {
-      code: content,
-      extraCode: extra,
+      code: compile_content(content),
+      extraCode: compile_extra(extra),
       examples: examples.map { |example| example_json(example) }
     }.to_json
   end

data/lib/gobstones/batch_parser.rb

@@ -3,7 +3,7 @@ module Gobstones::BatchParser
     def parse(request)
       test = parse_test(request)
 
-      options = parse_options test
+      options = parse_options(test).merge(parse_settings(request))
       examples = parse_examples test, options
 
       Gobstones::Batch.new request.content, examples, request.extra, options
@@ -11,6 +11,10 @@ module Gobstones::BatchParser
 
     private
 
+    def parse_settings(request)
+      { game_framework: !!request.dig(:settings, 'game_framework') }
+    end
+
     def parse_test(request)
       YAML.load(request.test).deep_symbolize_keys
     end

data/lib/gobstones/compilation_mode.rb

@@ -0,0 +1,60 @@
+module Gobstones
+  module CompilationMode
+    module Classic
+      class << self
+        def compile_extra(extra)
+          extra
+        end
+
+        def compile_content(content)
+          content
+        end
+      end
+    end
+
+    module GameFramework
+      class << self
+        def compile_extra(extra)
+          [extra, extra_code]
+        end
+
+        def compile_content(content)
+          if blockly_code?(content)
+            xml = Nokogiri::XML(content)
+            xml.root.add_child render_framework_file('program.xml')
+            xml.to_xhtml.gsub(/\n\s*/, '')
+          else
+            <<~GBS
+            #{content}
+
+            #{program_code}
+            GBS
+                .chop
+          end
+        end
+
+        def extra_code
+          render_framework_file 'extra.gbs'
+        end
+
+        def program_code
+          render_framework_file 'program.gbs'
+        end
+
+        def default_code
+          render_framework_file 'default.xml'
+        end
+
+        private
+
+        def blockly_code?(content)
+          content.strip.start_with? '<xml'
+        end
+
+        def render_framework_file(name)
+          ERB.new(File.read("lib/game_framework/#{name}.erb")).result
+        end
+      end
+    end
+  end
+end

data/lib/gobstones_runner.rb

@@ -1,13 +1,15 @@
 require 'mumukit'
 require 'erb'
+require 'nokogiri'
 
 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.1'
   config.content_type = 'html'
   config.structured = true
+  config.settings = true
 end
 
 require_relative './gobstones'

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/public/full-kindergarten-toolbox.xml

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

data/lib/public/local-media/bool-false.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="14.173px" height="14.173px" viewBox="0 0 14.173 14.173" enable-background="new 0 0 14.173 14.173" xml:space="preserve">
+<g id="Layer_2" display="none">
+	<g display="inline">
+		<rect x="-5.132" y="-3.933" fill="#5CBEFF" width="67.306" height="25.396"/>
+	</g>
+</g>
+<g id="Layer_3" display="none">
+</g>
+<g id="Layer_1">
+	
+		<line fill="#FFFFFF" stroke="#231F20" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="3.836" y1="3.836" x2="10.336" y2="10.336"/>
+	
+		<line fill="#FFFFFF" stroke="#231F20" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="10.336" y1="3.836" x2="3.836" y2="10.336"/>
+</g>
+<g id="Layer_4" display="none">
+	
+		<polyline display="inline" fill="none" stroke="#231F20" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
+		10.958,4.801 6.388,9.372 3.215,6.094 	"/>
+</g>
+</svg>

data/lib/public/local-media/bool-true.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="14.173px" height="14.173px" viewBox="0 0 14.173 14.173" enable-background="new 0 0 14.173 14.173" xml:space="preserve">
+<g id="Layer_2" display="none">
+	<g display="inline">
+		<rect x="-5.132" y="-3.933" fill="#5CBEFF" width="67.306" height="25.396"/>
+	</g>
+</g>
+<g id="Layer_3" display="none">
+</g>
+<g id="Layer_1">
+	<polyline fill="none" stroke="#231F20" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
+		10.958,4.801 6.388,9.372 3.215,6.094 	"/>
+</g>
+</svg>

data/lib/public/local-media/color-azul.svg

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="14.173px" height="14.173px" viewBox="0 0 14.173 14.173" enable-background="new 0 0 14.173 14.173" xml:space="preserve">
+<g id="Layer_2" display="none">
+	<g display="inline">
+		<rect x="-5.132" y="-3.933" fill="#5CBEFF" width="67.306" height="25.396"/>
+	</g>
+</g>
+<g id="Layer_3" display="none">
+</g>
+<g id="Layer_7">
+</g>
+<g id="Layer_1">
+	
+		<circle fill="#1B75BB" stroke="#231F20" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" cx="7.087" cy="7.086" r="3.688"/>
+</g>
+<g id="Layer_6" display="none">
+	<g display="inline">
+		<g>
+			
+				<path fill="#231F20" stroke="#231F20" stroke-width="0.9761" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M7.082,3.701c0.021,1.21-0.007,5.512,0,6.771L0.889,7.086L7.082,3.701z"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#231F20" stroke-width="0.9761" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M7.09,3.701c-0.021,1.21,0.008,5.512,0,6.771l6.194-3.386L7.09,3.701z"/>
+		</g>
+	</g>
+</g>
+<g id="Layer_5" display="none">
+	
+		<line display="inline" fill="#FFFFFF" stroke="#231F20" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="3.836" y1="3.836" x2="10.336" y2="10.336"/>
+	
+		<line display="inline" fill="#FFFFFF" stroke="#231F20" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="10.336" y1="3.836" x2="3.836" y2="10.336"/>
+</g>
+<g id="Layer_4" display="none">
+	
+		<polyline display="inline" fill="none" stroke="#231F20" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
+		10.958,4.801 6.388,9.372 3.215,6.094 	"/>
+</g>
+</svg>

data/lib/public/local-media/color-negro.svg

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="14.173px" height="14.173px" viewBox="0 0 14.173 14.173" enable-background="new 0 0 14.173 14.173" xml:space="preserve">
+<g id="Layer_2" display="none">
+	<g display="inline">
+		<rect x="-5.132" y="-3.933" fill="#5CBEFF" width="67.306" height="25.396"/>
+	</g>
+</g>
+<g id="Layer_3" display="none">
+</g>
+<g id="Layer_7">
+</g>
+<g id="Layer_1">
+	
+		<circle fill="#404041" stroke="#231F20" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" cx="7.087" cy="7.086" r="3.688"/>
+</g>
+<g id="Layer_6" display="none">
+	<g display="inline">
+		<g>
+			
+				<path fill="#231F20" stroke="#231F20" stroke-width="0.9761" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M7.082,3.701c0.021,1.21-0.007,5.512,0,6.771L0.889,7.086L7.082,3.701z"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#231F20" stroke-width="0.9761" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M7.09,3.701c-0.021,1.21,0.008,5.512,0,6.771l6.194-3.386L7.09,3.701z"/>
+		</g>
+	</g>
+</g>
+<g id="Layer_5" display="none">
+	
+		<line display="inline" fill="#FFFFFF" stroke="#231F20" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="3.836" y1="3.836" x2="10.336" y2="10.336"/>
+	
+		<line display="inline" fill="#FFFFFF" stroke="#231F20" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="10.336" y1="3.836" x2="3.836" y2="10.336"/>
+</g>
+<g id="Layer_4" display="none">
+	
+		<polyline display="inline" fill="none" stroke="#231F20" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
+		10.958,4.801 6.388,9.372 3.215,6.094 	"/>
+</g>
+</svg>