mumuki-laboratory 5.8.3 → 5.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 625ae660ff8299245d10e105830ddcf35e14a1700f36ecad6d338cbd0bee64bd
-  data.tar.gz: 43691be79aa7d382429e9443ed0727c19ded873284baab6c1ad8f8c9232d09b7
+  metadata.gz: 1aba4e2ab138f4c9e7310afc18ca35639c12d06c70980fd9d912abf24af1c937
+  data.tar.gz: 98afb11476a5221d39783b233ec4f7e1e05ec569c62a1c14a78a4bf138b91ab7
 SHA512:
-  metadata.gz: ca3b02948675b7bf146dac98f74ba891ecfb6feb979853b52d7bbce804a34b350278677beac6a782d79b8399a737e9243bfcca8cb0dde1128e7f966811ad1abe
-  data.tar.gz: bcb56b9bbac91d7600e69502432d6d176ffff4783a7c80c809a54606d8faceb56a49e232765fdd29fb18f9c52d6a1425ba73a64cf329210b2b188b0c029fc7f0
+  metadata.gz: 8b6e21ceb45a76cfd5eb468271b30dbfe095efb33bf3a5f01b715721a9bba2a20e8dfb76a859379bf7a495e9abe1f7cdf5d6b048f3841d2dca645360a9ee8a2b
+  data.tar.gz: 1b8f6d4d19ba9e689d62f7e96e2b9d5cb985517d9c29a0b4b49f594fa3c7d5cfdbbefef408994e4af6eed85578f1b8ba1659db92de5d007f7773c625b6daeef8

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

@@ -22,7 +22,8 @@ var mumuki = mumuki || {};
       this.submissionsErrorTemplate.show();
       animateTimeoutError(submitButton);
     },
-    done: function () {
+    done: function (data, submitButton) {
+      submitButton.updateAttemptsLeft(data);
       mumuki.pin.scroll();
     }
   };
@@ -34,7 +35,6 @@ var mumuki = mumuki || {};
 
   SubmitButton.prototype = {
     disable: function () {
-      this.setWaitingText();
       this.submissionControls.attr('disabled', 'disabled');
     },
     setWaitingText: function () {
@@ -47,6 +47,24 @@ var mumuki = mumuki || {};
     enable: function () {
       this.setSendText();
       this.submissionControls.removeAttr('disabled');
+    },
+    reachedMaxAttempts: function () {
+      return $('#attempts-left-text').attr('data-disabled') === "true";
+    },
+    updateAttemptsLeft: function (data) {
+      $('#attempts-left-text').replaceWith(data['remaining_attempts_html']);
+      this.checkAttemptsLeft();
+    },
+    preventSubmission: function () {
+      this.disable();
+      this.submitButton.on('click', function (e) {
+        e.preventDefault();
+      })
+    },
+    checkAttemptsLeft: function () {
+      if (this.reachedMaxAttempts()) {
+        this.preventSubmission();
+      }
     }
   };
 
@@ -58,6 +76,7 @@ var mumuki = mumuki || {};
 
     var btnSubmit = $('.btn-submit');
     var submissionControl = $('.submission_control');
+
     var submitButton = new SubmitButton(btnSubmit, submissionControl);
 
     var bridge = new mumuki.bridge.Laboratory;
@@ -65,6 +84,7 @@ var mumuki = mumuki || {};
     btnSubmit.on('click', function (e) {
       e.preventDefault();
       submitButton.disable();
+      submitButton.setWaitingText();
       resultsBox.waiting();
 
       mumuki.editor.syncContent();
@@ -74,12 +94,13 @@ var mumuki = mumuki || {};
         resultsBox.success(data, submitButton);
       }).fail(function () {
         resultsBox.error(submitButton);
-      }).always(function () {
+      }).always(function (data) {
         $(document).renderMuComponents();
-        resultsBox.done();
+        resultsBox.done(data, submitButton);
       });
     });
 
