mumuki-laboratory 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4baab2d6431fb7c2b847f565d313b72d9f6ff8ae9fa1f936d689facccb713139
-  data.tar.gz: a8e6210c1a86ff9bd5a1a4b79365d269fa551422d222269cfab4224bce046bd6
+  metadata.gz: 5b3fa503272dae9b4a52b2b427be8a8296cbd07828894bc8c6b61a1e7fabf079
+  data.tar.gz: b07ce7cd4a60d3890ac3900529723c4a6767d5f4f7580c42265ba9752cf4d546
 SHA512:
-  metadata.gz: 931eaf49de3e73a34b828237c2975e35c8db05d9aa25b1483fee59acb80343bcb3d89bd2b32f48a710c6040c6b2b1d0daf40d4c748a46f09e1e9ebae1ec1d8fd
-  data.tar.gz: 599ef618b7cf04949dbaa40130d9e3d1cc5cb537c13c58cbdc92e71159769938a28a26eb8611b6a06dbc7332584c446f2250c1b5c0e782ae6d037d573bee45cb
+  metadata.gz: 59fb438763ff9aa7d8f69ec71da68d512dcc0b6a01ab5095748e572f6936298667c23b261c19449e19ab70d75458417ef65316aa497847fb3b3a64a782288034
+  data.tar.gz: d65215e6d5a632e53126ac55145b162578e2f54a3f646ace984f4298464e51f05d8dcef2bb6a1da0049741daaa10f6bba673e73f7aa865c63a2ac898edf258dc

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

@@ -4,7 +4,7 @@ mumuki.load(() => {
   }
 
   function loadInput(values, element) {
-    element.attr('value', values[element.attr('name')]);
+    element.val(values[element.attr('name')]);
   }
 
 	function dumpForm(_event) {

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '6.0.1'
+    VERSION = '6.0.2'
   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: 20181117190241) do
+ActiveRecord::Schema.define(version: 20181121165956) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -158,7 +158,7 @@ ActiveRecord::Schema.define(version: 20181117190241) do
     t.boolean "new_expectations", default: false
     t.boolean "manual_evaluation", default: false
     t.integer "editor", default: 0, null: false
-    t.string "choices", default: [], null: false, array: true
+    t.string "choice_values", default: [], null: false, array: true
     t.text "goal"
     t.string "initial_state"
     t.string "final_state"
@@ -166,6 +166,7 @@ ActiveRecord::Schema.define(version: 20181117190241) do
     t.text "randomizations"
     t.text "free_form_editor_source"
     t.text "teacher_info"
+    t.text "choices"
     t.index ["guide_id"], name: "index_exercises_on_guide_id"
     t.index ["language_id"], name: "index_exercises_on_language_id"
   end

data/spec/features/exercise_flow_spec.rb

@@ -12,7 +12,7 @@ feature 'Exercise Flow', organization_workspace: :test do
   let!(:problem_4) { build(:problem, name: 'Succ4', description: 'Description of Succ4', layout: :input_bottom, extra: 'x = 2') }
   let!(:problem_5) { build(:problem, name: 'Succ5', description: 'Description of Succ5', layout: :input_right, editor: :upload, hint: 'lele', language: gobstones) }
   let!(:problem_6) { build(:problem, name: 'Succ6', description: 'Description of Succ6', layout: :input_right, editor: :hidden, language: haskell) }
-  let!(:problem_7) { build(:problem, name: 'Succ7', description: 'Description of Succ7', choices: ['some choice']) }
+  let!(:problem_7) { build(:problem, name: 'Succ7', description: 'Description of Succ7', choices: [{value: 'some choice', checked: true}]) }
   let!(:playground_1) { build(:playground, name: 'Succ5', description: 'Description of Succ4', layout: :input_right) }
   let!(:playground_2) { build(:playground, name: 'Succ6', description: 'Description of Succ4', layout: :input_right, extra: 'x = 4') }
   let!(:reading) { build(:reading, name: 'Reading about Succ', description: 'Lets understand succ history') }

data/spec/helpers/with_choices_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ChoicesHelper do
   helper ChoicesHelper
 
-  context 'exercise width choices' do
+  context 'exercise with choices' do
     let(:checked_content) { struct id: '1', index: 0, value: 'foo', text: 'bar' }
     let(:unchecked_content) { struct id: '3', index: 2, value: 'baz', text: 'lorem' }
     let(:content) { '0:1' }

data/spec/models/exercise_spec.rb

@@ -4,6 +4,30 @@ describe Exercise, organization_workspace: :test do
   let(:exercise) { create(:exercise) }
   let(:user) { create(:user, first_name: 'Orlo') }
 
+  describe '#choice_values' do
+    context 'when choices are in 5.0 format' do
+      let(:choice_values) { %w(1492 1453 1773)  }
+      let(:exercise) { build(:exercise, description: 'when did byzantine empire fall?', choice_values: choice_values) }
+
+      it { expect(exercise.choices).to be_blank }
+      it { expect(exercise[:choice_values]).to eq choice_values }
+      it { expect(exercise.choice_values).to eq choice_values }
+      it { expect(exercise.choice_index_for '1492').to eq 0 }
+      it { expect(exercise.choice_index_for '1773').to eq 2 }
+    end
+
+    context 'when choices are in 6.0 format' do
+      let(:choices) { [{value: '1492', checked: false}, {value: '1453', checked: true}, {value: '1773', checked: false}] }
+      let(:exercise) { build(:exercise, description: 'when did byzantine empire fall?', choices: choices) }
+
+      it { expect(exercise.choices).to eq choices }
+      it { expect(exercise[:choice_values]).to be_blank }
+      it { expect(exercise.choice_values).to eq %w(1492 1453 1773) }
+      it { expect(exercise.choice_index_for '1492').to eq 0 }
+      it { expect(exercise.choice_index_for '1773').to eq 2 }
+    end
+  end
+
   describe '#slug' do
     let(:guide) { create(:guide, slug: 'foo/bar') }
     let(:exercise) { create(:exercise, guide: guide, bibliotheca_id: 4) }

data/spec/models/guide_import_spec.rb

@@ -55,7 +55,7 @@ describe Guide do
           extra: '',
           language: { name: 'text' },
           test: "---\nequal: '1'\n",
-          choices: [{value: 'foo', checked: false}, {value: 'bar', chekced: true}],
+          choices: [{value: 'foo', checked: false}, {value: 'bar', checked: true}],
           extra_visible: false,
           id: 8},
          {type: 'reading',
@@ -148,7 +148,8 @@ describe Guide do
       it { expect(guide.exercises.second.language).to eq haskell }
       it { expect(guide.exercises.second.default_content).to eq 'a default content' }
       it { expect(guide.exercises.second.extra_visible).to be true }
-      it { expect(guide.exercises.fourth.choices).to eq ['foo', 'bar'] }
+      it { expect(guide.exercises.fourth.choices).to eq [{'value' => 'foo', 'checked' => false}, {'value' => 'bar', 'checked' => true}] }
+      it { expect(guide.exercises.fourth.choice_values).to eq ['foo', 'bar'] }
 
       it { expect(guide.exercises.third.expectations.first['binding']).to eq 'foo' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2018-11-22 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.1
+        version: 6.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.0.2
 - !ruby/object:Gem::Dependency
   name: mumukit-login
   requirement: !ruby/object:Gem::Requirement