mumuki-laboratory 6.0.4 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8acf261b567f7972ae5f7d7bfe174725c6e4c2cb
-  data.tar.gz: af5b340521cb090669f2f25a57811af0562554db
+SHA256:
+  metadata.gz: 566868e1e5423d1fd2d9bd006e4ae9cd17d906c24bec539ac115b110efb75c2e
+  data.tar.gz: b3b31c4378ea180eb9d7ebedcf5cacec76a8f7b950ce616074ae802b19b24476
 SHA512:
-  metadata.gz: 9740ab56fbb750386c0cdcd2340a7136e9db75950b2366d19950903aaca4355e794acf7d4c888d54b525d764143337d5b823fcda53ea6a2e5da864cdf0188d72
-  data.tar.gz: b6c2f464df711848a463dcb5034afc9e88fdcc434f3b810e698f4e14063a5124b3b1a47126b871bceb6d800feba9763d92e7612d7715adc679ba6cb102d15d5a
+  metadata.gz: ffbddab158e201f582d2715d2f24a68a1b791681e442adaa1c9c6858b187fea461f8b9491e887a6e163fc99ce66dd8d6a33c3a20b5c31b7275e3c17063ebe639
+  data.tar.gz: e5f07c1b06529ecd159327988886dff962bb7dcd4afa6984bf6474de21fa687cd63745676b0b117bd87eb8fd3df2bd0294a12eb89dda88df3a2faa1ec4d98a71

data/app/helpers/contextualization_result_helper.rb

@@ -23,7 +23,8 @@ module ContextualizationResultHelper
 
   def render_test_results(contextualization)
     if contextualization.test_results.present?
-      render partial: 'layouts/test_results', locals: { contextualization: contextualization }
+      template = contextualization.result.present? ? 'layouts/mixed_results' : 'layouts/test_results'
+      render partial: template, locals: { contextualization: contextualization }
     else
       render partial: 'layouts/result', locals: { contextualization: contextualization }
     end

data/app/views/layouts/_mixed_results.erb

@@ -0,0 +1,3 @@
+<%= render partial: 'layouts/test_results', locals: { contextualization: contextualization } %>
+
+<%= contextualization.result_html %>

data/app/views/layouts/_test_results.html.erb

@@ -27,6 +27,3 @@
     <% end %>
   </ul>
 <% end %>
-
-
-

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '6.0.4'
+    VERSION = '6.1.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: 20181121165956) do
+ActiveRecord::Schema.define(version: 20181117190241) 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: 20181121165956) do
     t.boolean "new_expectations", default: false
     t.boolean "manual_evaluation", default: false
     t.integer "editor", default: 0, null: false
-    t.string "choice_values", default: [], null: false, array: true
+    t.string "choices", default: [], null: false, array: true
     t.text "goal"
     t.string "initial_state"
     t.string "final_state"
@@ -166,7 +166,6 @@ ActiveRecord::Schema.define(version: 20181121165956) 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: [{value: 'some choice', checked: true}]) }
+  let!(:problem_7) { build(:problem, name: 'Succ7', description: 'Description of Succ7', choices: ['some choice']) }
   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 with choices' do
+  context 'exercise width 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,30 +4,6 @@ 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', checked: true}],
+          choices: [{value: 'foo', checked: false}, {value: 'bar', chekced: true}],
           extra_visible: false,
           id: 8},
          {type: 'reading',
@@ -148,8 +148,7 @@ 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 [{'value' => 'foo', 'checked' => false}, {'value' => 'bar', 'checked' => true}] }
-      it { expect(guide.exercises.fourth.choice_values).to eq ['foo', 'bar'] }
+      it { expect(guide.exercises.fourth.choices).to eq ['foo', 'bar'] }
 
       it { expect(guide.exercises.third.expectations.first['binding']).to eq 'foo' }
 

data/spec/models/organization_spec.rb

@@ -4,20 +4,6 @@ describe Organization, organization_workspace: :test do
   let(:user) { create(:user) }
   let(:central) { create(:organization, name: 'central') }
 
-  describe '.import_from_resource_h!' do
-    let(:book) { create(:book) }
-    let(:resource_h) { {
-      name: 'zulema',
-      book: book.slug,
-      profile: { locale: 'es', contact_email: 'contact@email.com' }
-    } }
-    let!(:imported) { Organization.import_from_resource_h! resource_h }
-    let(:found) { Organization.find_by(name: 'zulema').to_resource_h }
-
-    it { expect(imported).to_not be nil }
-    it { expect(found).to json_eq resource_h, except: [:theme, :settings]  }
-  end
-
   describe '.current' do
     let(:organization) { Organization.find_by(name: 'test') }
     it { expect(organization).to_not be nil }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.1.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 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.4
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.4
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: mumukit-login
   requirement: !ruby/object:Gem::Requirement