+    submitButton.checkAttemptsLeft();
   });
 
   function getContent(){

data/app/controllers/application_controller.rb

@@ -1,6 +1,8 @@
 class ApplicationController < ActionController::Base
   Mumukit::Login.configure_controller! self
 
+  protect_from_forgery with: :exception
+
   include Mumuki::Laboratory::Controllers::CurrentOrganization
   include Mumukit::Login::AuthenticationHelpers
 
@@ -41,7 +43,8 @@ class ApplicationController < ActionController::Base
 
   # ensures contents are accessible to current user
   def validate_accessible!
-    accessible_subject.validate_accessible_for!(current_user) unless (current_user? && current_user.teacher_here?)
+    return if current_user&.teacher_here?
+    accessible_subject.validate_accessible_for! current_user
   end
 
   # required by Mumukit::Login

data/app/controllers/concerns/organizations_controller_template.rb

@@ -28,8 +28,9 @@ module OrganizationsControllerTemplate
               :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_methods: [])
+              :theme_stylesheet, :extension_javascript, :terms_of_service,
+              :community_link, :login_provider, :embeddable,
+              login_methods: [])
       .tap { |it| it.merge!(book: Book.find_by!(slug: it[:book])) if it[:book] }
   end
 end

data/app/controllers/exercise_solutions_controller.rb

@@ -7,7 +7,7 @@ class ExerciseSolutionsController < AjaxController
   before_action :validate_accessible!, only: :create
 
   def create
-    assignment = @exercise.submit_solution!(current_user, solution_params)
+    assignment = @exercise.try_submit_solution!(current_user, solution_params)
     render_results_json assignment, status: assignment.status
   end
 

data/app/controllers/exercises_controller.rb

@@ -3,7 +3,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?
   before_action :validate_accessible!, only: :show
   before_action :start!, only: :show
@@ -31,14 +30,11 @@ class ExercisesController < ApplicationController
     @exercise.navigable_parent.start! current_user
   end
 
-  def set_default_content!
-    @files = @exercise.files_for(current_user)
-    @current_content = @exercise.current_content_for(current_user)
-    @default_content = @exercise.default_content_for(current_user)
-  end
-
   def set_assignment!
     @assignment = @exercise.assignment_for(current_user)
+    @files = @assignment.files
+    @current_content = @assignment.current_content
+    @default_content = @assignment.default_content
   end
 
   def set_guide!

data/app/controllers/login_controller.rb

@@ -1,8 +1,14 @@
 class LoginController < ApplicationController
   Mumukit::Login.configure_login_controller! self
 
+  skip_before_action :verify_authenticity_token, if: lambda { Rails.env.development? }
+
   private
 
+  def organization_name
+    params[:organization] || super
+  end
+
   def login_failure!
     redirect_to root_path, alert: request.params['message']
   end

data/app/helpers/contextualization_result_helper.rb

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

data/app/helpers/exercise_input_helper.rb

@@ -47,15 +47,30 @@ module ExerciseInputHelper
     !assignment.passed? && organization.ask_for_help_enabled?
   end
 
-  def render_submit_button(exercise)
-    options = submit_button_options(exercise)
+  def render_submit_button(assignment)
+    options = submit_button_options(assignment.exercise)
     text = t(options.t) if options.t.present?
     waiting_text = t(options.waiting_t) if options.waiting_t.present?
