mumuki-laboratory 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1256a63d5d739814865604be435e85b3dfaf992f5e6a3b1f422a111621cdc0a
-  data.tar.gz: 07053f524225614515baf946df14b9550b9888bc59243e2f191b8a20486232bf
+  metadata.gz: 4baab2d6431fb7c2b847f565d313b72d9f6ff8ae9fa1f936d689facccb713139
+  data.tar.gz: a8e6210c1a86ff9bd5a1a4b79365d269fa551422d222269cfab4224bce046bd6
 SHA512:
-  metadata.gz: 5bc31d21df4fa1e01a079e97039f89216ec14329ab913794cb245f8aa17ece3bca16969c96810c49cc8534388883df2110e9e68e1af0ddcbdf0a57d7b4e8d79a
-  data.tar.gz: 88f6735bf84a8d7a0b8848eca7c9f90a879234df632cbee98424f8d04fa18f3f45948516324ebe62b27eb96b5fce8a32acda59da4959a08f5ae5f8aeb951d7b2
+  metadata.gz: 931eaf49de3e73a34b828237c2975e35c8db05d9aa25b1483fee59acb80343bcb3d89bd2b32f48a710c6040c6b2b1d0daf40d4c748a46f09e1e9ebae1ec1d8fd
+  data.tar.gz: 599ef618b7cf04949dbaa40130d9e3d1cc5cb537c13c58cbdc92e71159769938a28a26eb8611b6a06dbc7332584c446f2250c1b5c0e782ae6d037d573bee45cb

data/lib/mumuki/laboratory.rb

@@ -2,7 +2,6 @@ require 'mumukit/core'
 
 I18n.load_translations_path File.join(__dir__, 'laboratory', 'locales', '*.yml')
 
-require 'mumuki/laboratory/engine'
 
 module Mumuki
   module Laboratory
@@ -45,3 +44,4 @@ end
 
 require_relative './laboratory/extensions'
 require_relative './laboratory/controllers'
+require_relative './laboratory/engine'

data/lib/mumuki/laboratory/locales/en.yml

@@ -43,7 +43,6 @@ en:
   continue_exercise: "Continue"
   continue_lesson: Continue this lesson!
   continue_practicing: Continue practicing!
-  contributors: Contributors
   corollary: To think about
   correct_answer: The answer is correct!
   create_submission: Submit

data/lib/mumuki/laboratory/locales/es.yml

@@ -47,7 +47,6 @@ es:
   continue_exercise: "Continuar"
   continue_lesson: ¡Continuá esta lección!
   continue_practicing: ¡Seguí aprendiendo!
-  contributors: Autores
   correct_answer: ¡La respuesta es correcta!
   create_submission: Enviar
   created_at: Creado

data/lib/mumuki/laboratory/locales/pt.yml

@@ -41,7 +41,6 @@ pt:
   continue_exercise: Continuar
   continue_lesson: Continue esta lição!
   continue_practicing: Continue aprendendo!
-  contributors: Autores
   correct_answer: A resposta está correta!
   create_submission: Enviar
   created_at: Criado

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '6.0.0'
+    VERSION = '6.0.1'
   end
 end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20181114201620) do
+ActiveRecord::Schema.define(version: 20181117190241) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -223,6 +223,7 @@ ActiveRecord::Schema.define(version: 20181114201620) do
     t.string "editor_css_urls", default: [], array: true
     t.string "test_extension"
     t.text "test_template"
+    t.boolean "feedback"
     t.index ["name"], name: "index_languages_on_name", unique: true
   end
 

data/spec/models/language_spec.rb

@@ -10,112 +10,47 @@ describe Language do
   end
 
   describe '#import!' do
-    let(:bridge) { Mumukit::Bridge::Runner.new('http://runner.com') }
-    before { expect(bridge).to receive(:info).and_return response }
-    before { subject.import_from_resource_h! bridge.importable_info }
+    subject { create(:language, name: 'gobstones', runner_url: 'http://runner.com') }
+    before { subject.import_from_resource_h! language_resource_h }
 
-    context 'non graphical language' do
-      subject { create(:language, name: 'ruby') }
-      let(:response) do
-      {
-          'name' => 'ruby',
-          'version' => 'master',
-          'escualo_base_version' => nil,
-          'escualo_service_version' => nil,
-          'mumukit_version' => '1.0.1',
-          'output_content_type' => 'markdown',
-          'features' => {
-              'query' => true,
-              'expectations' => false,
-              'feedback' => false,
-              'secure' => false,
-              'sandboxed' => true,
-              'stateful' => true,
-              'structured' => true
-          },
-          'language' => {
-              'prompt' => '>',
-              'name' => 'ruby',
-              'version' => '2.0',
-              'extension' => 'rb',
-              'ace_mode' => 'ruby'
-          },
-          'test_framework' => {
-              'name' => 'rspec',
-              'version' => '2.13',
-              'test_extension' => '.rb'
-          },
-          'url' => 'http://ruby.runners.mumuki.io/info'
-      }
-      end
+    let(:language_resource_h) { {
+      name: "gobstones",
+      comment_type: nil,
+      runner_url: "http://foo",
+      output_content_type: "html",
+      prompt: "ム ",
+      extension: "gbs",
+      highlight_mode: "gobstones",
+      visible_success_output: true,
+      devicon: nil,
+      triable: false,
+      feedback: true,
+      queriable: false,
+      stateful_console: false,
+      test_extension: "yml",
+      test_template: nil,
+      layout_js_urls: ['http://runner.com/javascripts/a.js'],
+      layout_html_urls: ["http://runner.com/b.html", "http://runner.com/c.html"],
+      layout_css_urls: ["http://runner.com/stylesheets/d.css"],
+      editor_js_urls: ['http://runner.com/javascripts/aa.js'],
+      editor_html_urls: ["http://runner.com/bb.html", "http://runner.com/cc.html"],
+      editor_css_urls: ["http://runner.com/stylesheets/dd.css"]
+    } }
 
