mumuki-laboratory 5.10.4 → 5.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b8c69b0a50c670308dd340516fa5b4ccbe3eec44fb5a7237b536d6239b91b6a
-  data.tar.gz: 4b19e1aecca6b38e45b2435ec509a3affd0801c9f095a86f25d97963e7648556
+  metadata.gz: 18f020ea8f88054e994d5e652d5ba0da08c502c1e49042d7906293695e396a82
+  data.tar.gz: 49f403a38857fe24615f1c4429bc68927a621e9a714eabb5698815436f973466
 SHA512:
-  metadata.gz: a97956c53c1797faa466b5779ec92ccd2fa4279096833a8a265ee98b81c6ee52b8daddaf046d448cbeb34bad836f6c14eb900aad05f5f8b50d44f3eccf35fa47
-  data.tar.gz: 76a25e7ccc3f6aea7dd886b45228e35914585d656fa6d3a03a390036e1b0e3b516b2a59fc7937538cbda103fc720330efdbeddd630c3e45360a47492ffaccbae
+  metadata.gz: 5255c69d3d6ce5834f5c58db4d0b0cc451bb52262997673911e6ee54729bc543768ac07650a124874306a921df9b1b4081ff8e87482ef8594a9afb06660561c0
+  data.tar.gz: 16ba33bc9c99d07a865a17952aa5f7d4469d4532c5df5025677eaa926226c9aff94cdf3ef5817c007831356cdd124df417f629e2e366254f74d4150ab34e288d

data/app/assets/javascripts/application/codemirror.js

