mumuki-laboratory 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2a576c10df838214910df546c5ba3aca918fc08275df1b39be0191c419a1d28
-  data.tar.gz: e87e69c8d7a253d16b0694413db2618c37bf6de828bc72e9270fc371b4560631
+  metadata.gz: a40f596693f402240e506ca625b2562809f3d77ccd5422ec322b1b8dd3a0f48c
+  data.tar.gz: 40b3b07e73b77804a1884d8ee6d6ad4d9ca80c636bdabe379411f73d159eb00f
 SHA512:
-  metadata.gz: c8a8b571044afdd28d6a59957b0bd51ec6b92197429cd5c36e2221842d65cd65ef44c3e7b8727dafd66c8437fde9e774d3fc39e8e130b31a44ff92910224a472
-  data.tar.gz: 936bf126f56fcdc664c28ec9a52ea6d7cf426b347e15e1c31d32e9b07809454f9da5692dbb88a4a8dcd7b2b1b632b2c55a0eb19f76ed041227c9dbf186784b44
+  metadata.gz: e20ea051587798caeecbb8e774adece970c19d714b39c102505ce52847a2dcd0e5afa5081aebb9c28ad64c4686786ac4e548b4cf3c048af9d2f4e08221cee7f0
+  data.tar.gz: 38f858df0af512db29f1febad4f7fa007395cbf328a7272904585985dbf8ce2e0bde0fe674eb7335b7e983862fda7e160f1a5c5588910805385c138d4d8eaf17

data/README.md

