mumuki-domain 7.12.2 → 8.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c03b11014fe958aaa9ab0e980a40f5f68b3adafd4ccc593bc0fcf04771a68f5b
-  data.tar.gz: d2ac0f573097e57a62e4e13f2d2dc4116ecb8ab5dfca033fd5ac69d0c9afd33a
+  metadata.gz: 9495d00fe4f85bdc27f5cf67b94e5f09de465a31a795e9e3d56b3f4cd91433e1
+  data.tar.gz: 209256d417ff7c98c309b517cd7076a9743ea00de79124b6bec3e735a49a5238
 SHA512:
-  metadata.gz: 998b1c0f0ee18cc59a8173c1d2ebbbeb930e877bddf1fdcb6e3dc3edc31509f63e16f0db48cb506ba35e4e35ac363f9ee625c58f6cd0da95d82461f6dd586102
-  data.tar.gz: da140f00d91f6408e176453bf36b33108c9e73552e8c7ce3666f31d11145cf87bdcd5afc40e3edb8fac066073bb4ff49e0db4e435cfb862f295b2e05836a16ad
+  metadata.gz: 88ccf91cbccb01f15ec513e232d48832e69a0ec9f5153992e91eab56c44183f10a10dc2a4bcd894509708ab97461b4698ecb73485da8d7dfa8826196837e0c3d
+  data.tar.gz: 80b0c3ec21c9444dedb05c1c1060035cdd0d5f0f731635ae79e4738c0a0d23c6fbf4ac67d48c6bb0ea70a76ee7e825a05a2afaaad95e8d2be54096636e0e2af0

data/app/models/application_record.rb

@@ -70,9 +70,8 @@ class ApplicationRecord < ActiveRecord::Base
   end
 
   def update_and_notify!(data)
-    update! data
-    notify!
-    self
+    assign_attributes data
+    save_and_notify!
   end
 
   def self.aggregate_of(association)
@@ -105,7 +104,7 @@ class ApplicationRecord < ActiveRecord::Base
     obj
   end
 
-  def self.whitelist_attributes(a_hash, options={})
+  def self.whitelist_attributes(a_hash, options = {})
     attributes = attribute_names
     attributes += reflections.keys if options[:relations]
     a_hash.with_indifferent_access.slice(*attributes).except(*options[:except])

data/app/models/assignment.rb

@@ -52,10 +52,10 @@ class Assignment < Progress
     self.organization = Organization.current
   end
 
-  def recontextualize!
-    if organization != Organization.current
+  def recontextualize!(new_organization = Organization.current)
+    if organization != new_organization
       dirty_parent_by_submission! if organization.present? && exercise.used_in?(organization)
-      self.organization = Organization.current
+      self.organization = new_organization
       self.parent_id = nil
     end
   end
@@ -126,7 +126,7 @@ class Assignment < Progress
   end
 
   def content=(content)
-    if content.present?
+    if exercise.solvable?
       self.solution = exercise.single_choice? ? exercise.choice_index_for(content) : content
     end
   end

data/app/models/concerns/container.rb

@@ -20,6 +20,14 @@ module Container
     content.progress_for(user, organization)
   end
 
+  def navigable_content_in(organization = Organization.current)
+    content.usage_in_organization(organization)
+  end
+
+  def content_used_in?(organization)
+    navigable_content_in(organization).present?
+  end
+
   private
 
   # Generally we are calling progress_for for each sibling. That method needs the

data/app/models/concerns/with_expectations.rb

@@ -18,16 +18,12 @@ module WithExpectations
     self[:expectations] = expectations.map(&:stringify_keys)
   end
 
-  def own_expectations
+  def raw_expectations
     self[:expectations]
   end
 
-  def own_custom_expectations
-    self[:custom_expectations]
-  end
-
   def ensure_expectations_format
-    errors.add :own_expectations,
-               :invalid_format unless own_expectations.to_a.all? { |it| Mulang::Expectation.valid? it }
+    errors.add :raw_expectations,
+               :invalid_format unless raw_expectations.to_a.all? { |it| Mulang::Expectation.valid? it }
   end
 end

data/app/models/concerns/with_randomizations.rb

@@ -35,8 +35,7 @@ module WithRandomizations
 
     def randomize_field(selector)
       define_method(selector) do |*args|
-        return unless super(*args)
-        randomizer.randomize!(super(*args), seed)
+        super(*args).randomize_with randomizer, seed
       end
     end
   end

data/app/models/concerns/with_usages.rb

@@ -16,6 +16,18 @@ module WithUsages
     item.is_a?(type) ? item : nil
   end
 