@@ -71,6 +71,8 @@ var mumuki = mumuki || {};
 
 
   mumuki.load(function () {
+    CodeMirror.currentLocale = mumuki.locale;
+
     mumuki.page.editors = createCodeMirrors();
     updateCodeMirrorLanguage();
     onSelectUpdateCodeMirror();

data/app/assets/javascripts/application/free-form.js

@@ -0,0 +1,30 @@
+mumuki.load(() => {
+  function dumpInput(values, element) {
+    values[element.attr('name')] = element.val();
+  }
+
+  function loadInput(values, element) {
+    element.attr('value', values[element.attr('name')]);
+  }
+
+	function dumpForm(_event) {
+    let  values = {};
+    $('.mu-free-form-input').each(function () {
+      dumpInput(values, $(this));
+    });
+		$('#solution_content').attr('value', JSON.stringify(values));
+  }
+
+  function loadForm() {
+    let json = $('#solution_content').val();
+    if (!json) return;
+
+    let values = JSON.parse(json);
+    $('.mu-free-form-input').each(function () {
+      loadInput(values, $(this));
+    });
+  }
+
+  mumuki.onInputsReady('.mu-free-form-input', loadForm);
+  $('.mu-free-form-input').change(dumpForm);
+});

data/app/assets/javascripts/application/inputs.js

@@ -0,0 +1,12 @@
+(() => {
+  // Declares a `document.ready` handler that will be
+  // activated only when there is at least one element that match
+  // the given selector
+	mumuki.onInputsReady = (inputsSelector, callback) => {
+		$(document).ready((event) => {
+			if ($(inputsSelector).length === 0) return;
+
+			callback(event);
+		})
+	}
+})();

data/app/assets/javascripts/application/multiple-choice.js

@@ -1,10 +1,11 @@
-mumuki.load(function () {
-	var setSolution = function (evt) {
+mumuki.load(() => {
+	function dumpChoices(evt) {
 		var indexes = $('.solution-choice:checked').map(function () {
 			return $(this).data('index')
 		}).get().join(':');
 		$('#solution_content').attr('value', indexes);
-	};
-	$(document).ready(setSolution);
-  $('.solution-choice').change(setSolution);
+	}
+
+	mumuki.onInputsReady('.solution-choice', dumpChoices);
+  $('.solution-choice').change(dumpChoices);
 });

data/app/models/concerns/with_editor.rb

@@ -2,7 +2,7 @@ module WithEditor
   extend ActiveSupport::Concern
 
   included do
-    enum editor: [:code, :upload, :text, :single_choice, :multiple_choice, :hidden, :multiple_files, :custom]
+    enum editor: [:code, :upload, :text, :single_choice, :multiple_choice, :hidden, :multiple_files, :custom, :free_form]
     validate :ensure_has_choices, if: :choice?
   end
 

data/app/models/exercise.rb

@@ -84,7 +84,7 @@ class Exercise < ApplicationRecord
     reset!
 
     attrs = whitelist_attributes(json, except: %w(type id))
-    attrs['choices'] = json['choices'].map { |choice| choice['value'] } if json['choices'].present?
+    attrs['choices'] = json['choices']&.map { |choice| choice['value'] } || []
     attrs['bibliotheca_id'] = json['id']
     attrs['number'] = number
     attrs = attrs.except('expectations') if json['type'] != 'problem' || json['new_expectations']

data/app/views/layouts/exercise_inputs/editors/_free_form.html.erb

@@ -0,0 +1,4 @@
+<div class="form-group">
+  <%= form.hidden_field :content, value: @current_content %>
+  <%= raw @exercise.free_form_editor_source %>
+</div>

data/db/migrate/20181004173216_add_free_form_editor_to_exercises.rb

@@ -0,0 +1,5 @@
+class AddFreeFormEditorToExercises < ActiveRecord::Migration[5.1]
+  def change
+    add_column :exercises, :free_form_editor_source, :text
+  end
+end

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '5.10.4'
+    VERSION = '5.11.0'
   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: 20180802190437) do
+ActiveRecord::Schema.define(version: 20181004173216) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -165,6 +165,7 @@ ActiveRecord::Schema.define(version: 20180802190437) do
     t.string "final_state"
     t.text "assistance_rules"
     t.text "randomizations"
+    t.text "free_form_editor_source"
     t.index ["guide_id"], name: "index_exercises_on_guide_id"
     t.index ["language_id"], name: "index_exercises_on_language_id"
   end

data/spec/models/guide_import_spec.rb

@@ -176,8 +176,22 @@ describe Guide do
 
         it { expect(guide.exercises.first).to be_instance_of(Problem) }
         it { expect(guide.exercises.first).to eq reloaded_exercise_1 }
+      end
+
+      context 'when exercise doesnt have choices anymore' do
+        let(:exercise_1) { build(:problem,
+                                  bibliotheca_id: 1,
+                                  language: haskell,
+                                  name: 'Choices 1',
+                                  description: 'description',
+                                  hint: 'baz',
+                                  choices: ['option 1', 'option 2'],
+                                  test: 'pending',
+                                  extra: 'foo') }
 
+        it { expect(guide.exercises.first.choices?).to be false }
       end
+
       context 'exercises are reordered' do
         let(:exercise_1) { create(:problem,
                                   bibliotheca_id: 4,

data/vendor/assets/javascripts/codemirror-modes/gobstones.js

@@ -516,25 +516,38 @@ CodeMirror.defineMode("gobstones", function(cmCfg, modeCfg) {
 
     var GobstonesHighlightRules = function() {
 
+        var buildList = function(values) {
+            return values.join('|');
+        };
+
         var keywords = (
-        "program|procedure|function|interactive|if|then|else|switch|repeat|while|foreach|in|not|div|mod|Skip|return"
+            "program|procedure|function|interactive|if|then|else|switch|repeat|while|foreach|in|not|div|mod|Skip|return"
         );
 
-        var buildinConstants = (
-          "Verde|Rojo|Vermelho|Azul|Negro|Preto|Norte|Sur|Sul|Este|Leste|Oeste|False|True"
-        );
+        var allBuiltinConstants = {
+            es: ["Verde", "Rojo", "Azul", "Negro", "Norte", "Sur", "Este", "Oeste", "False", "True"],
+            pt: ["Verde", "Vermelho", "Azul", "Preto", "Norte", "Sul", "Leste", "Oeste", "False", "True"],
+            en: ["Green", "Red", "Blue", "Black", "North", "South", "East", "West", "False", "True"]
+        };
+
+        var allLangClasses = {
+            es: ["Poner", "Sacar", "Mover", "IrAlBorde", "VaciarTablero", "nroBolitas", "hayBolitas", "puedeMover", "siguiente", "previo", "opuesto", "minBool", "maxBool", "minDir", "maxDir", "minColor", "maxColor"],
+            pt: ["Colocar", "Retirar", "Mover", "IrAlBorda", "VaciarTablero", "nroPedras", "haPedras", "podeMover", "seguinte", "previo", "oposto", "minBool", "maxBool", "minDir", "maxDir", "minCor", "maxCor"],
+            en: ["Put", "Grab", "Move", "GoToEdge", "EmptyBoardContents", "numStones", "anyStones", "canMove", "next", "prev", "opposite", "minBool", "maxBool", "minDir", "maxDir", "minColor", "maxColor"]
+        };
 
+        var locale = CodeMirror.currentLocale || 'es';
 
-        var langClasses = (
-            "Poner|Colocar|Sacar|Retirar|Mover|IrAlBorde|IrABorda|VaciarTablero|" +
-            "nroBolitas|nroPedras|hayBolitas|haPedras|puedeMover|podeMover|siguiente|seguinte|previo|opuesto|oposto|minBool|maxBool|" +
-            "minDir|maxDir|minColor|minCor|maxColor|maxCor"
+        registerAutocomplete('gobstones',
+            keywords.split('|')
+              .concat(allBuiltinConstants[locale])
+              .concat(allLangClasses[locale])
         );
 
         var keywordMapper = this.createKeywordMapper({
             "keyword": keywords,
-            "constant.language": buildinConstants,
-            "support.function": langClasses,
+            "constant.language": buildList(allBuiltinConstants[locale]),
+            "support.function": buildList(allLangClasses[locale]),
             "support.type": ''
         }, "identifier");
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 5.10.4
+  version: 5.11.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: 7.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: 7.3.0
 - !ruby/object:Gem::Dependency
   name: mumukit-core
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +268,8 @@ files:
 - app/assets/javascripts/application/console.js
 - app/assets/javascripts/application/csrf-token.js
 - app/assets/javascripts/application/discussions.js
+- app/assets/javascripts/application/free-form.js
+- app/assets/javascripts/application/inputs.js
 - app/assets/javascripts/application/kids.js
 - app/assets/javascripts/application/load-analytics.js
 - app/assets/javascripts/application/load-error-svg.js
@@ -509,6 +511,7 @@ files:
 - app/views/layouts/embedded.html.erb
 - app/views/layouts/exercise_inputs/editors/_code.html.erb
 - app/views/layouts/exercise_inputs/editors/_custom.html.erb
+- app/views/layouts/exercise_inputs/editors/_free_form.html.erb
 - app/views/layouts/exercise_inputs/editors/_hidden.html.erb
 - app/views/layouts/exercise_inputs/editors/_multiple_choice.html.erb
 - app/views/layouts/exercise_inputs/editors/_multiple_files.html.erb
@@ -798,6 +801,7 @@ files:
 - db/migrate/20180704150839_rename_assignment_status_to_submission_status.rb
 - db/migrate/20180725145801_add_submissions_caps_to_exams.rb
 - db/migrate/20180802190437_add_approved_to_messages.rb
+- db/migrate/20181004173216_add_free_form_editor_to_exercises.rb
 - db/seeds/users.rb
 - lib/events.rb
 - lib/mumuki/laboratory.rb
@@ -1015,7 +1019,6 @@ files:
 - vendor/assets/javascripts/codemirror-modes/css-hint.min.js
 - vendor/assets/javascripts/codemirror-modes/css.min.js
 - vendor/assets/javascripts/codemirror-modes/elixir.js
-- vendor/assets/javascripts/codemirror-modes/gobstones-autocomplete.js
 - vendor/assets/javascripts/codemirror-modes/gobstones.js
 - vendor/assets/javascripts/codemirror-modes/haskell-autocomplete.js
 - vendor/assets/javascripts/codemirror-modes/haskell.min.js

data/vendor/assets/javascripts/codemirror-modes/gobstones-autocomplete.js

@@ -1,4 +0,0 @@
-registerAutocomplete('gobstones', (
-  'program procedure function if else switch repeat while not return ' +
-  'False True Poner Colocar Sacar Retirar Mover Verde Rojo Vermelho Azul Negro Preto Norte Sur Sul Este Leste Oeste'
-).split(' '));