mumuki-laboratory 5.9.1 → 5.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91bec7b08d66fabf07b739d2619d5ef4a572d9c413a9ef57ebf6e412a5b7bc65
-  data.tar.gz: 1684b4fb366fb66d0ed7bb5c4efd08c7fedd694432d2b1a89357b6938eb81938
+  metadata.gz: d5fa7aa2c319aee6bd932340664e1ed91d87d3dcee8f9b8f429301a7e02b2526
+  data.tar.gz: d12b201ddb14ba04dfbe233d5e57fcec1b57260c85a622243ed03de1226550d2
 SHA512:
-  metadata.gz: 9f5b9a1ae38fcf0ebf7ec66dec7d118fe451a653aa8519d57c60f9240bb2211a8c4a51a5c66161319402bcbf91a877603d694896bc6dfe9cd7ba01ef4ac75357
-  data.tar.gz: c503b00c9256d9d24e5916ddd62816e80d650ec8aae256263e533d3f002787159de29fcc58486defb68206581197f5a5341d8bb5cf793cdef82be068ec9e4981
+  metadata.gz: d5cc2dcc2980e75f1446a5f9b8c315efd3030e0ce90084edf406cb1303442d91870515d82d13051229458fe34c2bd60ce2e5a7560462188d806bd7b39cbc0bde
+  data.tar.gz: 013b96fa9769ba74eba05dd26822872f35acc05e9e60f93b88cdf0c5d81bab5822dc025bb9f73d90168774e7aa6d3b61f6d0f2cd7a677376ae17a78b9187114a

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

@@ -3,7 +3,7 @@ mumuki.load(function () {
   if(!$bubble.length) return;
 
   var availableTabs = ['.description', '.hint'];
-  var $speechParagraphs, paragraphHeight, scrollHeight;
+  var $speechParagraphs, paragraphHeight, scrollHeight, nextSpeechBlinking;
   var currentParagraphIndex = 0;
   var paragraphCount = 1;
   var paragraphsLines = 2;
@@ -53,8 +53,13 @@ mumuki.load(function () {
     })
   });
 