@@ -26,7 +26,7 @@ sudo apt-get install autoconf curl git build-essential libssl-dev autoconf bison
 > [rbenv](https://github.com/rbenv/rbenv) is a ruby versions manager, similar to rvm, nvm, and so on.
 
 ```bash
-curl https://raw.githubusercontent.com/fesplugas/rbenv-installer/master/bin/rbenv-installer | bash
+curl -fsSL https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-installer | bash
 echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc # or .bash_profile
 echo 'eval "$(rbenv init -)"' >> ~/.bashrc # or .bash_profile
 ```

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

@@ -43,6 +43,7 @@ mumuki.load(function () {
   var $prevSpeech = $('.mu-kids-character-speech-bubble-normal > .mu-kids-prev-speech').hide();
   var $nextSpeech = $('.mu-kids-character-speech-bubble-normal > .mu-kids-next-speech');
   var $speechTabs = $('.mu-kids-character-speech-bubble-tabs > li:not(.separator)');
+  var $defaultSpeechTabName = 'description';
   var $bubble = $('.mu-kids-character-speech-bubble').children('.mu-kids-character-speech-bubble-normal');
   var $texts = $bubble.children('.description, .hint');
 
@@ -75,7 +76,7 @@ mumuki.load(function () {
   });
 
   function getSelectedTabName() {
-    return $speechTabs.filter(".active").data('target');
+    return $speechTabs.filter(".active").data('target') || $defaultSpeechTabName;
   }
 
   function hideCurrentParagraph() {
@@ -102,22 +103,6 @@ mumuki.load(function () {
     if (isVisible) element.show(); else element.hide();
   }
 
-  function autoScrollBubble(toBottom) {
-    var SCROLL_TIME = 1000;
-    var PAUSE_TIME = 2000;
-
-    setTimeout(function () {
-      $bubble.animate({scrollTop: toBottom ? $bubble.height() : 0}, {
-        duration: SCROLL_TIME,
-        complete: function () {
-          autoScrollBubble(!toBottom);
-        }
-      });
-    }, PAUSE_TIME);
-  }
-
-  autoScrollBubble();
-
   mumuki.kids = {
 
     getResultsModal: function () {

data/app/assets/stylesheets/application/modules/_kids.scss

@@ -117,6 +117,12 @@ $kids-speech-tabs-width: 40px;
       ul {
         margin: 0;
       }
+      &.no-tabs {
+        .mu-kids-prev-speech,
+        .mu-kids-next-speech {
+          right: 0px;
+        }
+      }
       .mu-kids-prev-speech,
       .mu-kids-next-speech {
         position: absolute;
@@ -191,6 +197,9 @@ $kids-speech-tabs-width: 40px;
       display: flex;
       align-items: center;
       padding: 15px 50px 15px 15px;
+      &.no-tabs {
+        padding-right: 25px;
+      }
       color: #333;
       border-radius: 10px;
       background: $kids-speech-background-color;

data/app/controllers/exercise_query_controller.rb

@@ -1,5 +1,6 @@
 class ExerciseQueryController < AjaxController
   include Mumuki::Laboratory::Controllers::NestedInExercise
+  include Mumuki::Laboratory::Controllers::ExerciseSeed
 
   def create
     results = @exercise.submit_query! current_user, query_params

data/app/controllers/exercise_solutions_controller.rb

@@ -1,6 +1,7 @@
 class ExerciseSolutionsController < AjaxController
   include Mumuki::Laboratory::Controllers::NestedInExercise
   include Mumuki::Laboratory::Controllers::ResultsRendering
+  include Mumuki::Laboratory::Controllers::ExerciseSeed
 
   before_action :set_messages, only: :create
   before_action :validate_accessible!, only: :create

data/app/controllers/exercise_tries_controller.rb

@@ -1,6 +1,7 @@
 class ExerciseTriesController < AjaxController
   include Mumuki::Laboratory::Controllers::NestedInExercise
   include Mumuki::Laboratory::Controllers::ResultsRendering
+  include Mumuki::Laboratory::Controllers::ExerciseSeed
 
   def create
     assignment, results = @exercise.submit_try! current_user, try_params

data/app/controllers/exercises_controller.rb

@@ -1,4 +1,6 @@
 class ExercisesController < ApplicationController
+  include Mumuki::Laboratory::Controllers::ExerciseSeed
+
   before_action :set_guide!, only: :show
   before_action :set_default_content!, only: :show, if: :current_user?
   before_action :set_assignment!, only: :show, if: :current_user?

data/app/models/exercise/challenge.rb

@@ -12,8 +12,8 @@ class Challenge < Exercise
     self.layout = self.class.default_layout
   end
 
-  def extra
-    [guide.extra, self[:extra]]
+  def extra(*)
+    [guide.extra, super]
       .compact
       .join("\n")
       .strip

data/app/models/exercise.rb

@@ -5,7 +5,8 @@ class Exercise < ApplicationRecord
           WithAssignments,
           FriendlyName,
           WithLanguage,
-          Assistable
+          Assistable,
+          WithRandomizations
 
   include Submittable,
           Questionable
@@ -19,6 +20,8 @@ class Exercise < ApplicationRecord
   validates_presence_of :submissions_count,
                         :guide
 
+  randomize :description, :hint, :extra, :test, :default_content
+
   def console?
     queriable?
   end

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

@@ -1,5 +1,5 @@
 <img src="/anim_amarillo.svg" alt="">
-<div class="mu-kids-character-speech-bubble">
+<div class="mu-kids-character-speech-bubble <%= 'no-tabs' unless @exercise.hint? %>">
   <% if @exercise.hint? %>
       <ul class="mu-kids-character-speech-bubble-tabs">
         <li class="active" data-target="description" title="<%= t :task %>"><i class="fa fa-fw fa-file-text-o"></i>

data/db/migrate/20180611190239_add_randomizations_to_exercises.rb

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

data/lib/mumuki/laboratory/controllers/exercise_seed.rb

@@ -0,0 +1,11 @@
+module Mumuki::Laboratory::Controllers::ExerciseSeed
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :set_seed!
+  end
+
+  def set_seed!
+    @exercise.seed_with! current_user&.id if @exercise
+  end
+end

data/lib/mumuki/laboratory/controllers.rb

@@ -7,3 +7,4 @@ require_relative './controllers/dynamic_errors'
 require_relative './controllers/messages'
 require_relative './controllers/nested_in_exercise'
 require_relative './controllers/results_rendering'
+require_relative './controllers/exercise_seed'

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '5.4.0'
+    VERSION = '5.5.0'
   end
 end

data/lib/mumuki/laboratory.rb

@@ -10,6 +10,7 @@ module Mumuki
 end
 
 require 'mumukit/assistant'
+require 'mumukit/randomizer'
 require 'mumukit/inspection'
 require 'mumukit/bridge'
 require 'mumukit/content_type'

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: 20180526141344) do
+ActiveRecord::Schema.define(version: 20180611190239) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -138,6 +138,7 @@ ActiveRecord::Schema.define(version: 20180526141344) do
     t.string "initial_state"
     t.string "final_state"
     t.text "assistance_rules"
+    t.text "randomizations"
     t.index ["guide_id"], name: "index_exercises_on_guide_id"
     t.index ["language_id"], name: "index_exercises_on_language_id"
   end

data/spec/features/dynamic_exam_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+feature 'Dynamic Exam', organization_workspace: :test do
+  let(:user) { create(:user, id: 1) }
+  let(:user2) { create(:user, id: 2) }
+
+  let!(:problem) { build(:problem, description: 'do f = $someVariable', randomizations: { someVariable: { type: :oneOf, value: %w(some_string some_other_string)} }) }
+
+  let!(:chapter) {
+    create(:chapter, lessons: [
+      create(:lesson, description: 'An awesome guide', exercises: [
+        problem
+      ])
+    ]) }
+
+  before { reindex_current_organization! }
+
+  context 'not logged user' do
+    scenario 'visit exercise by slug' do
+      visit "/exercises/#{problem.slug}"
+
+      expect(page).to have_text('do f = some_string')
+    end
+  end
+
+
+  context 'logged user' do
+    scenario 'visit exercise by slug' do
+      set_current_user! user
+      visit "/exercises/#{problem.slug}"
+
+      expect(page).to have_text('do f = some_other_string')
+
+      set_current_user! user2
+      visit "/exercises/#{problem.slug}"
+
+      expect(page).to have_text('do f = some_string')
+    end
+  end
+end

data/spec/models/randomizer_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Mumukit::Randomizer do
+  let(:randomizer) { Mumukit::Randomizer.parse(randomizations) }
+
+  describe '#with_seed' do
+    before { Mumukit::Randomizer::Randomization::Base.any_instance.stub(:modulo) { |_, value, range| value % range.size + range.first } }
+    let(:randomizer) { Mumukit::Randomizer.parse(some_string: { type: :oneOf, value: %w(some string) }, some_number: { type: :range, value: [1, 3] } ) }
+
+    it { expect(randomizer.with_seed 0).to eq([['some_string', 'some'],    ['some_number', 2]]) }
+    it { expect(randomizer.with_seed 1).to eq([['some_string', 'string'],  ['some_number', 3]]) }
+    it { expect(randomizer.with_seed 2).to eq([['some_string', 'some'],    ['some_number', 1]]) }
+    it { expect(randomizer.with_seed 3).to eq([['some_string', 'string'],  ['some_number', 2]]) }
+    it { expect(randomizer.with_seed 4).to eq([['some_string', 'some'],    ['some_number', 3]]) }
+    it { expect(randomizer.with_seed 5).to eq([['some_string', 'string'],  ['some_number', 1]]) }
+    it { expect(randomizer.with_seed 6).to eq([['some_string', 'some'],    ['some_number', 2]]) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-03 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: mumukit-randomizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -703,6 +717,7 @@ files:
 - db/migrate/20180326224511_remove_book_ids.rb
 - db/migrate/20180402015405_remove_course_uid.rb
 - db/migrate/20180526141344_add_tips_rules_to_exercise.rb
+- db/migrate/20180611190239_add_randomizations_to_exercises.rb
 - db/seeds/users.rb
 - lib/events.rb
 - lib/mumuki/laboratory.rb
@@ -710,6 +725,7 @@ files:
 - lib/mumuki/laboratory/controllers/authorization.rb
 - lib/mumuki/laboratory/controllers/current_organization.rb
 - lib/mumuki/laboratory/controllers/dynamic_errors.rb
+- lib/mumuki/laboratory/controllers/exercise_seed.rb
 - lib/mumuki/laboratory/controllers/messages.rb
 - lib/mumuki/laboratory/controllers/nested_in_exercise.rb
 - lib/mumuki/laboratory/controllers/results_rendering.rb
@@ -841,6 +857,7 @@ files:
 - 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/guide_reset_spec.rb
@@ -886,6 +903,7 @@ files:
 - spec/models/problem_spec.rb
 - spec/models/query_spec.rb
 - spec/models/question_spec.rb
+- spec/models/randomizer_spec.rb
 - spec/models/reading_spec.rb
 - spec/models/solution_spec.rb
 - spec/models/stats_spec.rb
@@ -1022,6 +1040,7 @@ test_files:
 - 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/guide_reset_spec.rb
@@ -1067,6 +1086,7 @@ test_files:
 - spec/models/problem_spec.rb
 - spec/models/query_spec.rb
 - spec/models/question_spec.rb
+- spec/models/randomizer_spec.rb
 - spec/models/reading_spec.rb
 - spec/models/solution_spec.rb
 - spec/models/stats_spec.rb