@@ -308,6 +308,7 @@ files:
 - app/views/layouts/_kids.html.erb
 - app/views/layouts/_main.html.erb
 - app/views/layouts/_messages.html.erb
+- app/views/layouts/_mixed_results.erb
 - app/views/layouts/_organization_chooser.html.erb
 - app/views/layouts/_organizations_listing.html.erb
 - app/views/layouts/_progress_bar.html.erb
@@ -594,130 +595,130 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Code assement web application for the Mumuki Platform.
 test_files:
-- spec/spec_helper.rb
 - spec/api_helper.rb
-- spec/mailers/user_mailer_spec.rb
-- spec/mailers/previews/user_mailer_preview.rb
-- spec/models/exercise_spec.rb
-- spec/models/discussion_spec.rb
-- spec/models/user_changed_spec.rb
-- spec/models/assignment_spec.rb
-- spec/models/organization_spec.rb
-- spec/models/problem_spec.rb
-- spec/models/usage_spec.rb
-- spec/models/guide_spec.rb
-- spec/models/interactive_spec.rb
-- spec/models/query_spec.rb
-- spec/models/user_spec.rb
-- spec/models/language_spec.rb
-- spec/models/reading_spec.rb
-- spec/models/book_import_spec.rb
-- spec/models/stats_spec.rb
-- spec/models/event_publishing_spec.rb
-- spec/models/api_client_spec.rb
-- spec/models/course_spec.rb
-- spec/models/guide_import_spec.rb
-- spec/models/playground_spec.rb
-- spec/models/string_spec.rb
-- spec/models/event_generation_spec.rb
-- spec/models/solution_spec.rb
-- spec/models/lesson_spec.rb
-- spec/models/question_spec.rb
-- spec/models/navigation_spec.rb
-- spec/models/exam_spec.rb
-- spec/models/topic_import_spec.rb
-- spec/models/message_spec.rb
-- spec/models/book_spec.rb
-- spec/models/with_expectations_spec.rb
-- spec/dummy/config/secrets.yml
+- spec/capybara_helper.rb
+- spec/controllers/api_clients_controller.rb
+- spec/controllers/chapters_controller_spec.rb
+- spec/controllers/confirmations_controller_spec.rb
+- spec/controllers/courses_api_controller_spec.rb
+- spec/controllers/discussions_controller_spec.rb
+- spec/controllers/exercise_solutions_controller_spec.rb
+- spec/controllers/guide_progress_controller_spec.rb
+- spec/controllers/messages_controller_spec.rb
+- spec/controllers/organizations_api_controller_spec.rb
+- spec/controllers/students_api_controller_spec.rb
+- spec/controllers/users_api_controller_spec.rb
+- spec/dummy/Rakefile
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
+- spec/dummy/bin/update
+- spec/dummy/bin/yarn
+- spec/dummy/config.ru
 - spec/dummy/config/application.rb
-- spec/dummy/config/rabbit.yml
-- spec/dummy/config/puma.rb
-- spec/dummy/config/cable.yml
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/development.rb
 - spec/dummy/config/boot.rb
-- spec/dummy/config/locales/en.yml
+- spec/dummy/config/cable.yml
 - spec/dummy/config/database.travis.yml
-- spec/dummy/config/spring.rb
 - spec/dummy/config/environment.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/puma.rb
+- spec/dummy/config/rabbit.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/spring.rb
 - spec/dummy/config/database.yml
-- spec/dummy/bin/bundle
-- spec/dummy/bin/yarn
-- spec/dummy/bin/rails
-- spec/dummy/bin/setup
-- spec/dummy/bin/rake
-- spec/dummy/bin/update
-- spec/dummy/config.ru
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/package.json
-- spec/dummy/Rakefile
-- spec/login_helper.rb
+- spec/evaluation_helper.rb
 - spec/factories/api_client_factory.rb
-- spec/factories/topic_factory.rb
 - spec/factories/assignments_factory.rb
-- spec/factories/exercise_factory.rb
-- spec/factories/login_settings_factory.rb
-- spec/factories/exam_factory.rb
-- spec/factories/course_factory.rb
 - spec/factories/book_factory.rb
 - spec/factories/chapter_factory.rb
-- spec/factories/organization_factory.rb
+- spec/factories/complement_factory.rb
+- spec/factories/course_factory.rb
+- spec/factories/discussion_factory.rb
+- spec/factories/exam_factory.rb
+- spec/factories/exercise_factory.rb
 - spec/factories/guide_factory.rb
-- spec/factories/message_factory.rb
 - spec/factories/invitation_factory.rb
 - spec/factories/lesson_factory.rb
