mumuki-domain 7.4.1 → 7.7.0

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/20200601203033_add_course_to_exam.rb

@@ -0,0 +1,5 @@
+class AddCourseToExam < ActiveRecord::Migration[5.1]
+  def change
+    add_reference :exams, :course
+  end
+end

data/db/migrate/20200605161350_add_passing_criterions_to_exam.rb

@@ -0,0 +1,6 @@
+class AddPassingCriterionsToExam < ActiveRecord::Migration[5.1]
+  def change
+    add_column :exams, :passing_criterion_type, :integer, default: 0
+    add_column :exams, :passing_criterion_value, :integer
+  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/db/migrate/20200702165503_add_messages_count_to_discussion.rb

@@ -0,0 +1,6 @@
+class AddMessagesCountToDiscussion < ActiveRecord::Migration[5.1]
+  def change
+    add_column :discussions, :messages_count, :integer, default: 0
+    add_column :discussions, :validated_messages_count, :integer, default: 0
+  end
+end

data/db/migrate/20200728162727_add_not_actually_a_question_field_to_messages.rb

@@ -0,0 +1,5 @@
+class AddNotActuallyAQuestionFieldToMessages < ActiveRecord::Migration[5.1]
+  def change
+    add_column :messages, :not_actually_a_question, :boolean, default: false
+  end
+end

data/db/migrate/20200728163038_add_requires_moderator_response_to_discussions.rb

@@ -0,0 +1,5 @@
+class AddRequiresModeratorResponseToDiscussions < ActiveRecord::Migration[5.1]
+  def change
+    add_column :discussions, :requires_moderator_response, :boolean, default: true
+  end
+end

data/db/migrate/20200731081757_add_last_moderator_access_fields_to_discussion.rb

@@ -0,0 +1,6 @@
+class AddLastModeratorAccessFieldsToDiscussion < ActiveRecord::Migration[5.1]
+  def change
+    add_column :discussions, :last_moderator_access_by_id, :string
+    add_column :discussions, :last_moderator_access_at, :datetime
+  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/course_factory.rb

@@ -2,8 +2,10 @@ FactoryBot.define do
   factory :course do
     period { '2016' }
     shifts { %w(morning) }
+    code { "k1234-#{SecureRandom.uuid}" }
     days { %w(monday wednesday) }
     description { 'test' }
     organization_id { 1 }
+    slug { "#{Organization.current.name}/#{period}-#{code}" }
   end
 end

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

@@ -1,8 +1,9 @@
 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 }
+    course { create(:course) }
     start_time { 5.minutes.ago }
     end_time { 10.minutes.since }
   end

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,10 @@ class Mumuki::Domain::Organization::Settings < Mumukit::Platform::Model
                       :embeddable?,
                       :immersive?,
                       :forum_enabled?,
-                      :report_issue_enabled?
+                      :report_issue_enabled?,
+                      :disabled_from,
+                      :in_preparation_until,
+                      :gamification_enabled?
 
   def private?
     !public?
@@ -24,4 +27,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/discussion/opened.rb

@@ -5,14 +5,6 @@ module Mumuki::Domain::Status::Discussion::Opened
     true
   end
 
-  def self.reachable_statuses_for_initiator(discussion)
-    if discussion.has_responses?
-      [Mumuki::Domain::Status::Discussion::PendingReview]
-    else
-      [Mumuki::Domain::Status::Discussion::Closed]
-    end
-  end
-
   def self.reachable_statuses_for_moderator(discussion)
     if discussion.has_responses?
       [Mumuki::Domain::Status::Discussion::Closed, Mumuki::Domain::Status::Discussion::Solved]

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

@@ -9,6 +9,7 @@ class Mumuki::Domain::Submission::Base
                 :submission_id, :queries, :query_results, :manual_evaluation_comment]
 
   attr_accessor *ATTRIBUTES
+  attr_accessor :client_result
 
   def self.from_attributes(*args)
     new ATTRIBUTES.zip(args).to_h
@@ -26,6 +27,11 @@ class Mumuki::Domain::Submission::Base
     results
   end
 
+  def with_client_result(result)
+    self.client_result = result if result.present?
+    self
+  end
+
   def evaluate!(assignment)
     try_evaluate! assignment
   rescue => e

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

@@ -2,6 +2,8 @@ class Mumuki::Domain::Submission::Solution < Mumuki::Domain::Submission::Persist
   attr_accessor :content
 
   def try_evaluate!(assignment)
-    assignment.run_tests!(content: content).except(:response_type)
+    assignment
+      .run_tests!({client_result: client_result}.compact.merge(content: content))
+      .except(:response_type)
   end
 end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '7.4.1'
+    VERSION = '7.7.0'
   end
 end