+  def navigable_content_in(organization = Organization.current)
+    self if used_in?(organization)
+  end
+
+  def content_used_in?(organization)
+    navigable_content_in(organization).present?
+  end
+
+  def used_in?(organization)
+    usage_in_organization(organization).present?
+  end
+
   class_methods do
     def aggregate_of(association)
       super

data/app/models/discussion.rb

@@ -44,6 +44,10 @@ class Discussion < ApplicationRecord
     end
   end
 
+  def navigable_content_in(_)
+    nil
+  end
+  
   def used_in?(organization)
     organization == self.organization
   end

data/app/models/exam.rb

@@ -5,7 +5,7 @@ class Exam < ApplicationRecord
   include TerminalNavigation
 
   belongs_to :organization
-  belongs_to :course, optional: true
+  belongs_to :course
 
   has_many :authorizations, class_name: 'ExamAuthorization', dependent: :destroy
   has_many :users, through: :authorizations
@@ -186,8 +186,6 @@ class Exam < ApplicationRecord
     exam[:start_time] = exam[:start_time].to_time
     exam[:end_time] = exam[:end_time].to_time
     exam[:classroom_id] = exam[:eid] if exam[:eid].present?
-    exam[:passing_criterion_type] = exam.dig(:passing_criterion, :type)
-    exam[:passing_criterion_value] = exam.dig(:passing_criterion, :value)
   end
 
   def self.remove_previous_version(eid, guide_id)

data/app/models/exercise.rb

@@ -1,5 +1,5 @@
 class Exercise < ApplicationRecord
