mumuki-domain 7.3.2 → 7.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39020a28808b40cdfdfcbbacb3f5548a56ba6886ae4ffec37e46501a9e211ae9
-  data.tar.gz: 80eebf536803172e019da3af5e4e480e4613716db2dff9cb2bd51a09dee20340
+  metadata.gz: 40391bc2dcc0ab54965e1d82a289c8960dac3f68cf4c8fb2a3d097e774b899b4
+  data.tar.gz: 205ce356bcc3365491551226eaa2b076ae58d7ac1255fb51294424b419ea4ffb
 SHA512:
-  metadata.gz: 2b92101a2f8af04af9f29722c8581f645533da33146deb68b16af0013babfa86786f6210929ea4d42857cfdb1be871fd8671b76b210321a7c78110a02fbee750
-  data.tar.gz: dcd486ae7a1cbe1500d2ad16b06856ee3ef5ee114ec5d54280754c1ad49c627eba0290f1af0b59d7a11a21e1df9313cdf5f948bef1849b180074c363399519a0
+  metadata.gz: 3741ef7ad7daf3f6cfc2d829d8fbf336512e4ec719257734d2e3bcc0b960081a6c50bdc3f31e2c82dc59abbc1d2d1719ab68ace80ec8c7ff1a908613b1123409
+  data.tar.gz: cf4e192e33fcdd94f68398f074715b22088169d50b88acc9d1aa0457bb15850a8288f2280ecbcf5aec874dd8c85f01c952a430762113fe5a383c19816bcbb5c2

data/app/models/assignment.rb

@@ -18,7 +18,7 @@ class Assignment < Progress
   validates_presence_of :exercise, :submitter
 
   delegate :language, :name, :navigable_parent, :settings,
-           :limited?, :input_kids?, :choice?, to: :exercise
+           :limited?, :input_kids?, :choice?, :results_hidden?, to: :exercise
 
   alias_attribute :status, :submission_status
   alias_attribute :attempts_count, :attemps_count
@@ -59,6 +59,14 @@ class Assignment < Progress
     update! status: teacher_evaluation[:status], manual_evaluation_comment: teacher_evaluation[:manual_evaluation]
   end
 
+  def visible_status
+    if results_hidden? && !pending?
+      :manual_evaluation_pending.to_submission_status
+    else
+      super
+    end
+  end
+
   def persist_submission!(submission)
     transaction do
       messages.destroy_all if submission_id.present?
@@ -160,7 +168,7 @@ class Assignment < Progress
                     language: {only: [:name]}},
                 },
                 exercise: {only: [:name, :number]},