-    %Q{<#{options.tag} for="#{options.for}"
+    %Q{
+      <div class="btn-submit-container">
+        <#{options.tag} for="#{options.for}"
                        class="btn btn-success btn-block btn-submit #{options.classes}"
                        data-waiting="#{waiting_text}">
-          #{fa_icon options.fa_icon, text: text}
-       </#{options.tag}>}.html_safe
+          #{fa_icon options.fa_icon}
+          #{text} #{remaining_attempts_text(assignment)}
+       </#{options.tag}>
+      </div>
+    }.html_safe
+  end
+
+  def remaining_attempts_text(assignment)
+    if assignment.limited?
+      %Q{
+        <span id="attempts-left-text" data-disabled="#{!assignment.attempts_left?}">
+          (#{t(:attempts_left, count: assignment.attempts_left)})
+        </span>
+      }
+    end
   end
 
   def render_custom_editor(exercise, read_only=false)

data/app/helpers/messages_helper.rb

@@ -4,19 +4,19 @@ module MessagesHelper
   end
 
   def hidden_pending(assignment)
-    assignment&.pending_messages? ? '' : 'hidden'
+    assignment.pending_messages? ? '' : 'hidden'
   end
 
   def disabled_submit_class(assignment)
-    assignment&.pending_messages? ? 'disabled' : ''
+    assignment.pending_messages? ? 'disabled' : ''
   end
 
   def pending_messages_filter(assignment)
-    'pending-messages-filter' if assignment&.pending_messages?
+    'pending-messages-filter' if assignment.pending_messages?
   end
 
   def read_messages_caption(assignment)
-    assignment&.pending_messages? ? :read_messages : :exit
+    assignment.pending_messages? ? :read_messages : :exit
   end
 
   def sender_class(message)

data/app/helpers/organization_list_helper.rb

@@ -2,4 +2,8 @@ module OrganizationListHelper
   def organizations_for(user)
     (user.accessible_organizations + [Organization.central]).uniq.compact
   end
+
+  def organization_switch_url(organization)
+    organization.url_for(controller_name == 'users' ? root_path : request.path)
+  end
 end

data/app/models/assignment.rb

@@ -2,17 +2,21 @@ class Assignment < ApplicationRecord
   include Contextualization
   include WithMessages
 
+  markdown_on :extra_preview
+
   belongs_to :exercise
   has_one :guide, through: :exercise
-  has_many :messages, -> { where.not(submission_id: nil).order(date: :desc) }, foreign_key: :submission_id, primary_key: :submission_id
+  has_many :messages, -> { where.not(submission_id: nil).order(date: :desc) }, foreign_key: :submission_id, primary_key: :submission_id, dependent: :delete_all
 
   belongs_to :submitter, class_name: 'User'
 
   validates_presence_of :exercise, :submitter
 
-  delegate :language, :name, to: :exercise
+  delegate :language, :name, :navigable_parent,
+           :limited?, :input_kids?, :choice?, to: :exercise
 
   alias_attribute :status, :submission_status
+  alias_attribute :attempts_count, :attemps_count
 
   scope :by_exercise_ids, -> (exercise_ids) {
     where(exercise_id: exercise_ids) if exercise_ids
@@ -22,6 +26,11 @@ class Assignment < ApplicationRecord
     joins(:submitter).where('users.name' => usernames) if usernames
   }
 
+  defaults do
+    self.query_results = []
+    self.expectation_results = []
+  end
+
   def evaluate_manually!(teacher_evaluation)
     update! status: teacher_evaluation[:status], manual_evaluation_comment: teacher_evaluation[:manual_evaluation]
   end
@@ -61,11 +70,15 @@ class Assignment < ApplicationRecord
   end
 
   def test
-    exercise.test_for submitter
+    exercise.test && language.interpolate_references_for(self, exercise.test)
   end
 
   def extra
-    exercise.extra_for submitter
+    exercise.extra && language.interpolate_references_for(self, exercise.extra)
+  end
+
+  def extra_preview
+    Mumukit::ContentType::Markdown.highlighted_code(language.name, extra)
   end
 
   def run_update!
@@ -104,7 +117,6 @@ class Assignment < ApplicationRecord
   end
 
   def as_platform_json
-    navigable_parent = exercise.navigable_parent
     as_json(except: [:exercise_id, :submission_id, :id, :submitter_id, :solution, :created_at, :updated_at, :submission_status],
               include: {
                 guide: {
@@ -136,8 +148,39 @@ class Assignment < ApplicationRecord
     @tips ||= exercise.assist_with(self)
   end
 
-  def increment_attemps!
-    self.attemps_count += 1 unless passed?
+  def increment_attempts!
+    self.attempts_count += 1 if should_retry?
+  end
+
+  def attempts_left
+    navigable_parent.attempts_left_for(self)
+  end
+
+  # Tells wether the submitter of this
+  # assignment can keep on sending submissions
+  # which is true for non limited or for assignments
+  # that have not reached their submissions limit
+  def attempts_left?
+    !limited? || attempts_left > 0
+  end
+
+  def current_content
+    solution || default_content
+  end
+
+  def current_content_at(index)
+    exercise.sibling_at(index).assignment_for(submitter).current_content
+  end
+
+  def default_content
+    @default_content ||= language.interpolate_references_for(self, exercise.default_content)
+  end
+
+  def files
+    language
+      .directives_sections
+      .split_sections(current_content)
+      .map { |name, content| Mumuki::Laboratory::File.new name, content }
   end
 
   private

data/app/models/concerns/contextualization.rb

@@ -28,7 +28,7 @@ module Contextualization
 
     delegate :visible_success_output?, to: :exercise
     delegate :output_content_type, to: :language
-    delegate :should_retry?, :to_submission_status, :passed?, :aborted?, to: :submission_status
+    delegate :should_retry?, :to_submission_status, *Mumuki::Laboratory::Status::Submission.test_selectors, to: :submission_status
     delegate :inspection_keywords, to: :exercise
   end
 
@@ -47,11 +47,11 @@ module Contextualization
   end
 
   def results_visible?
-    (visible_success_output? || should_retry?) && !exercise.choices?
+    (visible_success_output? || !passed?) && !exercise.choices? && !manual_evaluation_pending?
   end
 
   def result_preview
-    result.truncate(100) if should_retry?
+    result.truncate(100) unless passed?
   end
 
   def result_html

data/app/models/concerns/guide_container.rb

@@ -25,6 +25,21 @@ module GuideContainer
   def validate_accessible_for!(user)
   end
 
+  # Tells the number of remaning
+  # attemps for a given assignment that belongs to this
+  # container, or `nil`, if this container does not impose
+  # any limit to the number of submissions
+  def attempts_left_for(assignment)
+    nil
+  end
+
+  # Tells if this guide container
+  # imposes any kind of limit to the number of submission
+  # to its assignments
+  def limited?
+    false
+  end
+
   def timed?
     false
   end

data/app/models/concerns/submittable/submittable.rb

@@ -4,7 +4,7 @@ module Submittable
   end
 
   def find_assignment_and_submit!(user, submission)
-    assignment = find_or_init_assignment_for user
+    assignment = assignment_for user
     results = submission.run! assignment, evaluation_class.new
     [assignment, results]
   end

data/app/models/concerns/with_assignments.rb

@@ -1,63 +1,32 @@
 module WithAssignments
   extend ActiveSupport::Concern
 
+  # TODO we must avoid _for(user) methods when they
+  # are hidden the assignment object, since an assignment already encapsulates
+  # the exercise-user pair, and many times they impose a performance hit,
+  # since in the normal scenario the assignment object already exists
+
   included do
     has_many :assignments, dependent: :destroy
   end
 
-  def current_content_for(user)
-    assignment_for(user)&.solution || default_content_for(user)
-  end
-
-  def files_for(user)
-    language
-      .directives_sections
-      .split_sections(current_content_for user)
-      .map { |name, content| Mumuki::Laboratory::File.new name, content }
-  end
-
-  def interpolate_for(user, field)
-    language.interpolate(field, user.interpolations, lambda { |content| replace_content_reference(user, content) })
-  end
-
-  def default_content_for(user)
-    interpolate_for user, default_content || ''
-  end
-
-  def extra_for(user)
-    interpolate_for user, extra
-  end
-
-  def test_for(user)
-    test && interpolate_for(user, test)
-  end
-
-  def replace_content_reference(user, interpolee)
-    case interpolee
-      when /previousContent|previousSolution/
-        previous.current_content_for(user)
-      when /(solution|content)\[(-?\d*)\]/
-        sibling_at($2.to_i).current_content_for(user)
-    end
-  end
-
   def messages_for(user)
-    assignment_for(user)&.messages || []
+    assignment_for(user).messages
   end
 
   def has_messages_for?(user)
     messages_for(user).present?
   end
 
-  def assignment_for(user)
+  def find_assignment_for(user)
     assignments.find_by(submitter: user)
   end
 
   def status_for(user)
-    assignment_for(user).defaulting(Mumuki::Laboratory::Status::Submission::Pending, &:status) if user
+    assignment_for(user).status if user
   end
 
-  def find_or_init_assignment_for(user)
-    assignment_for(user) || user.assignments.build(exercise: self)
+  def assignment_for(user)
+    find_assignment_for(user) || user.assignments.build(exercise: self)
   end
 end