-  RANDOMIZED_FIELDS = [:default_content, :description, :extra, :hint, :test]
+  RANDOMIZED_FIELDS = [:default_content, :description, :extra, :hint, :test, :expectations, :custom_expectations]
   BASIC_RESOURCE_FIELDS = %i(
     name layout editor corollary teacher_info manual_evaluation locale
     choices assistance_rules randomizations tag_list extra_visible goal
@@ -47,6 +47,14 @@ class Exercise < ApplicationRecord
     guide.usage_in_organization(organization).present?
   end
 
+  def navigable_content_in(organization = Organization.current)
+    self if used_in?(organization)
+  end
+
+  def content_used_in?(organization)
+    navigable_content_in(organization).present?
+  end
+
   def structural_parent
     guide
   end
@@ -127,8 +135,6 @@ class Exercise < ApplicationRecord
     language_resource_h = language.to_embedded_resource_h if language != guide.language
     as_json(only: BASIC_RESOURCE_FIELDS)
       .merge(id: bibliotheca_id, language: language_resource_h, type: type.underscore)
-      .merge(expectations: self[:expectations])
-      .merge(custom_expectations: self[:custom_expectations])
       .merge(settings: self[:settings])
       .merge(RANDOMIZED_FIELDS.map { |it| [it, self[it]] }.to_h)
       .symbolize_keys
@@ -231,6 +237,10 @@ class Exercise < ApplicationRecord
     guide.pending_exercises(user)
   end
 
+  def solvable?
+    is_a? ::Problem
+  end
+
   private
 
   def evaluation_class

data/app/models/exercise/challenge.rb

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

data/app/models/exercise/problem.rb

@@ -21,20 +21,15 @@ class Problem < QueriableChallenge
     self.expectations = []
   end
 
+  alias_method :own_expectations, :expectations
+  alias_method :own_custom_expectations, :custom_expectations
+
   def expectations
-    own_expectations + guide_expectations
+    own_expectations + guide.expectations
   end
 
   def custom_expectations
-    "#{own_custom_expectations}\n#{guide_custom_expectations}"
-  end
-
-  def guide_expectations
-    guide.expectations
-  end
-
-  def guide_custom_expectations
-    guide.custom_expectations
+    "#{own_custom_expectations}\n#{guide.custom_expectations}"
   end
 
   def evaluation_criteria?

data/app/models/user.rb

@@ -139,9 +139,9 @@ class User < ApplicationRecord
 
   def interpolations
     {
-      'user_email' => email,
-      'user_first_name' => first_name,
-      'user_last_name' => last_name
+        'user_email' => email,
+        'user_first_name' => first_name,
+        'user_last_name' => last_name
     }
   end
 
@@ -182,7 +182,7 @@ class User < ApplicationRecord
   # This is true only when this organization has the forum enabled and the user
   # has the discusser pseudo-permission and the discusser is trusted
   def can_discuss_in?(organization)
-    organization.forum_enabled? && discusser_of?(organization) && trusted_as_discusser_in?(organization)
+    organization.forum_enabled? && discusser_of?(organization) && trusted_as_discusser_in?(organization) && !banned_from_forum?
   end
 
   def trusted_as_discusser_in?(organization)
@@ -243,14 +243,35 @@ class User < ApplicationRecord
     Organization.current? ?  Organization.current : main_organization
   end
 
-  def current_immersive_context_at(exercise)
+  def current_immersive_context_at(path_item)
     if Organization.current?
-      immersive_organization_at(exercise) || Organization.current
+      immersive_organization_at(path_item) || Organization.current
     else
       main_organization
     end
   end
 
+  def notify_permissions_changed!
+    return if permissions_before_last_save == permissions
+    Mumukit::Nuntius.notify! 'user-permissions-changed', user: {
+      uid: uid,
+      old_permissions: permissions_before_last_save.as_json,
+      new_permissions: permissions.as_json
+    }
+  end
+
+  def save_and_notify!
+    save!
+    notify_permissions_changed!
+    self
+  end
+
+  def current_immersive_context_and_content_at(path_item)
+    immersive_organization_with_content_at(path_item).tap do |orga, _|
+      return [Organization.current, path_item] unless orga.present?
+    end
+  end
+
   private
 
   def welcome_to_new_organizations!

data/db/migrate/20201130163114_add_banned_from_forum_to_users.rb

@@ -0,0 +1,5 @@
+class AddBannedFromForumToUsers < ActiveRecord::Migration[5.1]
+  def change
+    add_column :users, :banned_from_forum, :boolean
+  end
+end

data/lib/mumuki/domain/extensions.rb

@@ -1,5 +1,7 @@
 require_relative './extensions/string'
+require_relative './extensions/symbol'
 require_relative './extensions/array'
 require_relative './extensions/module'
 require_relative './extensions/hash'
+require_relative './extensions/nil'
 require_relative './extensions/time'

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

@@ -15,10 +15,12 @@ class Array
   def single?
     size == 1
   end
-end
 
-class NilClass
-  def insert_last(element)
-    [element]
+  def multiple?
+    size > 1
+  end
+
+  def randomize_with(randomizer, seed)
+    map { |it| it.randomize_with randomizer, seed }
   end
 end

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

@@ -11,4 +11,8 @@ class Hash
   def markdownified(*keys, **options)
     map { |k, v| key.in?(keys) ? v.markdownified(options) : v }.to_h
   end
+
+  def randomize_with(randomizer, seed)
+    transform_values { |v| v.randomize_with randomizer, seed }
+  end
 end

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

@@ -0,0 +1,17 @@
+class NilClass
+  def affable
+  end
+
+  def markdownified(**options)
+  end
+
+  def sanitized
+  end
+
+  def randomize_with(randomizer, seed)
+  end
+
+  def insert_last(element)
+    [element]
+  end
+end

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

@@ -59,15 +59,8 @@ class String
   def sanitized
     Mumukit::ContentType::Sanitizer.sanitize self
   end
-end
-
-class NilClass
-  def affable
-  end
 
-  def markdownified(**options)
-  end
-
-  def sanitized
+  def randomize_with(randomizer, seed)
+    randomizer.randomize!(self, seed)
   end
 end

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

@@ -0,0 +1,5 @@
+class Symbol
+  def randomize_with(randomizer, seed)
+    self.to_s.randomize_with(randomizer, seed).to_sym
+  end
+end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :term do
-    content { Faker::Lorem.sentence(word_count: 2000) }
+    content { Faker::Lorem.sentence(word_count: 100) }
     header { Faker::Lorem.sentence(word_count: 5) }
   end
 end

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

@@ -29,7 +29,7 @@ module Mumuki::Domain::Helpers::Organization
   end
 
   def immersed_in?(other)
-    immersible? && other.immersive? && target_audience == other.target_audience
+    immersible? && other.immersive? && !other.disabled? && target_audience == other.target_audience
   end
 
   def switch!
@@ -41,7 +41,7 @@ module Mumuki::Domain::Helpers::Organization
   end
 
   def url_for(path)
-    Mumukit::Platform.application.organic_url_for(name, path)
+    Mumukit::Platform.laboratory.organic_url_for(name, path)
   end
 
   def url

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

@@ -8,6 +8,7 @@ module Mumuki::Domain::Helpers::User
   delegate :has_role?,
            :add_permission!,
            :remove_permission!,
+           :update_permission!,
            :has_permission?,
            :has_permission_delegation?,
            :protect!,
@@ -100,12 +101,21 @@ module Mumuki::Domain::Helpers::User
   end
 
   def immersive_organizations_at(path_item, current = Organization.current)
-    return [] unless current.immersible?
-
     usage_filter = path_item ? lambda { |it| path_item.used_in?(it) } : lambda { |_| true }
-    student_granted_organizations
-      .select { |it| current.immersed_in?(it) }
-      .select(&usage_filter)
+    immersive_organizations_for(current).select(&usage_filter)
+  end
+
+  def immersive_organization_with_content_at(path_item, current = Organization.current)
+    orga = immersive_organizations_with_content_at(path_item, current).single
+    [orga, path_item&.navigable_content_in(orga)]
+  end
+
+  def immersive_organizations_with_content_at(path_item, current = Organization.current)
+    immersive_without_usage = immersive_organizations_for(current)
+    return immersive_without_usage unless path_item.present?
+
+    immersive_with_usage = immersive_without_usage.select { |it| path_item.content_used_in? it }
+    immersive_with_usage.empty? ? immersive_without_usage : immersive_with_usage
   end
 
   ## API Exposure
@@ -119,4 +129,12 @@ module Mumuki::Domain::Helpers::User
       [:first_name, :last_name, :gender, :birthdate]
     end
   end
+
+  private
+
+  def immersive_organizations_for(organization)
+    return [] unless organization.immersible?
+
+    student_granted_organizations.select { |it| organization.immersed_in?(it) }
+  end
 end

data/lib/mumuki/domain/incognito.rb

@@ -52,7 +52,15 @@ module Mumuki::Domain
       nil
     end
 
-    def immersive_organizations_at(_)
+    def current_immersive_context_and_content_at(_)
+      [nil, nil]
+    end
+
+    def immersive_organizations_with_content_at(_, _ = nil)
+      []
+    end
+
+    def immersive_organizations_at(_, _ = nil)
       []
     end
 

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

@@ -15,7 +15,7 @@ en:
           attributes:
             randomizations:
               invalid_format: 'format is invalid'
-            own_expectations:
+            raw_expectations:
               invalid_format: 'format is invalid'
             assistance_rules:
               invalid_format: 'format is invalid'

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

@@ -32,7 +32,7 @@ es-CL:
           attributes:
             randomizations:
               invalid_format: 'formato inválido'
-            own_expectations:
+            raw_expectations:
               invalid_format: 'formato inválido'
             assistance_rules:
               invalid_format: 'formato inválido'

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

@@ -32,7 +32,7 @@ es:
           attributes:
             randomizations:
               invalid_format: 'formato inválido'
-            own_expectations:
+            raw_expectations:
               invalid_format: 'formato inválido'
             assistance_rules:
               invalid_format: 'formato inválido'

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

@@ -15,7 +15,7 @@ pt:
           attributes:
             randomizations:
               invalid_format: 'o formato é inválido'
-            own_expectations:
+            raw_expectations:
               invalid_format: 'o formato é inválido'
             assistance_rules:
               invalid_format: 'o formato é inválido'

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

@@ -36,6 +36,6 @@ class Mumuki::Domain::Organization::Profile < Mumukit::Platform::Model
   end
 
   def open_graph_image_url
-    @open_graph_image_url ||= Mumukit::Platform.application.url_for("logo-alt.png")  # Best image size: 256x256
+    @open_graph_image_url ||= Mumukit::Platform.laboratory.url_for("logo-alt.png")  # Best image size: 256x256
   end
 end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '7.12.2'
+    VERSION = '8.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 7.12.2
+  version: 8.1.3
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: mumukit-sync
   requirement: !ruby/object:Gem::Requirement
@@ -636,6 +636,7 @@ files:
 - db/migrate/20201026225312_add_organization_wins_page_flag.rb
 - db/migrate/20201027134205_add_immersible_to_organization.rb
 - db/migrate/20201027152806_create_terms.rb
+- db/migrate/20201130163114_add_banned_from_forum_to_users.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb
@@ -655,7 +656,9 @@ files:
 - lib/mumuki/domain/extensions/array.rb
 - lib/mumuki/domain/extensions/hash.rb
 - lib/mumuki/domain/extensions/module.rb
+- lib/mumuki/domain/extensions/nil.rb
 - lib/mumuki/domain/extensions/string.rb
+- lib/mumuki/domain/extensions/symbol.rb
 - lib/mumuki/domain/extensions/time.rb
 - lib/mumuki/domain/factories.rb
 - lib/mumuki/domain/factories/api_client_factory.rb
@@ -756,7 +759,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Mumuki Platform's Domain Model