-                submitter: {only: [:email, :image_url, :social_id, :uid], methods: [:name]}}).
+                submitter: {only: [:email, :social_id, :uid], methods: [:name, :profile_picture]}}).
       deep_merge(
         'organization' => Organization.current.name,
         'sid' => submission_id,
@@ -190,7 +198,7 @@ class Assignment < Progress
     navigable_parent.attempts_left_for(self)
   end
 
-  # Tells wether the submitter of this
+  # Tells whether 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

data/app/models/avatar.rb

@@ -0,0 +1,5 @@
+class Avatar < ApplicationRecord
+  def self.sample
+    Avatar.order('RANDOM()').first
+  end
+end

data/app/models/book.rb

@@ -62,4 +62,17 @@ class Book < Content
   def structural_parent
     nil
   end
+
+  ## progressive display
+
+  def enabled_chapters_in(workspace)
+    workspace.enabled_containers(chapters)
+  end
+
+  # experimental API - it may change in the future.
+  # This method assumes no gaps in the sequences are introduced
+  # by enabled_chapters_in
+  def chapter_visibilities_in(workspace)
+    chapters.zip(enabled_chapters_in(workspace)).map { |chapter, enabled| [chapter, !enabled.nil?] }
+  end
 end

data/app/models/concerns/{with_content.rb → container.rb}

@@ -1,4 +1,4 @@
-module WithContent
+module Container
   extend ActiveSupport::Concern
 
   included do

data/app/models/concerns/contextualization.rb

@@ -25,7 +25,7 @@ module Contextualization
 
     delegate :visible_success_output?, to: :exercise
     delegate :output_content_type, to: :language
-    delegate :should_retry?, :to_submission_status, :completed?, *Mumuki::Domain::Status::Submission.test_selectors, to: :submission_status
+    delegate :should_retry?, :to_submission_status, :completed?, :solved?, *Mumuki::Domain::Status::Submission.test_selectors, to: :submission_status
     delegate :inspection_keywords, to: :exercise
   end
 
@@ -35,20 +35,46 @@ module Contextualization
     end
   end
 
+  # deprecated: this method does hidden assumptions about the UI not wanting
+  # non-empty titles to not be displayed. Also it incorrectly uses the term `visual` instead of `visible`
   def single_visual_result?
-    test_results.size == 1 && test_results.first[:title].blank? && visible_success_output?
+    warn 'use single_visible_test_result? instead'
+    single_visible_test_result? && first_test_result[:title].blank?
   end
 
+  # deprecated: this method does not validate nor depends on any `visible` condition
+  # Also, it incorrectly uses the term `visual` instead of `visible`
   def single_visual_result_html
-    output_content_type.to_html test_results.first[:result]
+    warn 'use first_test_result_html intead'
+    first_test_result_html
   end
 
-  def results_visible?
-    (visible_success_output? || !passed?) && !exercise.choices? && !manual_evaluation_pending?
+  def single_visible_test_result?
+    test_results.size == 1 && visible_success_output?
   end
 
-  def result_preview
-    result.truncate(100) unless passed?
+  def first_test_result
+    test_results.first
+  end
+
+  def first_test_result_html
+    test_result_html first_test_result
+  end
+
+  def test_result_html(test_result)
+    output_content_type.to_html test_result[:result]
+  end
+
+  def results_body_hidden?
+    (passed? && !visible_success_output?) || exercise.choice? || manual_evaluation_pending? || skipped?
+  end
+
+  def visible_status
+    status
+  end
+
+  def iconize
+    visible_status.iconize
   end
 
   def result_html
@@ -60,7 +86,7 @@ module Contextualization
   end
 
   def failed_expectation_results
-    expectation_results.to_a.select { |it| it[:result].failed? }
+    expectation_results.to_a.select { |it| it[:result].failed? }.uniq
   end
 
   def expectation_results_visible?
@@ -72,6 +98,7 @@ module Contextualization
   end
 
   def humanized_expectation_results
+    warn "Don't use humanized_expectation_results. Use affable_expectation_results, which also handles markdown and sanitization"
     visible_expectation_results.map do |it|
       {
         result: it[:result],
@@ -79,4 +106,32 @@ module Contextualization
       }
     end
   end
+
+  ####################
+  ## Affable results
+  ####################
+
+  def affable_expectation_results
+    visible_expectation_results.map do |it|
+      {
+        result: it[:result],
+        explanation: Mulang::Expectation.parse(it).translate(inspection_keywords).affable
+      }
+    end
+  end
+
+  def affable_tips
+    tips.map(&:affable)
+  end
+
+  def affable_test_results
+    test_results.to_a.map do |it|
+      { summary: it.dig(:summary, :message).affable }
+        .compact
+        .merge(
+          title: it[:title].affable,
+          result: it[:result].sanitized,
+          status: it[:status])
+    end
+  end
 end

data/app/models/concerns/disabling.rb

@@ -0,0 +1,37 @@
+# The disposable module is a soft-delete helper that:
+#
+#  * adds `disable!` method that set a `disabled_at` attribute and then _buries_ the object
+#  * adds a `bury!`  hook method that allows further modification when disabling
+#  * aliases `destroy!` and `destroy` to `disable!`, but still keeps `delete` and friends
+#
+module Disabling
+  extend ActiveSupport::Concern
+
+  def disable!
+    transaction do
+      update_attribute :disabled_at, Time.current
+      bury!
+    end
+  end
+
+  def disabled?
+    disabled_at.present?
+  end
+
+  def enabled?
+    !disabled?
+  end
+
+  # override to perform additional
+  # post-disable actions
+  def bury!
+  end
+
+  def ensure_enabled!
+    raise Mumuki::Domain::DisabledError if disabled?
+  end
+
+  alias_method :destroy!,  :disable!
+  alias_method :destroy,   :disable!
+end
+

data/app/models/concerns/guide_container.rb

@@ -1,6 +1,6 @@
 module GuideContainer
   extend ActiveSupport::Concern
-  include WithContent
+  include Container
 
   included do
     associated_content :guide
@@ -38,7 +38,13 @@ module GuideContainer
   # Tells if this guide container
   # imposes any kind of limit to the number of submission
   # to its assignments, which may depend on the exercise's type
-  def limited_for?(exercise)
+  def limited_for?(_exercise)
+    false
+  end
+
+  # Tells if this guide container
+  # hides the results for students
+  def results_hidden_for?(_exercise)
     false
   end
 

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

@@ -1,7 +1,7 @@
 module Solvable
   def submit_solution!(user, attributes={})
     assignment, _ = find_assignment_and_submit! user, attributes[:content].to_mumuki_solution(language)
-    try_solve_discussions(user) if assignment.passed?
+    try_solve_discussions(user) if assignment.solved?
     assignment
   end
 

data/app/models/concerns/topic_container.rb

@@ -1,6 +1,6 @@
 module TopicContainer
   extend ActiveSupport::Concern
-  include WithContent
+  include Container
 
   included do
     associated_content :topic

data/app/models/concerns/with_editor.rb

@@ -19,7 +19,7 @@ module WithEditor
       struct id: "content_choice_#{index}",
              index: index,
              value: choice,
-             text: Mumukit::ContentType::Markdown.to_html(choice_text(choice))
+             text: choice_text(choice).markdownified
     end
   end
 

data/app/models/concerns/with_progress.rb

@@ -19,6 +19,10 @@ module WithProgress
     self
   end
 
+  def completed_for?(user, organization)
+    progress_for(user, organization).completed?
+  end
+
   private
 
   def structural_children_changed?(old_structural_children)

data/app/models/course.rb

@@ -1,6 +1,7 @@
 class Course < ApplicationRecord
   include Mumuki::Domain::Syncable
   include Mumuki::Domain::Helpers::Course
+  include Mumuki::Domain::Area
 
   validates_presence_of :slug, :shifts, :code, :days, :period, :description, :organization_id
   validates_uniqueness_of :slug
@@ -48,4 +49,8 @@ class Course < ApplicationRecord
   def self.sync_key_id_field
     :slug
   end
+
+  def to_organization
+    organization
+  end
 end

data/app/models/exam.rb

@@ -161,6 +161,10 @@ class Exam < ApplicationRecord
     max_attempts_for(exercise).present?
   end
 
+  def results_hidden_for?(exercise)
+    exercise.choice? && results_hidden_for_choices?
+  end
+
   def resettable?
     false
   end

data/app/models/exercise.rb

@@ -55,6 +55,10 @@ class Exercise < ApplicationRecord
     guide.done_for?(user)
   end
 
+  def choice?
+    false
+  end
+
   def previous
     sibling_at number.pred
   end
@@ -128,7 +132,7 @@ class Exercise < ApplicationRecord
       .merge(settings: self[:settings])
       .merge(RANDOMIZED_FIELDS.map { |it| [it, self[it]] }.to_h)
       .symbolize_keys
-      .tap { |it| it.markdownify!(:hint, :corollary, :description, :teacher_info) if options[:markdownified] }
+      .tap { |it| it.markdownified!(:hint, :corollary, :description, :teacher_info) if options[:markdownified] }
   end
 
   def reset!
@@ -162,7 +166,7 @@ class Exercise < ApplicationRecord
   end
 
   def description_context
-    Mumukit::ContentType::Markdown.to_html splitted_description.first
+    splitted_description.first.markdownified
   end
 
   def splitted_description
@@ -170,7 +174,7 @@ class Exercise < ApplicationRecord
   end
 
   def description_task
-    Mumukit::ContentType::Markdown.to_html splitted_description.drop(1).join("\n")
+    splitted_description.drop(1).join("\n").markdownified
   end
 
   def custom?
@@ -192,8 +196,15 @@ class Exercise < ApplicationRecord
     end
   end
 
+  # An exercise with hidden results cannot be limited
+  # as those exercises can be submitted as many times as the
+  # student wants because no result output is given
   def limited?
-    navigable_parent.limited_for?(self)
+    !results_hidden? && navigable_parent.limited_for?(self)
+  end
+
+  def results_hidden?
+    navigable_parent&.results_hidden_for?(self)
   end
 
   def files_for(current_content)

data/app/models/guide.rb

@@ -104,7 +104,7 @@ class Guide < Content
       .merge(super)
       .merge(exercises: exercises.map { |it| it.to_resource_h(options) })
       .merge(language: language.to_embedded_resource_h)
-      .tap { |it| it.markdownify!(:corollary, :description, :teacher_info) if options[:markdownified] }
+      .tap { |it| it.markdownified!(:corollary, :description, :teacher_info) if options[:markdownified] }
   end
 
   def to_markdownified_resource_h

data/app/models/organization.rb

@@ -1,6 +1,7 @@
 class Organization < ApplicationRecord
   include Mumuki::Domain::Syncable
   include Mumuki::Domain::Helpers::Organization
+  include Mumuki::Domain::Area
 
   include Mumukit::Login::OrganizationHelpers
 
@@ -11,6 +12,7 @@ class Organization < ApplicationRecord
   markdown_on :description
 
   validate :ensure_consistent_public_login
+  validate :ensure_valid_activity_range
 
   belongs_to :book
   has_many :usages
@@ -126,12 +128,26 @@ class Organization < ApplicationRecord
     super.merge(book: book.slug)
   end
 
+  def to_organization
+    self
+  end
+
+  def enable_progressive_display!(lookahead: 1)
+    update! progressive_display_lookahead: lookahead
+  end
+
   private
 
   def ensure_consistent_public_login
     errors.add(:base, :consistent_public_login) if settings.customized_login_methods? && public?
   end
 
+  def ensure_valid_activity_range
+    if in_preparation_until.present? && disabled_from.present?
+      errors.add(:base, :invalid_activity_range) if in_preparation_until.to_datetime >= disabled_from.to_datetime
+    end
+  end
+
   def notify_assignments!(assignments)
     assignments.each { |assignment| assignment.notify! }
   end

data/app/models/stats.rb

@@ -1,7 +1,7 @@
 class Stats
   include ActiveModel::Model
 
-  attr_accessor :passed, :passed_with_warnings, :failed, :pending
+  attr_accessor :passed, :passed_with_warnings, :failed, :pending, :skipped
 
   def submitted
     passed + passed_with_warnings + failed
@@ -16,7 +16,7 @@ class Stats
   end
 
   def self.from_statuses(statuses)
-    Stats.new(statuses.inject({passed: 0, passed_with_warnings: 0, failed: 0, pending: 0}) do |accum, status|
+    Stats.new(statuses.inject({passed: 0, passed_with_warnings: 0, failed: 0, pending: 0, skipped: 0}) do |accum, status|
       accum[status.group.to_sym] += 1
       accum
     end)

data/app/models/user.rb

@@ -4,6 +4,7 @@ class User < ApplicationRecord
           WithUserNavigation,
           WithReminders,
           WithDiscussionCreation,
+          Disabling,
           Mumuki::Domain::Helpers::User
 
   serialize :permissions, Mumukit::Auth::Permissions
@@ -31,12 +32,14 @@ class User < ApplicationRecord
 
   after_initialize :init
 
-  enum gender: %i(female male other)
+  enum gender: %i(female male other unspecified)
+
+  belongs_to :avatar, optional: true
 
   before_validation :set_uid!
   validates :uid, presence: true
 
-  resource_fields :uid, :social_id, :image_url, :email, :permissions, :verified_first_name, :verified_last_name, *profile_fields
+  resource_fields :uid, :social_id, :email, :permissions, :verified_first_name, :verified_last_name, *profile_fields
 
   def last_lesson
     last_guide.try(:lesson)
@@ -105,6 +108,10 @@ class User < ApplicationRecord
     update! self.class.slice_resource_h json
   end
 
+  def to_resource_h
+    super.merge(image_url: profile_picture)
+  end
+
   def verify_name!
     self.verified_first_name ||= first_name
     self.verified_last_name ||= last_name
@@ -138,6 +145,30 @@ class User < ApplicationRecord
     exams.any? { |e| e.in_progress_for? self }
   end
 
+  def profile_picture
+    avatar&.image_url || image_url
+  end
+
+  def bury!
+    # TODO change avatar
+    update! self.class.buried_profile.merge(accepts_reminders: false, gender: nil, birthdate: nil)
+  end
+
+  # Takes a didactic - ordered - sequence of content containers
+  # and returns those that have been completed
+  def completed_containers(sequence, organization)
+    sequence.take_while { |it| it.content.completed_for?(self, organization) }
+  end
+
+  # Like `completed_containers`, returns a slice of the completed containers
+  # in the sequence, but adding a configurable number of trailing, non-completed contaienrs
+  def completed_containers_with_lookahead(sequence, organization, lookahead: 1)
+    raise 'invalid lookahead' if lookahead < 1
+
+    count = completed_containers(sequence, organization).size
+    sequence[0..count + lookahead - 1]
+  end
+
   private
 
   def set_uid!
@@ -145,6 +176,9 @@ class User < ApplicationRecord
   end
 
   def init
+    # Temporarily keep using image_url until avatars are created
+    # self.avatar = Avatar.sample unless profile_picture.present?
+
     self.image_url ||= "user_shape.png"
   end
 
@@ -160,4 +194,14 @@ class User < ApplicationRecord
     user[:uid] ||= user[:email]
     where(uid: user[:uid]).first_or_create(user)
   end
+
+  # Call this method once as part of application initialization
+  # in order to enable user profile override as part of disabling process
+  def self.configure_buried_profile!(profile)
+    @buried_profile = profile
+  end
+
+  def self.buried_profile
+    (@buried_profile || {}).slice(:first_name, :last_name, :email)
+  end
 end

data/db/migrate/20200312181842_add_results_hidden_for_choices_to_exam.rb

@@ -0,0 +1,5 @@
+class AddResultsHiddenForChoicesToExam < ActiveRecord::Migration[5.1]
+  def change
+    add_column :exams, :results_hidden_for_choices, :boolean, default: false
+  end
+end

data/db/migrate/20200508191543_create_avatars.rb

@@ -0,0 +1,8 @@
+class CreateAvatars < ActiveRecord::Migration[5.1]
+  def change
+    create_table :avatars do |t|
+      t.string :image_url
+      t.string :description
+    end
+  end
+end

data/db/migrate/20200518135658_add_avatar_to_users.rb

@@ -0,0 +1,5 @@
+class AddAvatarToUsers < ActiveRecord::Migration[5.1]
+  def change
+    add_reference :users, :avatar, index: false
+  end
+end

data/db/migrate/20200527180729_add_disabled_at_to_users.rb

@@ -0,0 +1,6 @@
+class AddDisabledAtToUsers < ActiveRecord::Migration[5.1]
+  def change
+    add_column :users, :disabled_at, :datetime
+    add_index :users, :disabled_at
+  end
+end

data/db/migrate/20200608132959_add_progressive_display_lookahead_to_organizations.rb

@@ -0,0 +1,5 @@
+class AddProgressiveDisplayLookaheadToOrganizations < ActiveRecord::Migration[5.1]
+  def change
+    add_column :organizations, :progressive_display_lookahead, :integer
+  end
+end

data/lib/mumuki/domain.rb

@@ -25,6 +25,7 @@ Mumukit::Platform.configure do |config|
   config.organization_class_name = 'Organization'
 end
 
+require_relative './domain/area'
 require_relative './domain/evaluation'
 require_relative './domain/submission'
 require_relative './domain/status'
@@ -32,6 +33,7 @@ require_relative './domain/exceptions'
 require_relative './domain/file'
 require_relative './domain/extensions'
 require_relative './domain/organization'
+require_relative './domain/workspace'
 require_relative './domain/helpers'
 require_relative './domain/syncable'
 require_relative './domain/store'

data/lib/mumuki/domain/area.rb

@@ -0,0 +1,13 @@
+module Mumuki::Domain::Area
+  extend ActiveSupport::Concern
+
+  def to_mumukit_grant
+    slug.to_mumukit_grant
+  end
+
+  def to_mumukit_slug
+    slug
+  end
+
+  required :to_organization
+end

data/lib/mumuki/domain/exceptions.rb

@@ -2,4 +2,7 @@ require_relative './exceptions/forbidden_error'
 require_relative './exceptions/gone_error'
 require_relative './exceptions/not_found_error'
 require_relative './exceptions/unauthorized_error'
+require_relative './exceptions/disabled_error'
 require_relative './exceptions/blocked_forum_error'
+require_relative './exceptions/unprepared_organization_error'
+require_relative './exceptions/disabled_organization_error'

data/lib/mumuki/domain/exceptions/disabled_error.rb

@@ -0,0 +1,2 @@
+class Mumuki::Domain::DisabledError < StandardError
+end

data/lib/mumuki/domain/exceptions/disabled_organization_error.rb

@@ -0,0 +1,2 @@
+class Mumuki::Domain::DisabledOrganizationError < StandardError
+end

data/lib/mumuki/domain/exceptions/unprepared_organization_error.rb

@@ -0,0 +1,2 @@
+class Mumuki::Domain::UnpreparedOrganizationError < StandardError
+end

data/lib/mumuki/domain/extensions/hash.rb

@@ -1,5 +1,14 @@
 class Hash
-  def markdownify!(*keys)
-    keys.each { |it| self[it] = Mumukit::ContentType::Markdown.to_html(self[it]) }
+  def markdownify!(*keys, **options)
+    warn "Don't use markdownify. Use markdownified! instead"
+    markdownified! *keys, **options
+  end
+
+  def markdownified!(*keys, **options)
+    keys.each { |it| self[it] = self[it].markdownified(**options) }
+  end
+
+  def markdownified(*keys, **options)
+    map { |k, v| key.in?(keys) ? v.markdownified(options) : v }.to_h
   end
 end

data/lib/mumuki/domain/extensions/string.rb

@@ -27,3 +27,47 @@ class String
     File.extname(self).delete '.'
   end
 end
+
+
+# The nil-safe affable pipeline goes as follow:
+#
+# i18n > markdownified > sanitized > affable
+#
+# Where:
+#  * i18n: translates to current locale
+#  * markdownified: interpretes markdown in message and generates HTML
+#  * sanitized: sanitizes results HTML
+#  * affable: changes structure to hide low level details
+#
+# Other classes may polymorphically implement their own
+# markdownified, sanitized and affable methods with similar semantics
+# to extend this pipeline to non-strings
+class String
+
+  # Creates a humman representation - but not necessary UI - representation
+  # of this string by interpreting its markdown as a one-liner and sanitizing it
+  def affable
+    markdownified(one_liner: true).sanitized
+  end
+
+  # Interprets the markdown on this string, and converts it into HTML
+  def markdownified(**options)
+    Mumukit::ContentType::Markdown.to_html self, options
+  end
+
+  # Sanitizes this string, escaping unsafe HTML sequences
+  def sanitized
+    Mumukit::ContentType::Sanitizer.sanitize self
+  end
+end
+
+class NilClass
+  def affable
+  end
+
+  def markdownified(**options)
+  end
+
+  def sanitized
+  end
+end

data/lib/mumuki/domain/factories/book_factory.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :book do
-    name { Faker::Lorem.sentence(3) }
-    description { Faker::Lorem.sentence(30) }
+    name { Faker::Lorem.sentence(word_count: 3) }
+    description { Faker::Lorem.sentence(word_count: 30) }
     slug { "mumuki/mumuki-test-book-#{SecureRandom.uuid}" }
   end
 end

data/lib/mumuki/domain/factories/chapter_factory.rb

@@ -1,12 +1,12 @@
 FactoryBot.define do
 
   factory :chapter do
-    number { Faker::Number.between(1, 40) }
+    number { Faker::Number.between(from: 1, to: 40) }
     book { Organization.current.book rescue nil }
 
     transient do
       lessons { [] }
-      name { Faker::Lorem.sentence(3) }
+      name { Faker::Lorem.sentence(word_count: 3) }
       slug { "mumuki/mumuki-test-topic-#{SecureRandom.uuid}" }
     end
 

data/lib/mumuki/domain/factories/exam_factory.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
 
   factory :exam, traits: [:guide_container] do
-    duration { Faker::Number.between(10, 60).minutes }
+    duration { Faker::Number.between(from: 10, to:60).minutes }
     organization { Organization.current }
     start_time { 5.minutes.ago }
     end_time { 10.minutes.since }

data/lib/mumuki/domain/factories/exercise_factory.rb

@@ -51,6 +51,13 @@ FactoryBot.define do
     test { 'dont care' }
   end
 
+  factory :multiple_choice, parent: :problem do
+    name { 'A multiple choice problem' }
+    editor { :multiple_choice }
+    description { 'Simple multiple choice problem' }
+    choices { [{value: 'a', checked: true}, {value: 'b', checked: false }] }
+  end
+
   factory :interactive, class: Interactive, parent: :challenge do
     name { 'An interactive problem' }
     description { 'Simple interactive problem' }

data/lib/mumuki/domain/factories/guide_factory.rb

@@ -11,8 +11,8 @@ FactoryBot.define do
   trait :guide_container do
     transient do
       exercises { [] }
-      name { Faker::Lorem.sentence(3) }
-      description { Faker::Lorem.sentence(10) }
+      name { Faker::Lorem.sentence(word_count: 3) }
+      description { Faker::Lorem.sentence(word_count: 10) }
       language { create(:language) }
       slug { "mumuki/mumuki-test-lesson-#{SecureRandom.uuid}" }
     end

data/lib/mumuki/domain/factories/invitation_factory.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :invitation do
-    code { Faker::Lorem.sentence(6) }
+    code { Faker::Lorem.sentence(word_count: 6) }
     course { "foo/bar" }
     expiration_date { 5.minutes.since }
   end

data/lib/mumuki/domain/factories/topic_factory.rb

@@ -1,8 +1,8 @@
 FactoryBot.define do
 
   factory :topic do
-    name { Faker::Lorem::sentence(3) }
-    description { Faker::Lorem.paragraph(2) }
+    name { Faker::Lorem::sentence(word_count: 3) }
+    description { Faker::Lorem.paragraph(sentence_count: 2) }
     slug { "mumuki/mumuki-sample-topic-#{SecureRandom.uuid}" }
     locale { :en }
   end

data/lib/mumuki/domain/factories/user_factory.rb

@@ -6,5 +6,6 @@ FactoryBot.define do
     last_name { Faker::Name.last_name }
     gender { 1 }
     birthdate { Date.today }
+    avatar { Avatar.new image_url: 'user_shape.png' }
   end
 end

data/lib/mumuki/domain/helpers/organization.rb

@@ -4,7 +4,7 @@ module Mumuki::Domain::Helpers::Organization
 
   included do
     delegate *Mumuki::Domain::Organization::Theme.accessors, to: :theme
-    delegate *Mumuki::Domain::Organization::Settings.accessors, :private?, :login_settings, to: :settings
+    delegate *Mumuki::Domain::Organization::Settings.accessors, :private?, :login_settings, :in_preparation?, :disabled?, to: :settings
     delegate *Mumuki::Domain::Organization::Profile.accessors, :locale_json, to: :profile
   end
 
@@ -48,6 +48,11 @@ module Mumuki::Domain::Helpers::Organization
     Mumukit::Platform.application.organic_domain(name)
   end
 
+  def validate_active!
+    raise Mumuki::Domain::DisabledOrganizationError if disabled?
+    raise Mumuki::Domain::UnpreparedOrganizationError if in_preparation?
+  end
+
   ## API Exposure
 
   def to_param

data/lib/mumuki/domain/helpers/user.rb

@@ -28,9 +28,9 @@ module Mumuki::Domain::Helpers::User
     role_here = "#{role}_here?"
 
     # Tells whether this user has #{role} permissions in
-    # the given organization
-    define_method role_of do |organization|
-      has_permission? role, organization.slug
+    # the given `slug_like`
+    define_method role_of do |slug_like|
+      has_permission? role, slug_like.to_mumukit_slug
     end
 
     # Tells whether this user has #{role} permissions in
@@ -49,16 +49,16 @@ module Mumuki::Domain::Helpers::User
   (Mumukit::Auth::Roles::ROLES - [:owner]).each do |role|
 
     # Assignes the #{role} role to this user
-    # for the given slug
-    define_method "make_#{role}_of!" do |slug|
-      add_permission! role, slug
+    # for the given `grant_like`
+    define_method "make_#{role}_of!" do |grant_like|
+      add_permission! role, grant_like.to_mumukit_grant
     end
   end
 
   ## Profile
 
   def full_name
-    "#{first_name} #{last_name}"
+    "#{first_name} #{last_name}".strip
   end
 
   alias_method :name, :full_name

data/lib/mumuki/domain/locales/activerecord/en.yml

@@ -27,3 +27,4 @@ en:
           attributes:
             base:
               consistent_public_login: 'A public organization can not restrict login methods'
+              invalid_activity_range: 'The organization activity range are not valid'

data/lib/mumuki/domain/locales/activerecord/es.yml

@@ -44,6 +44,7 @@ es:
           attributes:
             base:
               consistent_public_login: 'Una organización pública no puede restringir los métodos de login'
+              invalid_activity_range: 'La fecha de deshabilitación no puede ser anterior a la de inicio del recorrido'
     models:
       exercise:
         one: Ejercicio

data/lib/mumuki/domain/locales/activerecord/pt.yml

@@ -27,3 +27,4 @@ pt:
           attributes:
             base:
               consistent_public_login: 'Uma organização pública não pode restringir métodos de login'
+              invalid_activity_range: 'O intervalo de atividades da organização não é válido'

data/lib/mumuki/domain/organization/settings.rb

@@ -11,7 +11,9 @@ class Mumuki::Domain::Organization::Settings < Mumukit::Platform::Model
                       :embeddable?,
                       :immersive?,
                       :forum_enabled?,
-                      :report_issue_enabled?
+                      :report_issue_enabled?,
+                      :disabled_from,
+                      :in_preparation_until
 
   def private?
     !public?
@@ -24,4 +26,12 @@ class Mumuki::Domain::Organization::Settings < Mumukit::Platform::Model
   def forum_discussions_minimal_role
     (@forum_discussions_minimal_role || 'student').to_sym
   end
+
+  def disabled?
+    disabled_from.present? && disabled_from.to_datetime < DateTime.now
+  end
+
+  def in_preparation?
+    in_preparation_until.present? && in_preparation_until.to_datetime > DateTime.now
+  end
 end

data/lib/mumuki/domain/status/discussion/discussion.rb

@@ -41,4 +41,8 @@ module Mumuki::Domain::Status::Discussion
   def allowed_statuses_for(user, discussion)
     STATUSES.select { |it| it.allowed_for?(user, discussion) }
   end
+
+  def as_json(_options={})
+    to_s
+  end
 end

data/lib/mumuki/domain/status/submission/skipped.rb

@@ -5,10 +5,6 @@ module Mumuki::Domain::Status::Submission::Skipped
     true
   end
 
-  def self.passed?
-    true
-  end
-
   def self.iconize
     {class: :success, type: 'check-circle'}
   end

data/lib/mumuki/domain/status/submission/submission.rb

@@ -23,8 +23,6 @@ module Mumuki::Domain::Status::Submission
     self
   end
 
-  # Tells if a new, different submission should be tried.
-  # True for `failed`, `errored` and `passed_with_warnings`
   def should_retry?
     false
   end
@@ -38,6 +36,10 @@ module Mumuki::Domain::Status::Submission
   end
 
   def completed?
-    passed?
+    solved?
+  end
+
+  def solved?
+    passed? || skipped?
   end
 end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '7.3.2'
+    VERSION = '7.6.0'
   end
 end

data/lib/mumuki/domain/workspace.rb

@@ -0,0 +1,38 @@
+class Mumuki::Domain::Workspace
+  attr_accessor :user, :area
+
+  # area is a organization-like or course-like object
+  # that can be converted into slugs, has content and access-rules information
+  def initialize(user, area)
+    @user = user
+    @area = area
+  end
+
+  def annonymous?
+    user.nil?
+  end
+
+  def teacher?
+    user.teacher_of? area
+  end
+
+  # Takes a didactic sequence of containers and retuns the enabled containers
+  # for this user in this workspace.
+  #
+  # This method does not check the user is actually member of the area,
+  # you should check that before sending this message
+  #
+  def enabled_containers(sequence)
+    return sequence if annonymous? || teacher?
+
+    # TODO refactor when introducing access rules
+    if area.progressive_display_lookahead
+      user.completed_containers_with_lookahead(
+        sequence,
+        area.to_organization,
+        lookahead: area.progressive_display_lookahead)
+    else
+      sequence
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 7.3.2
+  version: 7.6.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: mumukit-content-type
   requirement: !ruby/object:Gem::Requirement
@@ -247,11 +247,14 @@ files:
 - app/models/api_client.rb
 - app/models/application_record.rb
 - app/models/assignment.rb
+- app/models/avatar.rb
 - app/models/book.rb
 - app/models/chapter.rb
 - app/models/complement.rb
 - app/models/concerns/assistable.rb
+- app/models/concerns/container.rb
 - app/models/concerns/contextualization.rb
+- app/models/concerns/disabling.rb
 - app/models/concerns/friendly_name.rb
 - app/models/concerns/guide_container.rb
 - app/models/concerns/navigation/parent_navigation.rb
@@ -266,7 +269,6 @@ files:
 - app/models/concerns/topic_container.rb
 - app/models/concerns/with_assignments.rb
 - app/models/concerns/with_case_insensitive_search.rb
-- app/models/concerns/with_content.rb
 - app/models/concerns/with_description.rb
 - app/models/concerns/with_discussion_creation.rb
 - app/models/concerns/with_discussion_creation/subscription.rb
@@ -598,17 +600,26 @@ files:
 - db/migrate/20191217184525_add_progress_fields_to_indicators.rb
 - db/migrate/20200127142401_add_private_to_topics_and_books.rb
 - db/migrate/20200213175736_add_verified_names_to_users.rb
+- db/migrate/20200312181842_add_results_hidden_for_choices_to_exam.rb
+- db/migrate/20200508191543_create_avatars.rb
+- db/migrate/20200518135658_add_avatar_to_users.rb
+- db/migrate/20200527180729_add_disabled_at_to_users.rb
+- db/migrate/20200608132959_add_progressive_display_lookahead_to_organizations.rb
 - lib/mumuki/domain.rb
+- lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb
 - lib/mumuki/domain/evaluation.rb
 - lib/mumuki/domain/evaluation/automated.rb
 - lib/mumuki/domain/evaluation/manual.rb
 - lib/mumuki/domain/exceptions.rb
 - lib/mumuki/domain/exceptions/blocked_forum_error.rb
+- lib/mumuki/domain/exceptions/disabled_error.rb
+- lib/mumuki/domain/exceptions/disabled_organization_error.rb
 - lib/mumuki/domain/exceptions/forbidden_error.rb
 - lib/mumuki/domain/exceptions/gone_error.rb
 - lib/mumuki/domain/exceptions/not_found_error.rb
 - lib/mumuki/domain/exceptions/unauthorized_error.rb
+- lib/mumuki/domain/exceptions/unprepared_organization_error.rb
 - lib/mumuki/domain/extensions.rb
 - lib/mumuki/domain/extensions/array.rb
 - lib/mumuki/domain/extensions/hash.rb
@@ -683,6 +694,7 @@ files:
 - lib/mumuki/domain/syncable.rb
 - lib/mumuki/domain/syncable/with_resource_fields.rb
 - lib/mumuki/domain/version.rb
+- lib/mumuki/domain/workspace.rb
 homepage: https://mumuki.org
 licenses:
 - AGPL-3.0