+  if(paragraphCount > 1) {
+    nextSpeechBlinking = setInterval(() => $nextSpeech.fadeTo('slow', 0.1).fadeTo('slow', 1.0), 1000);
+  }
+
   $nextSpeech.click(function () {
     showParagraph(currentParagraphIndex + 1);
+    clearInterval(nextSpeechBlinking);
   });
 
   $prevSpeech.click(function () {

data/app/controllers/concerns/organizations_controller_template.rb

@@ -24,12 +24,10 @@ module OrganizationsControllerTemplate
     params
       .require(:organization)
       .permit(:book,
-              :contact_email, :name, :locale, :description,
-              :logo_url, :banner_url, :open_graph_image_url, :favicon_url, :breadcrumb_image_url,
-              :raise_hand_enabled, :report_issue_enabled, :forum_enabled,
-              :feedback_suggestions_enabled, :public, :immersive,
-              :theme_stylesheet, :extension_javascript, :terms_of_service,
-              :community_link, :login_provider, :embeddable,
+              :name,
+              *Mumukit::Platform::Organization::Profile.attributes,
+              *Mumukit::Platform::Organization::Theme.attributes,
+              *(Mumukit::Platform::Organization::Settings.attributes - [:login_methods]),
               login_methods: [])
       .tap { |it| it.merge!(book: Book.find_by!(slug: it[:book])) if it[:book] }
   end

data/app/controllers/discussions_controller.rb

@@ -1,4 +1,4 @@
-class DiscussionsController < AjaxController
+class DiscussionsController < ApplicationController
   include Mumuki::Laboratory::Controllers::Content
 
   before_action :validate_forum_enabled!

data/app/controllers/guide_progress_controller.rb

@@ -1,7 +1,18 @@
 class GuideProgressController < ApplicationController
+  before_action :check_resettable!, only: :destroy
+
   def destroy
-    guide = Guide.find(params[:guide_id])
     guide.clear_progress! current_user
     redirect_back fallback_location: url_for(guide)
   end
+
+  private
+
+  def check_resettable!
+    raise Mumuki::Laboratory::ForbiddenError unless guide.resettable?
+  end
+
+  def guide
+    @guide ||= Guide.find(params[:guide_id])
+  end
 end

data/app/models/book.rb

@@ -27,7 +27,7 @@ class Book < Content
     self.description = json['description'].squeeze(' ')
 
     rebuild! json['chapters'].map { |it| Topic.find_by!(slug: it).as_chapter_of(self) }
-    rebuild_complements!  (json['complements']||[]).map { |it| Guide.find_by!(slug: it).as_complement_of(self) }
+    rebuild_complements!  (json['complements']||[]).map { |it| Guide.find_by(slug: it)&.as_complement_of(self) }.compact
 
     Organization.all.each { |org| org.reindex_usages! }
   end

data/app/models/concerns/guide_container.rb

@@ -35,8 +35,8 @@ module GuideContainer
 
   # Tells if this guide container
   # imposes any kind of limit to the number of submission
-  # to its assignments
-  def limited?
+  # to its assignments, which may depend on the exercise's type
+  def limited_for?(exercise)
     false
   end
 
@@ -46,4 +46,8 @@ module GuideContainer
 
   def start!(user)
   end
+
+  def resettable?
+    true
+  end
 end

data/app/models/exam.rb

@@ -128,16 +128,20 @@ class Exam < ApplicationRecord
   end
 
   def attempts_left_for(assignment)
-    max_attempts_for(assignment) - (assignment.attempts_count || 0)
+    max_attempts_for(assignment.exercise) - (assignment.attempts_count || 0)
   end
 
-  def limited?
-    true
+  def limited_for?(exercise)
+    max_attempts_for(exercise).present?
+  end
+
+  def resettable?
+    false
   end
 
   private
 
-  def max_attempts_for(assignment)
-    assignment.choice? ? max_choice_submissions : max_problem_submissions
+  def max_attempts_for(exercise)
+    exercise.choice? ? max_choice_submissions : max_problem_submissions
   end
 end

data/app/models/exercise.rb

@@ -22,7 +22,7 @@ class Exercise < ApplicationRecord
                         :guide
 
   randomize :description, :hint, :extra, :test, :default_content
-  delegate :limited?, :timed?, to: :navigable_parent
+  delegate :timed?, to: :navigable_parent
 
   def console?
     queriable?
@@ -158,6 +158,10 @@ class Exercise < ApplicationRecord
     end
   end
 
+  def limited?
+    navigable_parent.limited_for?(self)
+  end
+
   private
 
   def evaluation_class

data/app/models/guide.rb

@@ -86,4 +86,7 @@ class Guide < Content
     book.complements.find_by(guide_id: id) || Complement.new(guide: self, book: book)
   end
 
+  def resettable?
+    usage_in_organization.resettable?
+  end
 end

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

@@ -36,7 +36,7 @@
 </div>
 
 <h3 style="display:inline;"><%= t :content %></h3>
-<%= restart_guide_link(@guide) if current_user && @guide.started?(current_user) %>
+<%= restart_guide_link(@guide) if current_user && @guide.started?(current_user) && @guide.resettable? %>
 <%= render partial: 'layouts/progress_listing', locals: {exercises: @guide.exercises} %>
 
 <% if @stats.try :done? %>

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '5.9.1'
+    VERSION = '5.10.0'
   end
 end

data/lib/mumuki/laboratory.rb

@@ -14,11 +14,11 @@ require 'mumukit/randomizer'
 require 'mumukit/inspection'
 require 'mumukit/bridge'
 require 'mumukit/content_type'
+require 'mumukit/directives'
 require 'kaminari'
 require 'bootstrap-kaminari-views'
 
 require_relative './laboratory/mumukit/auth'
-require_relative './laboratory/mumukit/directives'
 require_relative './laboratory/mumukit/login'
 require_relative './laboratory/mumukit/nuntius'
 require_relative './laboratory/mumukit/platform'

data/spec/controllers/guide_progress_controller_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe GuideProgressController, organization_workspace: :test do
+  let(:user) { create(:user) }
+
+  let(:exam_problem) { build(:problem) }
+  let(:test_organization) { Organization.find_by_name('test') }
+  let(:exam) { create(:exam, organization: test_organization, guide: guide) }
+  let(:guide) { create(:guide, exercises: [exam_problem])}
+
+  before { exam.index_usage! test_organization }
+
+  before { reindex_current_organization! }
+
+  describe 'delete' do
+    before { set_current_user! user }
+    before { delete :destroy, params: { guide_id: guide.id } }
+
+    it { expect(response.status).to eq 403 }
+  end
+end

data/spec/features/exams_flow_spec.rb

@@ -5,12 +5,14 @@ feature 'Exams Flow', organization_workspace: :test do
   let(:other_exam) { create(:exam, organization: other_organization) }
   let!(:exam_not_in_path) { create :exam }
 
-  let!(:chapter) {
-    create(:chapter, lessons: [
-        create(:lesson)]) }
-
   let(:other_organization) { create(:organization, name: 'baz') }
 
+  let(:exam_with_no_submission_limits) { create(:exam, organization_id: Organization.find_by_name('test').id, guide_id: guide.id) }
+  let(:guide) { create(:guide, exercises: [exercise])}
+  let(:exercise) { create(:exercise, name: 'Exam Exercise') }
+
+  before { exam_with_no_submission_limits.index_usage! Organization.find_by_name('test') }
+
   before { reindex_current_organization! }
 
   context 'inexistent exam' do
@@ -51,4 +53,13 @@ feature 'Exams Flow', organization_workspace: :test do
 
     expect(page).to have_text('This exam is no longer available.')
   end
+
+  scenario 'visit exercise for exam with no submission limits' do
+    user = create(:user)
+    set_current_user! user
+    exam_with_no_submission_limits.authorize!(user)
+    visit "/exercises/#{exercise.id}"
+
+    expect(page).to have_text('Exam Exercise')
+  end
 end

data/spec/features/guide_reset_spec.rb

@@ -3,12 +3,19 @@ require 'spec_helper'
 feature 'Exercise Flow', organization_workspace: :test do
   let(:user) { create(:user) }
 
-  let!(:problem) { build(:problem)}
+  let!(:problem) { build(:problem) }
 
   let!(:lesson) { create(:lesson, description: 'An awesome guide', exercises: [problem]) }
 
   let!(:chapter) { create(:chapter, lessons: [lesson]) }
 
+  let(:exam_problem) { build(:problem) }
+  let(:test_organization) { Organization.find_by_name('test') }
+  let(:exam) { create(:exam, organization: test_organization, guide: guide) }
+  let(:guide) { create(:guide, exercises: [exam_problem])}
+
+  before { exam.index_usage! test_organization }
+
   before { reindex_current_organization! }
 
   let(:restart_xpath) { "//i[@title='#{I18n.t(:restart)}']" }
@@ -40,5 +47,14 @@ feature 'Exercise Flow', organization_workspace: :test do
       expect(page).to have_text('An awesome guide')
       expect(page).to have_xpath(restart_xpath)
     end
+
+    scenario 'visit exam guide with solutions sent for it' do
+      exam_problem.submit_solution! user
+      exam.authorize!(user)
+
+      visit "/exams/#{exam.id}"
+
+      expect(page).to_not have_xpath(restart_xpath)
+    end
   end
 end

data/spec/models/book_import_spec.rb

@@ -18,22 +18,32 @@ describe Book, organization_workspace: :test do
      slug: 'mumuki/mumuki-sample-book',
      locale: 'en',
      chapters: [topic_1.slug, topic_2.slug],
-     complements: [guide_2.slug, guide_1.slug]
+     complements: complement_slugs,
     }.deep_stringify_keys
   end
 
   describe '#import_from_json!' do
-    before do
-      book.import_from_json!(book_json)
+    context 'when complements are present' do
+      let(:complement_slugs) { [guide_2.slug, guide_1.slug] }
+
+      before { book.import_from_json!(book_json) }
+
+      it { expect(book.name).to eq 'sample book' }
+      it { expect(book.description).to eq 'a sample book description' }
+      it { expect(book.locale).to eq 'en' }
+      it { expect(book.chapters.count).to eq 2 }
+      it { expect(book.complements.count).to eq 2 }
+
+      it { expect(topic_2.reload.usage_in_organization).to be_a Chapter }
+      it { expect(guide_2.reload.usage_in_organization).to be_a Complement }
     end
 
-    it { expect(book.name).to eq 'sample book' }
-    it { expect(book.description).to eq 'a sample book description' }
-    it { expect(book.locale).to eq 'en' }
-    it { expect(book.chapters.count).to eq 2 }
-    it { expect(book.complements.count).to eq 2 }
+    context 'when complements are not present' do
+      let(:complement_slugs) { ['foo/bar', guide_1.slug] }
 
-    it { expect(topic_2.reload.usage_in_organization).to be_a Chapter }
-    it { expect(guide_2.reload.usage_in_organization).to be_a Complement }
+      before { book.import_from_json!(book_json) }
+
+      it { expect(book.complements.count).to eq 1 }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 5.9.1
+  version: 5.10.0
 platform: ruby
 authors:
 - Franco Bulgarelli
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: mumukit-nuntius
   requirement: !ruby/object:Gem::Requirement
@@ -114,42 +114,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: mumukit-login
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: mumukit-directives
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: mumukit-assistant
   requirement: !ruby/object:Gem::Requirement
@@ -838,7 +838,6 @@ files:
 - lib/mumuki/laboratory/locales/pt.yml
 - lib/mumuki/laboratory/locales/views.es.yml
 - lib/mumuki/laboratory/mumukit/auth.rb
-- lib/mumuki/laboratory/mumukit/directives.rb
 - lib/mumuki/laboratory/mumukit/login.rb
 - lib/mumuki/laboratory/mumukit/nuntius.rb
 - lib/mumuki/laboratory/mumukit/platform.rb
@@ -891,6 +890,7 @@ files:
 - 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
@@ -1078,6 +1078,7 @@ test_files:
 - 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

data/lib/mumuki/laboratory/mumukit/directives.rb

@@ -1,20 +0,0 @@
-require 'mumukit/directives'
-
-class Mumukit::Directives::Sections < Mumukit::Directives::Directive
-  # TODO Move this behaviour to gem
-  def join(sections)
-    file_declarations, file_references = sections.map do |section, content|
-      [build(section, content), interpolate(section)]
-    end.transpose
-
-    file_declarations.join "\n"
-  end
-
-  def build(section, content)
-    "#{comment_type.comment "<#{section}#"}#{content}#{comment_type.comment "##{section}>"}"
-  end
-
-  def interpolate(section)
-    comment_type.comment("...#{section}...")
-  end
-end