-      it { expect(subject.name).to eq 'ruby' }
-      it { expect(subject.queriable).to be true }
-      it { expect(subject.output_content_type).to eq Mumukit::ContentType::Markdown }
-      it { expect(subject.visible_success_output).to be false }
-      it { expect(subject.highlight_mode).to eq 'ruby' }
-      it { expect(subject.devicon).to eq 'ruby' }
-      it { expect(subject.prompt).to eq '> ' }
-      it { expect(subject.stateful_console).to be true }
-    end
-
-    context 'graphical language' do
-      subject { create(:language, name: 'gobstones', runner_url: 'http://runner.com') }
-      let(:response) do
-      {
-          'name' => 'gobstones',
-          'version' => 'master',
-          'escualo_base_version' => nil,
-          'escualo_service_version' => nil,
-          'mumukit_version' => '1.0.1',
-          'output_content_type' => 'html',
-          'features' => {
-              'query' => false,
-              'expectations' => true,
-              'feedback' => false,
-              'secure' => false,
-              'sandboxed' => false,
-              'structured' => true
-          },
-          'layout_assets_urls' => {
-              'js' => ['javascripts/a.js'],
-              'html' => ['b.html', 'c.html'],
-              'css' => ['stylesheets/d.css']
-          },
-          'editor_assets_urls' => {
-              'js' => ['javascripts/aa.js'],
-              'html' => ['bb.html', 'cc.html'],
-              'css' => ['stylesheets/dd.css']
-          },
-          'language' => {
-              'name' => 'gobstones',
-              'graphic' => true,
-              'version' => '1.4.1',
-              'extension' => 'gbs',
-              'ace_mode' => 'gobstones'
-          },
-          'test_framework' => {
-              'name' => 'stones-spec',
-              'test_extension' => 'yml'
-          },
-          'url' => 'http://runners2.mumuki.io:8001/info'
-      }
-      end
-
-      it { expect(subject.name).to eq 'gobstones' }
-      it { expect(subject.queriable).to be false }
-      it { expect(subject.output_content_type).to eq Mumukit::ContentType::Html }
-      it { expect(subject.visible_success_output).to be true }
-      it { expect(subject.highlight_mode).to eq 'gobstones' }
-      it { expect(subject.devicon).to eq 'gobstones' }
-      it { expect(subject.prompt).to eq 'ム ' }
-      it { expect(subject.stateful_console).to be false }
-      it { expect(subject.layout_js_urls).to eq ['http://runner.com/javascripts/a.js'] }
-      it { expect(subject.layout_html_urls).to eq ['http://runner.com/b.html', 'http://runner.com/c.html'] }
-      it { expect(subject.layout_css_urls).to eq ['http://runner.com/stylesheets/d.css'] }
-      it { expect(subject.editor_js_urls).to eq ['http://runner.com/javascripts/aa.js'] }
-      it { expect(subject.editor_html_urls).to eq ['http://runner.com/bb.html', 'http://runner.com/cc.html'] }
-      it { expect(subject.editor_css_urls).to eq ['http://runner.com/stylesheets/dd.css'] }
-    end
+    it { expect(subject.name).to eq 'gobstones' }
+    it { expect(subject.queriable).to be false }
+    it { expect(subject.output_content_type).to eq Mumukit::ContentType::Html }
+    it { expect(subject.visible_success_output).to be true }
+    it { expect(subject.highlight_mode).to eq 'gobstones' }
+    it { expect(subject.devicon).to eq 'gobstones' }
+    it { expect(subject.prompt).to eq 'ム ' }
+    it { expect(subject.stateful_console).to be false }
+    it { expect(subject.feedback).to be true }
+    it { expect(subject.layout_js_urls).to eq ['http://runner.com/javascripts/a.js'] }
+    it { expect(subject.layout_html_urls).to eq ['http://runner.com/b.html', 'http://runner.com/c.html'] }
+    it { expect(subject.layout_css_urls).to eq ['http://runner.com/stylesheets/d.css'] }
+    it { expect(subject.editor_js_urls).to eq ['http://runner.com/javascripts/aa.js'] }
+    it { expect(subject.editor_html_urls).to eq ['http://runner.com/bb.html', 'http://runner.com/cc.html'] }
+    it { expect(subject.editor_css_urls).to eq ['http://runner.com/stylesheets/dd.css'] }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.1
 - !ruby/object:Gem::Dependency
   name: mumukit-login
   requirement: !ruby/object:Gem::Requirement