-- spec/factories/complement_factory.rb
+- spec/factories/login_settings_factory.rb
+- spec/factories/message_factory.rb
+- spec/factories/organization_factory.rb
+- spec/factories/topic_factory.rb
 - spec/factories/user_factory.rb
-- spec/factories/discussion_factory.rb
+- spec/features/chapter_spec.rb
+- spec/features/choose_organization_spec.rb
+- spec/features/complements_flow_spec.rb
+- spec/features/dynamic_exam_spec.rb
 - spec/features/exams_flow_spec.rb
 - spec/features/exercise_flow_spec.rb
-- spec/features/menu_bar_spec.rb
+- spec/features/guide_reset_spec.rb
 - spec/features/guides_flow_spec.rb
-- spec/features/dynamic_exam_spec.rb
-- spec/features/not_found_private_flow_spec.rb
-- spec/features/chapter_spec.rb
-- spec/features/complements_flow_spec.rb
-- spec/features/lessons_flow_spec.rb
-- spec/features/login_flow_spec.rb
-- spec/features/profile_flow_spec.rb
 - spec/features/home_private_flow_spec.rb
 - spec/features/home_public_flow_spec.rb
-- spec/features/not_found_public_flow_spec.rb
-- spec/features/standard_flow_spec.rb
-- spec/features/choose_organization_spec.rb
+- spec/features/lessons_flow_spec.rb
 - spec/features/links_flow_spec.rb
+- spec/features/login_flow_spec.rb
+- spec/features/menu_bar_spec.rb
+- spec/features/not_found_private_flow_spec.rb
+- spec/features/not_found_public_flow_spec.rb
+- spec/features/profile_flow_spec.rb
 - spec/features/progressive_tips_spec.rb
-- spec/features/guide_reset_spec.rb
-- spec/capybara_helper.rb
+- spec/features/standard_flow_spec.rb
+- spec/helpers/application_helper_spec.rb
 - spec/helpers/breadcrumbs_helper_spec.rb
-- spec/helpers/with_navigation_spec.rb
-- spec/helpers/icons_helper_spec.rb
-- spec/helpers/exercise_input_helper_spec.rb
 - spec/helpers/email_helper_spec.rb
-- spec/helpers/application_helper_spec.rb
-- spec/helpers/with_choices_spec.rb
+- spec/helpers/exercise_input_helper_spec.rb
+- spec/helpers/icons_helper_spec.rb
 - spec/helpers/test_results_rendering_spec.rb
-- spec/evaluation_helper.rb
-- spec/controllers/confirmations_controller_spec.rb
-- spec/controllers/guide_progress_controller_spec.rb
-- spec/controllers/discussions_controller_spec.rb
-- spec/controllers/organizations_api_controller_spec.rb
-- spec/controllers/chapters_controller_spec.rb
-- spec/controllers/messages_controller_spec.rb
-- spec/controllers/students_api_controller_spec.rb
-- spec/controllers/api_clients_controller.rb
-- spec/controllers/exercise_solutions_controller_spec.rb
-- spec/controllers/courses_api_controller_spec.rb
-- spec/controllers/users_api_controller_spec.rb
+- spec/helpers/with_choices_spec.rb
+- spec/helpers/with_navigation_spec.rb
+- spec/login_helper.rb
+- spec/mailers/previews/user_mailer_preview.rb
+- spec/mailers/user_mailer_spec.rb
+- spec/models/api_client_spec.rb
+- spec/models/assignment_spec.rb
+- spec/models/book_import_spec.rb
+- spec/models/book_spec.rb
+- spec/models/course_spec.rb
+- spec/models/discussion_spec.rb
+- spec/models/event_generation_spec.rb
+- spec/models/event_publishing_spec.rb
+- spec/models/exam_spec.rb
+- spec/models/exercise_spec.rb
+- spec/models/guide_import_spec.rb
+- spec/models/guide_spec.rb
+- spec/models/interactive_spec.rb
+- spec/models/language_spec.rb
+- spec/models/lesson_spec.rb
+- spec/models/message_spec.rb
+- spec/models/navigation_spec.rb
+- spec/models/organization_spec.rb
+- spec/models/playground_spec.rb
+- spec/models/problem_spec.rb
+- spec/models/query_spec.rb
+- spec/models/question_spec.rb
+- spec/models/reading_spec.rb
+- spec/models/solution_spec.rb
+- spec/models/stats_spec.rb
+- spec/models/string_spec.rb
+- spec/models/topic_import_spec.rb
+- spec/models/usage_spec.rb
+- spec/models/user_changed_spec.rb
+- spec/models/user_spec.rb
+- spec/models/with_expectations_spec.rb
+- spec/spec_helper.rb